r47124 - fixes

Author: hawkowl
Date: Thu Mar 31 08:53:09 2016
New Revision: 47124

Added:
   branches/oldstyle-decorator-8244-2/twisted/topfiles/8244.misc
Modified:
   branches/oldstyle-decorator-8244-2/twisted/python/_oldstyle.py
   branches/oldstyle-decorator-8244-2/twisted/python/dist3.py
   branches/oldstyle-decorator-8244-2/twisted/test/test_nooldstyle.py

Log:
fixes

Modified: branches/oldstyle-decorator-8244-2/twisted/python/_oldstyle.py
==============================================================================
--- branches/oldstyle-decorator-8244-2/twisted/python/_oldstyle.py	(original)
+++ branches/oldstyle-decorator-8244-2/twisted/python/_oldstyle.py	Thu Mar 31 08:53:09 2016
@@ -26,7 +26,7 @@
 
 
 
-def _shouldEnableNewStyle(environ=os.environ):
+def _shouldEnableNewStyle():
     """
     Returns whether or not we should enable the new-style conversion of
     old-style classes. It inspects the environment for C{TWISTED_NEWSTYLE},
@@ -35,7 +35,7 @@
 
     @rtype: L{bool}
     """
-    value = environ.get('TWISTED_NEWSTYLE', '')
+    value = os.environ.get('TWISTED_NEWSTYLE', '')
 
     if value in ['', 'no', 'false', 'False', '0']:
         return False

Modified: branches/oldstyle-decorator-8244-2/twisted/python/dist3.py
==============================================================================
--- branches/oldstyle-decorator-8244-2/twisted/python/dist3.py	(original)
+++ branches/oldstyle-decorator-8244-2/twisted/python/dist3.py	Thu Mar 31 08:53:09 2016
@@ -163,6 +163,7 @@
     "twisted.python.__init__",
     "twisted.python._appdirs",
     "twisted.python._tzhelper",
+    "twisted.python._oldstyle",
     "twisted.python._url",
     "twisted.python.compat",
     "twisted.python.components",
@@ -359,9 +360,10 @@
     "twisted.test.test_loopback",
     "twisted.test.test_modules",
     "twisted.test.test_monkey",
+    "twisted.test.test_nooldstyle",
     "twisted.test.test_paths",
-    "twisted.test.test_plugin",
     "twisted.test.test_persisted",
+    "twisted.test.test_plugin",
     "twisted.test.test_policies",
     "twisted.test.test_process",
     "twisted.test.test_randbytes",
@@ -378,8 +380,8 @@
     "twisted.test.test_threadable",
     "twisted.test.test_threadpool",
     "twisted.test.test_threads",
-    "twisted.test.test_twisted",
     "twisted.test.test_twistd",
+    "twisted.test.test_twisted",
     "twisted.test.test_udp",
     "twisted.test.test_unix",
     "twisted.test.test_usage",

Modified: branches/oldstyle-decorator-8244-2/twisted/test/test_nooldstyle.py
==============================================================================
--- branches/oldstyle-decorator-8244-2/twisted/test/test_nooldstyle.py	(original)
+++ branches/oldstyle-decorator-8244-2/twisted/test/test_nooldstyle.py	Thu Mar 31 08:53:09 2016
@@ -7,7 +7,6 @@
 
 from __future__ import absolute_import, division
 
-import os
 import types
 import inspect
 
@@ -152,6 +151,8 @@
 def _buildTestClasses(_locals):
     """
     Build the test classes that use L{NewStyleOnly}, one class per module.
+
+    @param _locals: The global C{locals()} dict.
     """
     for x in getModule("twisted").walkModules():
 
@@ -161,9 +162,9 @@
             "twisted.test.process_"
         ]
 
-        is_ignored = [x.name.startswith(ignored) for ignored in ignoredModules]
+        isIgnored = [x.name.startswith(ignored) for ignored in ignoredModules]
 
-        if True in is_ignored:
+        if True in isIgnored:
             continue