Commits

Antonio Cuni committed 6c3be7b

fix some of the results of the merge. StringListStrategy is called
UnicodeListStrategy on py3k, and withrangelist has been removed (but we still
keep the tests, just because)

Comments (0)

Files changed (2)

pypy/objspace/std/listobject.py

 
         strlist = space.listview_str(w_iterable)
         if strlist is not None:
-            w_list.strategy = strategy = space.fromcache(StringListStrategy)
+            w_list.strategy = strategy = space.fromcache(UnicodeListStrategy)
              # need to copy because intlist can share with w_iterable
             w_list.lstorage = strategy.erase(strlist[:])
             return

pypy/objspace/std/test/test_listobject.py

                 (set, []),  (set,  [5]), (set,  ['x']), (set, [X]),
                 (dict, []), (dict, [(5,6)]), (dict, [('x',7)]), (dict, [(X,8)]),
                 ]:
-            print base, arg
+            print(base, arg)
             class SubClass(base):
                 def __iter__(self):
                     return iter("foobar")
 
 class AppTestForRangeLists(AppTestW_ListObject):
 
-    def setup_class(cls):
-        cls.space = gettestobjspace(**{"objspace.std.withrangelist" :
-                                       True})
+    ## def setup_class(cls):
+    ##     cls.space = gettestobjspace(**{"objspace.std.withrangelist" :
+    ##                                    True})
 
     def test_range_simple_backwards(self):
         x = range(5,1)