Author: Amaury Forgeot d'Arc <[email protected]>
Branch: py3k
Changeset: r50153:0cf341cfa0f7
Date: 2011-12-04 19:38 +0100
http://bitbucket.org/pypy/pypy/changeset/0cf341cfa0f7/
Log: Merge glitch
diff --git a/pypy/objspace/std/listobject.py b/pypy/objspace/std/listobject.py
--- a/pypy/objspace/std/listobject.py
+++ b/pypy/objspace/std/listobject.py
@@ -922,9 +922,6 @@
if reverse:
l.reverse()
-<<<<<<< local
-class UnicodeListStrategy(AbstractUnwrappedStrategy, ListStrategy):
-=======
class FloatListStrategy(AbstractUnwrappedStrategy, ListStrategy):
_none_value = 0.0
_applevel_repr = "float"
@@ -952,8 +949,7 @@
if reverse:
l.reverse()
-class StringListStrategy(AbstractUnwrappedStrategy, ListStrategy):
->>>>>>> other
+class UnicodeListStrategy(AbstractUnwrappedStrategy, ListStrategy):
_none_value = None
_applevel_repr = "str"
@@ -1306,12 +1302,8 @@
TimSort = make_timsort_class()
IntBaseTimSort = make_timsort_class()
-<<<<<<< local
+FloatBaseTimSort = make_timsort_class()
UnicodeBaseTimSort = make_timsort_class()
-=======
-FloatBaseTimSort = make_timsort_class()
-StringBaseTimSort = make_timsort_class()
->>>>>>> other
class KeyContainer(baseobjspace.W_Root):
def __init__(self, w_key, w_item):
@@ -1331,15 +1323,11 @@
def lt(self, a, b):
return a < b
-<<<<<<< local
-class UnicodeSort(UnicodeBaseTimSort):
-=======
class FloatSort(FloatBaseTimSort):
def lt(self, a, b):
return a < b
-class StringSort(StringBaseTimSort):
->>>>>>> other
+class UnicodeSort(UnicodeBaseTimSort):
def lt(self, a, b):
return a < b
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
