Author: Sebastian Pawlu? <[email protected]>
Branch: py3.3
Changeset: r76086:71d4155f0140
Date: 2015-02-23 16:53 +0100
http://bitbucket.org/pypy/pypy/changeset/71d4155f0140/
Log: hg merge
diff --git a/pypy/objspace/std/unicodeobject.py
b/pypy/objspace/std/unicodeobject.py
--- a/pypy/objspace/std/unicodeobject.py
+++ b/pypy/objspace/std/unicodeobject.py
@@ -505,7 +505,7 @@
is_text_encoding = space.is_true(
space.getattr(codec_info, space.wrap('_is_text_encoding')))
except OperationError as e:
- if e.match(space.w_AttributeError):
+ if e.match(space, space.w_AttributeError):
is_text_encoding = True
else:
raise
@@ -559,7 +559,7 @@
is_text_encoding = space.is_true(
space.getattr(codec_info, space.wrap('_is_text_encoding')))
except OperationError as e:
- if e.match(space.w_AttributeError):
+ if e.match(space, space.w_AttributeError):
is_text_encoding = True
else:
raise
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
