r47246 - mbcs stuff

Author: hawkowl
Date: Thu Apr 14 21:07:16 2016
New Revision: 47246

Modified:
   branches/moar-windows-8025-7/twisted/test/test_process.py

Log:
mbcs stuff

Modified: branches/moar-windows-8025-7/twisted/test/test_process.py
==============================================================================
--- branches/moar-windows-8025-7/twisted/test/test_process.py	(original)
+++ branches/moar-windows-8025-7/twisted/test/test_process.py	Thu Apr 14 21:07:16 2016
@@ -41,7 +41,7 @@
 from twisted.internet import reactor, protocol, error, interfaces, defer
 from twisted.trial import unittest
 from twisted.python import runtime, procutils
-from twisted.python.compat import _PY3, networkString, xrange
+from twisted.python.compat import _PY3, networkString, xrange, _maybeMBCS
 from twisted.python.filepath import FilePath, _asFilesystemBytes
 
 
@@ -2386,22 +2386,16 @@
         from twisted.internet import _dumbwin32proc
         from twisted.test import mock_win32process
         self.patch(_dumbwin32proc, "win32process", mock_win32process)
-        scriptPath = FilePath(__file__).sibling(b"process_cmdline.py").path
+        scriptPath = FilePath(__file__).sibling(u"process_cmdline.py").path
+        pyExe = FilePath(sys.executable).asTextMode().path
 
         d = defer.Deferred()
         processProto = TrivialProcessProtocol(d)
-        if _PY3:
-            comspec = os.environ["COMSPEC"].encode("mbcs")
-        else:
-            comspec = str(os.environ["COMSPEC"])
-        cmd = [comspec, b"/c", pyExe, scriptPath]
+        comspec = _maybeMBCS(os.environ["COMSPEC"])
+        cmd = [comspec, u"/c", pyExe, scriptPath]
 
-        p = _dumbwin32proc.Process(reactor,
-                                  processProto,
-                                  None,
-                                  cmd,
-                                  {},
-                                  None)
+        p = _dumbwin32proc.Process(
+            reactor, processProto, None, cmd, {}, None)
         self.assertEqual(42, p.pid)
         self.assertEqual("<Process pid=42>", repr(p))