From 00f2b19a5589436ddd5b1ad908ed1b59e0b97825 Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 26 May 2013 13:09:05 -0400
Subject: [PATCH] extension tests

---
 lib/sqlalchemy/ext/orderinglist.py | 16 +++++++---------
 test/ext/declarative/test_basic.py |  6 +++---
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/lib/sqlalchemy/ext/orderinglist.py b/lib/sqlalchemy/ext/orderinglist.py
index 930464d7be..24d405e390 100644
--- a/lib/sqlalchemy/ext/orderinglist.py
+++ b/lib/sqlalchemy/ext/orderinglist.py
@@ -334,15 +334,13 @@ class OrderingList(list):
         super(OrderingList, self).__delitem__(index)
         self._reorder()
 
-# start Py2K
-#    def __setslice__(self, start, end, values):
-#        super(OrderingList, self).__setslice__(start, end, values)
-#        self._reorder()
-#
-#    def __delslice__(self, start, end):
-#        super(OrderingList, self).__delslice__(start, end)
-#        self._reorder()
-# end Py2K
+    def __setslice__(self, start, end, values):
+        super(OrderingList, self).__setslice__(start, end, values)
+        self._reorder()
+
+    def __delslice__(self, start, end):
+        super(OrderingList, self).__delslice__(start, end)
+        self._reorder()
 
     def __reduce__(self):
         return _reconstitute, (self.__class__, self.__dict__, list(self))
diff --git a/test/ext/declarative/test_basic.py b/test/ext/declarative/test_basic.py
index 50d40e8fcc..ad2970b702 100644
--- a/test/ext/declarative/test_basic.py
+++ b/test/ext/declarative/test_basic.py
@@ -13,7 +13,7 @@ from sqlalchemy.orm import relationship, create_session, class_mapper, \
     deferred, column_property, composite,\
     Session
 from sqlalchemy.testing import eq_
-from sqlalchemy.util import classproperty
+from sqlalchemy.util import classproperty, with_metaclass
 from sqlalchemy.ext.declarative import declared_attr, AbstractConcreteBase, \
     ConcreteBase, synonym_for
 from sqlalchemy.testing import fixtures
@@ -133,7 +133,7 @@ class DeclarativeTest(DeclarativeTestBase):
 
         # even though this class has an xyzzy attribute, getattr(cls,"xyzzy")
         # fails
-        class BrokenParent(object, metaclass=BrokenMeta):
+        class BrokenParent(with_metaclass(BrokenMeta)):
             xyzzy = "magic"
 
         # _as_declarative() inspects obj.__class__.__bases__
@@ -274,7 +274,7 @@ class DeclarativeTest(DeclarativeTestBase):
 
             __tablename__ = 'foo'
             id = Column(Integer, primary_key=True)
-            _user_id = Column(Integer) 
+            _user_id = Column(Integer)
             rel = relationship('User',
                                uselist=False,
                                foreign_keys=[User.id],
-- 
2.47.3