Author: Amaury Forgeot d'Arc <[email protected]>
Branch: py3.3
Changeset: r78337:71ece22ac15d
Date: 2015-06-28 15:51 +0200
http://bitbucket.org/pypy/pypy/changeset/71ece22ac15d/
Log: Fix translation, and add a message to an assertion I don't undestand
diff --git a/pypy/module/imp/importing.py b/pypy/module/imp/importing.py
--- a/pypy/module/imp/importing.py
+++ b/pypy/module/imp/importing.py
@@ -15,7 +15,7 @@
from rpython.rlib.streamio import StreamErrors
from rpython.rlib.objectmodel import we_are_translated, specialize
from rpython.rlib.signature import signature
-from rpython.rlib import rposix, types
+from rpython.rlib import rposix_stat, types
from pypy.module.sys.version import PYPY_VERSION
_WIN32 = sys.platform == 'win32'
@@ -115,7 +115,7 @@
# Directory should not exist
try:
- st = rposix.stat(_WIN32Path(path) if win32 else path)
+ st = rposix_stat.stat(_WIN32Path(path) if win32 else path)
except OSError:
pass
else:
diff --git a/rpython/annotator/annrpython.py b/rpython/annotator/annrpython.py
--- a/rpython/annotator/annrpython.py
+++ b/rpython/annotator/annrpython.py
@@ -242,7 +242,7 @@
def setbinding(self, arg, s_value):
s_old = arg.annotation
if s_old is not None:
- assert s_value.contains(s_old)
+ assert s_value.contains(s_old), "%s does not contain %s" %
(s_value, s_old)
arg.annotation = s_value
def warning(self, msg, pos=None):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
