[pypy-commit] pypy unicode-utf8-py3: merge unicode-utf8 into branch
Author: Matti Picus
Branch: unicode-utf8-py3
Changeset: r95296:89183b3a84f3
Date: 2018-11-04 22:58 -0500
http://bitbucket.org/pypy/pypy/changeset/89183b3a84f3/
Log:merge unicode-utf8 into branch
diff --git a/rpython/translator/platform/windows.py
b/rpython/translator/platform/windows.py
--- a/rpython/translator/platform/windows.py
+++ b/rpython/translator/platform/windows.py
@@ -85,6 +85,9 @@
stdout, stderr = popen.communicate()
if popen.wait() != 0:
return None
+if stdout[:5].lower() == 'error':
+log.msg('Running "%s" errored: %s' %(vcvars,
stdout.split()[0]))
+return None
except:
return None
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
[pypy-commit] pypy default: error out if vcvars.bat fails
Author: Matti Picus
Branch:
Changeset: r95293:dbfbfcf077e9
Date: 2018-11-04 22:54 -0500
http://bitbucket.org/pypy/pypy/changeset/dbfbfcf077e9/
Log:error out if vcvars.bat fails
diff --git a/rpython/translator/platform/windows.py
b/rpython/translator/platform/windows.py
--- a/rpython/translator/platform/windows.py
+++ b/rpython/translator/platform/windows.py
@@ -88,6 +88,9 @@
stdout, stderr = popen.communicate()
if popen.wait() != 0:
return None
+if stdout[:5].lower() == 'error':
+log.msg('Running "%s" errored: %s' %(vcvars,
stdout.split()[0]))
+return None
except:
return None
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
[pypy-commit] pypy default: merge heads
Author: Matti Picus
Branch:
Changeset: r95299:3e0eab4be623
Date: 2018-11-11 01:03 -0800
http://bitbucket.org/pypy/pypy/changeset/3e0eab4be623/
Log:merge heads
diff --git a/rpython/translator/platform/windows.py
b/rpython/translator/platform/windows.py
--- a/rpython/translator/platform/windows.py
+++ b/rpython/translator/platform/windows.py
@@ -88,6 +88,9 @@
stdout, stderr = popen.communicate()
if popen.wait() != 0:
return None
+if stdout[:5].lower() == 'error':
+log.msg('Running "%s" errored: %s' %(vcvars,
stdout.split()[0]))
+return None
except:
return None
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
[pypy-commit] pypy py3.5: merge default into branch
Author: Matti Picus
Branch: py3.5
Changeset: r95294:27c903e0884f
Date: 2018-11-04 22:55 -0500
http://bitbucket.org/pypy/pypy/changeset/27c903e0884f/
Log:merge default into branch
diff --git a/rpython/translator/platform/windows.py
b/rpython/translator/platform/windows.py
--- a/rpython/translator/platform/windows.py
+++ b/rpython/translator/platform/windows.py
@@ -85,6 +85,9 @@
stdout, stderr = popen.communicate()
if popen.wait() != 0:
return None
+if stdout[:5].lower() == 'error':
+log.msg('Running "%s" errored: %s' %(vcvars,
stdout.split()[0]))
+return None
except:
return None
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
[pypy-commit] pypy unicode-utf8: merge default into branch
Author: Matti Picus
Branch: unicode-utf8
Changeset: r95295:4efd030655e5
Date: 2018-11-04 22:57 -0500
http://bitbucket.org/pypy/pypy/changeset/4efd030655e5/
Log:merge default into branch
diff --git a/rpython/translator/platform/windows.py
b/rpython/translator/platform/windows.py
--- a/rpython/translator/platform/windows.py
+++ b/rpython/translator/platform/windows.py
@@ -88,6 +88,9 @@
stdout, stderr = popen.communicate()
if popen.wait() != 0:
return None
+if stdout[:5].lower() == 'error':
+log.msg('Running "%s" errored: %s' %(vcvars,
stdout.split()[0]))
+return None
except:
return None
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
[pypy-commit] pypy default: fix tests to pass on win32
Author: Matti Picus Branch: Changeset: r95297:956dce5d3456 Date: 2018-11-11 00:25 -0800 http://bitbucket.org/pypy/pypy/changeset/956dce5d3456/ Log:fix tests to pass on win32 diff --git a/pypy/module/posix/test/test_posix2.py b/pypy/module/posix/test/test_posix2.py --- a/pypy/module/posix/test/test_posix2.py +++ b/pypy/module/posix/test/test_posix2.py @@ -211,9 +211,9 @@ def test_pickle(self): import pickle, os st = self.posix.stat(os.curdir) -print type(st).__module__ +# print type(st).__module__ s = pickle.dumps(st) -print repr(s) +# print repr(s) new = pickle.loads(s) assert new == st assert type(new) is type(st) @@ -303,7 +303,7 @@ try: fid = posix.fdopen(fd) fid.read(10) -except OSError as e: +except (IOError, OSError) as e: assert e.errno == errno.EBADF else: assert False, "using result of fdopen(fd) on closed file must raise" @@ -576,6 +576,12 @@ assert '\nOSError: [Errno 9]' in res else: assert res == 'test1\n' +if sys.platform == "win32": +# using startfile in app_startfile creates global state +test_popen.dont_track_allocations = True +test_popen_with.dont_track_allocations = True +test_popen_child_fds.dont_track_allocations = True + if hasattr(__import__(os.name), '_getfullpathname'): def test__getfullpathname(self): ___ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit
[pypy-commit] pypy py3.5: merge heads
Author: Matti Picus
Branch: py3.5
Changeset: r95298:aea8f2fd3593
Date: 2018-11-11 00:50 -0800
http://bitbucket.org/pypy/pypy/changeset/aea8f2fd3593/
Log:merge heads
diff --git a/rpython/translator/platform/windows.py
b/rpython/translator/platform/windows.py
--- a/rpython/translator/platform/windows.py
+++ b/rpython/translator/platform/windows.py
@@ -85,6 +85,9 @@
stdout, stderr = popen.communicate()
if popen.wait() != 0:
return None
+if stdout[:5].lower() == 'error':
+log.msg('Running "%s" errored: %s' %(vcvars,
stdout.split()[0]))
+return None
except:
return None
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
