Author: Philip Jenvey <pjen...@underboss.org>
Branch: py3k
Changeset: r62781:135678f7f339
Date: 2013-03-25 18:11 -0700
http://bitbucket.org/pypy/pypy/changeset/135678f7f339/
Log: fix breakage from default merge
diff --git a/pypy/module/__builtin__/interp_memoryview.py
b/pypy/module/__builtin__/interp_memoryview.py
--- a/pypy/module/__builtin__/interp_memoryview.py
+++ b/pypy/module/__builtin__/interp_memoryview.py
@@ -20,7 +20,7 @@
def _make_descr__cmp(name):
def descr__cmp(self, space, w_other):
if self.buf is None:
- return space.wrap(getattr(operator, name)(self, other))
+ return space.wrap(getattr(operator, name)(self, w_other))
if isinstance(w_other, W_MemoryView):
# xxx not the most efficient implementation
str1 = self.as_str()
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
