[pypy-commit] pypy py3.3: Merged in numerodix/pypy/py3.3 (pull request #249)

[arigo]

Author: Armin Rigo <armin.rigo at gmail.com>
Branch: py3.3
Changeset: r72507:a85920372113
Date: 2014-07-26 15:07 +0200
http://bitbucket.org/pypy/pypy/changeset/a85920372113/

Log:	Merged in numerodix/pypy/py3.3 (pull request #249)

	Removing sys.flags.division_warning (removed in 3.3)

diff --git a/pypy/interpreter/app_main.py b/pypy/interpreter/app_main.py
--- a/pypy/interpreter/app_main.py
+++ b/pypy/interpreter/app_main.py
@@ -317,7 +317,6 @@
 # Order is significant!
 sys_flags = (
     "debug",
-    "division_warning",
     "inspect",
     "interactive",
     "optimize",
diff --git a/pypy/module/sys/app.py b/pypy/module/sys/app.py
--- a/pypy/module/sys/app.py
+++ b/pypy/module/sys/app.py
@@ -94,20 +94,19 @@
     name = "sys.flags"
 
     debug = structseqfield(0)
-    division_warning = structseqfield(1)
-    inspect = structseqfield(2)
-    interactive = structseqfield(3)
-    optimize = structseqfield(4)
-    dont_write_bytecode = structseqfield(5)
-    no_user_site = structseqfield(6)
-    no_site = structseqfield(7)
-    ignore_environment = structseqfield(8)
-    verbose = structseqfield(9)
-    bytes_warning = structseqfield(10)
-    quiet = structseqfield(11)
-    hash_randomization = structseqfield(12)
+    inspect = structseqfield(1)
+    interactive = structseqfield(2)
+    optimize = structseqfield(3)
+    dont_write_bytecode = structseqfield(4)
+    no_user_site = structseqfield(5)
+    no_site = structseqfield(6)
+    ignore_environment = structseqfield(7)
+    verbose = structseqfield(8)
+    bytes_warning = structseqfield(9)
+    quiet = structseqfield(10)
+    hash_randomization = structseqfield(11)
 
-null_sysflags = sysflags((0,)*13)
+null_sysflags = sysflags((0,)*12)
 null__xoptions = {}