##// END OF EJS Templates
py3: ensure run-tests.osenvironb is actually bytes...
Matt Harbison -
r39681:13179f97 default
parent child Browse files
Show More
@@ -86,8 +86,6 b" if os.environ.get('RTUNICODEPEDANTRY', F"
86 except NameError:
86 except NameError:
87 pass
87 pass
88
88
89 origenviron = os.environ.copy()
90 osenvironb = getattr(os, 'environb', os.environ)
91 processlock = threading.Lock()
89 processlock = threading.Lock()
92
90
93 pygmentspresent = False
91 pygmentspresent = False
@@ -141,6 +139,8 b' if pygmentspresent:'
141 runnerformatter = formatters.Terminal256Formatter(style=TestRunnerStyle)
139 runnerformatter = formatters.Terminal256Formatter(style=TestRunnerStyle)
142 runnerlexer = TestRunnerLexer()
140 runnerlexer = TestRunnerLexer()
143
141
142 origenviron = os.environ.copy()
143
144 if sys.version_info > (3, 5, 0):
144 if sys.version_info > (3, 5, 0):
145 PYTHON3 = True
145 PYTHON3 = True
146 xrange = range # we use xrange in one place, and we'd rather not use range
146 xrange = range # we use xrange in one place, and we'd rather not use range
@@ -154,6 +154,13 b' if sys.version_info > (3, 5, 0):'
154 return p
154 return p
155 return p.decode('utf-8')
155 return p.decode('utf-8')
156
156
157 osenvironb = getattr(os, 'environb', None)
158 if osenvironb is None:
159 # Windows lacks os.environb, for instance.
160 osenvironb = {
161 _bytespath(k): _bytespath(v) for k, v in os.environ.items()
162 }
163
157 elif sys.version_info >= (3, 0, 0):
164 elif sys.version_info >= (3, 0, 0):
158 print('%s is only supported on Python 3.5+ and 2.7, not %s' %
165 print('%s is only supported on Python 3.5+ and 2.7, not %s' %
159 (sys.argv[0], '.'.join(str(v) for v in sys.version_info[:3])))
166 (sys.argv[0], '.'.join(str(v) for v in sys.version_info[:3])))
@@ -169,6 +176,7 b' else:'
169 return p
176 return p
170
177
171 _strpath = _bytespath
178 _strpath = _bytespath
179 osenvironb = os.environ
172
180
173 # For Windows support
181 # For Windows support
174 wifexited = getattr(os, "WIFEXITED", lambda x: False)
182 wifexited = getattr(os, "WIFEXITED", lambda x: False)
General Comments 0
You need to be logged in to leave comments. Login now