r47273 - dammit

hawkowl-TA+aISz0psMTMxyoc4vAAJOcrHinNvQL0E9HWUfgJXw@public.gmane.org Sun, 17 Apr 2016 00:30:24 -0600 (MDT)
Newsgroups gmane.comp.python.twisted.commits
Message-ID <[email protected]>
Author: hawkowl
Date: Sun Apr 17 00:30:10 2016
New Revision: 47273

Modified:
   branches/cov-subprocess-8266/twisted/internet/test/test_process.py

Log:
dammit

Modified: branches/cov-subprocess-8266/twisted/internet/test/test_process.py
==============================================================================
--- branches/cov-subprocess-8266/twisted/internet/test/test_process.py	(original)
+++ branches/cov-subprocess-8266/twisted/internet/test/test_process.py	Sun Apr 17 00:30:10 2016
@@ -20,7 +20,8 @@
 from twisted.python.log import msg, err
 from twisted.python.runtime import platform
 from twisted.python.filepath import FilePath, _asFilesystemBytes
-from twisted.python.compat import networkString, _PY3, xrange, items
+from twisted.python.compat import (networkString, _PY3, xrange, items,
+                                   bytesEnviron)
 from twisted.internet import utils
 from twisted.internet.interfaces import IReactorProcess, IProcessTransport
 from twisted.internet.defer import Deferred, succeed
@@ -38,16 +39,17 @@
     process = None
     _uidgidSkip = "Cannot change UID/GID on Windows"
 
+    properEnv = dict(os.environ)
+    properEnv["PYTHONPATH"] = os.pathsep.join(sys.path)
     properEnv = bytesEnviron()
-    properEnv[b"PYTHONPATH"] = os.pathsep.join(sys.path).encode(
-        sys.getfilesystemencoding())
 else:
     import resource
     from twisted.internet import process
     if os.getuid() != 0:
         _uidgidSkip = "Cannot change UID/GID except as root"
-    properEnv = dict(os.environ)
-    properEnv["PYTHONPATH"] = os.pathsep.join(sys.path)
+
+    properEnv[b"PYTHONPATH"] = os.pathsep.join(sys.path).encode(
+        sys.getfilesystemencoding())