[Python-checkins] cpython (merge default -> default): Merge.

[stefan.krah]

http://hg.python.org/cpython/rev/f9bb88e5fe2c
changeset:   80523:f9bb88e5fe2c
parent:      80522:129d8f50d045
parent:      80520:ceb0184c7f44
user:        Stefan Krah <skrah at bytereef.org>
date:        Mon Nov 19 00:57:20 2012 +0100
summary:
  Merge.

files:
  Python/sysmodule.c |  10 ----------
  1 files changed, 0 insertions(+), 10 deletions(-)


diff --git a/Python/sysmodule.c b/Python/sysmodule.c
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -1349,9 +1349,6 @@
     {"no_site",                 "-S"},
     {"ignore_environment",      "-E"},
     {"verbose",                 "-v"},
-#ifdef RISCOS
-    {"riscos_wimp",             "???"},
-#endif
     /* {"unbuffered",                   "-u"}, */
     /* {"skip_first",                   "-x"}, */
     {"bytes_warning",           "-b"},
@@ -1364,11 +1361,7 @@
     "sys.flags",        /* name */
     flags__doc__,       /* doc */
     flags_fields,       /* fields */
-#ifdef RISCOS
-    13
-#else
     12
-#endif
 };
 
 static PyObject*
@@ -1393,9 +1386,6 @@
     SetFlag(Py_NoSiteFlag);
     SetFlag(Py_IgnoreEnvironmentFlag);
     SetFlag(Py_VerboseFlag);
-#ifdef RISCOS
-    SetFlag(Py_RISCOSWimpFlag);
-#endif
     /* SetFlag(saw_unbuffered_flag); */
     /* SetFlag(skipfirstline); */
     SetFlag(Py_BytesWarningFlag);

-- 
Repository URL: http://hg.python.org/cpython