[pypy-commit] pypy default: remove quotes for windows
mattip
noreply at buildbot.pypy.org
Mon Mar 31 07:32:52 CEST 2014
Author: Matti Picus <matti.picus at gmail.com>
Branch:
Changeset: r70342:9308b3e48ee7
Date: 2014-03-31 08:06 +0300
http://bitbucket.org/pypy/pypy/changeset/9308b3e48ee7/
Log: remove quotes for windows
diff --git a/lib-python/2.7/ssl.py b/lib-python/2.7/ssl.py
--- a/lib-python/2.7/ssl.py
+++ b/lib-python/2.7/ssl.py
@@ -193,6 +193,7 @@
self.__class__)
while True:
try:
+ import pdb;pdb.set_trace()
v = self._sslobj.write(data)
except SSLError, x:
if x.args[0] == SSL_ERROR_WANT_READ:
diff --git a/pypy/module/test_lib_pypy/test_site_extra.py b/pypy/module/test_lib_pypy/test_site_extra.py
--- a/pypy/module/test_lib_pypy/test_site_extra.py
+++ b/pypy/module/test_lib_pypy/test_site_extra.py
@@ -4,8 +4,11 @@
def test_preimported_modules():
lst = ['__builtin__', '_codecs', '_warnings', 'codecs', 'encodings',
'exceptions', 'signal', 'sys', 'zipimport']
- g = os.popen('"%s" -c "import sys; print sorted(sys.modules)"' %
- (sys.executable,))
+ if sys.platform == 'win32':
+ cmd = '%s' % (sys.executable,)
+ else:
+ cmd = '"%s"' % (sys.executable,)
+ g = os.popen(cmd + ' -c "import sys; print sorted(sys.modules)"')
real_data = g.read()
g.close()
for name in lst:
More information about the pypy-commit
mailing list