Author: Amaury Forgeot d'Arc <[email protected]>
Branch: py3k
Changeset: r59256:61ec51116bd6
Date: 2012-12-02 11:34 +0100
http://bitbucket.org/pypy/pypy/changeset/61ec51116bd6/
Log: hg merge default
diff --git a/pypy/objspace/std/objspace.py b/pypy/objspace/std/objspace.py
--- a/pypy/objspace/std/objspace.py
+++ b/pypy/objspace/std/objspace.py
@@ -50,7 +50,6 @@
self.FrameClass = frame.build_frame(self)
self.StringObjectCls = W_StringObject
-
self.UnicodeObjectCls = W_UnicodeObject
self._install_multimethods()
diff --git a/pypy/tool/pytest/objspace.py b/pypy/tool/pytest/objspace.py
--- a/pypy/tool/pytest/objspace.py
+++ b/pypy/tool/pytest/objspace.py
@@ -10,7 +10,7 @@
""" helper for instantiating and caching space's for testing.
"""
try:
- config = make_config(option,**kwds)
+ config = make_config(option, **kwds)
except ConflictConfigError as e:
# this exception is typically only raised if a module is not available.
# in this case the test should be skipped
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
