Author: Manuel Jacob
Branch: refactor-str-types
Changeset: r65731:d6b1adc23375
Date: 2013-07-27 21:08 +0200
http://bitbucket.org/pypy/pypy/changeset/d6b1adc23375/
Log: Fix.
diff --git a/pypy/objspace/std/bytearrayobject.py
b/pypy/objspace/std/bytearrayobject.py
--- a/pypy/objspace/std/bytearrayobject.py
+++ b/pypy/objspace/std/bytearrayobject.py
@@ -91,11 +91,11 @@
return ch
def _join_return_one(self, space, w_obj):
- return space.is_w(space.type(w_obj), space.w_unicode)
+ return False
def _join_check_item(self, space, w_obj):
- if (space.is_w(space.type(w_obj), space.w_str) or
- space.is_w(space.type(w_obj), space.w_bytearray)):
+ if (space.isinstance_w(w_obj, space.w_str) or
+ space.isinstance_w(w_obj, space.w_bytearray)):
return 0
return 1
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
