- the raw 2to3 run

- went through examples/ and cleaned out excess list() calls

1 files changed, 40 insertions, 40 deletions

diff --git a/test/sql/test_unicode.py b/test/sql/test_unicode.py
index 37e44522e..2ab081dad 100644
--- a/test/sql/test_unicode.py
+++ b/test/sql/test_unicode.py
@@ -19,13 +19,13 @@ class UnicodeSchemaTest(fixtures.TestBase):
 
         metadata = MetaData(unicode_bind)
         t1 = Table('unitable1', metadata,
-            Column(u'méil', Integer, primary_key=True),
-            Column(u'\u6e2c\u8a66', Integer),
+            Column('méil', Integer, primary_key=True),
+            Column('\u6e2c\u8a66', Integer),
             test_needs_fk=True,
             )
-        t2 = Table(u'Unitéble2', metadata,
-            Column(u'méil', Integer, primary_key=True, key="a"),
-            Column(u'\u6e2c\u8a66', Integer, ForeignKey(u'unitable1.méil'),
+        t2 = Table('Unitéble2', metadata,
+            Column('méil', Integer, primary_key=True, key="a"),
+            Column('\u6e2c\u8a66', Integer, ForeignKey('unitable1.méil'),
                    key="b"
                    ),
                    test_needs_fk=True,
@@ -33,27 +33,27 @@ class UnicodeSchemaTest(fixtures.TestBase):
 
         # Few DBs support Unicode foreign keys
         if testing.against('sqlite'):
-            t3 = Table(u'\u6e2c\u8a66', metadata,
-                       Column(u'\u6e2c\u8a66_id', Integer, primary_key=True,
+            t3 = Table('\u6e2c\u8a66', metadata,
+                       Column('\u6e2c\u8a66_id', Integer, primary_key=True,
                               autoincrement=False),
-                       Column(u'unitable1_\u6e2c\u8a66', Integer,
-                              ForeignKey(u'unitable1.\u6e2c\u8a66')
+                       Column('unitable1_\u6e2c\u8a66', Integer,
+                              ForeignKey('unitable1.\u6e2c\u8a66')
                               ),
-                       Column(u'Unitéble2_b', Integer,
-                              ForeignKey(u'Unitéble2.b')
+                       Column('Unitéble2_b', Integer,
+                              ForeignKey('Unitéble2.b')
                               ),
-                       Column(u'\u6e2c\u8a66_self', Integer,
-                              ForeignKey(u'\u6e2c\u8a66.\u6e2c\u8a66_id')
+                       Column('\u6e2c\u8a66_self', Integer,
+                              ForeignKey('\u6e2c\u8a66.\u6e2c\u8a66_id')
                               ),
                        test_needs_fk=True,
                        )
         else:
-            t3 = Table(u'\u6e2c\u8a66', metadata,
-                       Column(u'\u6e2c\u8a66_id', Integer, primary_key=True,
+            t3 = Table('\u6e2c\u8a66', metadata,
+                       Column('\u6e2c\u8a66_id', Integer, primary_key=True,
                               autoincrement=False),
-                       Column(u'unitable1_\u6e2c\u8a66', Integer),
-                       Column(u'Unitéble2_b', Integer),
-                       Column(u'\u6e2c\u8a66_self', Integer),
+                       Column('unitable1_\u6e2c\u8a66', Integer),
+                       Column('Unitéble2_b', Integer),
+                       Column('\u6e2c\u8a66_self', Integer),
                        test_needs_fk=True,
                        )
         metadata.create_all()
@@ -72,42 +72,42 @@ class UnicodeSchemaTest(fixtures.TestBase):
         del unicode_bind
 
     def test_insert(self):
-        t1.insert().execute({u'méil':1, u'\u6e2c\u8a66':5})
+        t1.insert().execute({'méil':1, '\u6e2c\u8a66':5})
         t2.insert().execute({'a':1, 'b':1})
-        t3.insert().execute({u'\u6e2c\u8a66_id': 1,
-                             u'unitable1_\u6e2c\u8a66': 5,
-                             u'Unitéble2_b': 1,
-                             u'\u6e2c\u8a66_self': 1})
+        t3.insert().execute({'\u6e2c\u8a66_id': 1,
+                             'unitable1_\u6e2c\u8a66': 5,
+                             'Unitéble2_b': 1,
+                             '\u6e2c\u8a66_self': 1})
 
         assert t1.select().execute().fetchall() == [(1, 5)]
         assert t2.select().execute().fetchall() == [(1, 1)]
         assert t3.select().execute().fetchall() == [(1, 5, 1, 1)]
 
     def test_reflect(self):
-        t1.insert().execute({u'méil':2, u'\u6e2c\u8a66':7})
+        t1.insert().execute({'méil':2, '\u6e2c\u8a66':7})
         t2.insert().execute({'a':2, 'b':2})
-        t3.insert().execute({u'\u6e2c\u8a66_id': 2,
-                             u'unitable1_\u6e2c\u8a66': 7,
-                             u'Unitéble2_b': 2,
-                             u'\u6e2c\u8a66_self': 2})
+        t3.insert().execute({'\u6e2c\u8a66_id': 2,
+                             'unitable1_\u6e2c\u8a66': 7,
+                             'Unitéble2_b': 2,
+                             '\u6e2c\u8a66_self': 2})
 
         meta = MetaData(unicode_bind)
         tt1 = Table(t1.name, meta, autoload=True)
         tt2 = Table(t2.name, meta, autoload=True)
         tt3 = Table(t3.name, meta, autoload=True)
 
-        tt1.insert().execute({u'méil':1, u'\u6e2c\u8a66':5})
-        tt2.insert().execute({u'méil':1, u'\u6e2c\u8a66':1})
-        tt3.insert().execute({u'\u6e2c\u8a66_id': 1,
-                              u'unitable1_\u6e2c\u8a66': 5,
-                              u'Unitéble2_b': 1,
-                              u'\u6e2c\u8a66_self': 1})
+        tt1.insert().execute({'méil':1, '\u6e2c\u8a66':5})
+        tt2.insert().execute({'méil':1, '\u6e2c\u8a66':1})
+        tt3.insert().execute({'\u6e2c\u8a66_id': 1,
+                              'unitable1_\u6e2c\u8a66': 5,
+                              'Unitéble2_b': 1,
+                              '\u6e2c\u8a66_self': 1})
 
-        self.assert_(tt1.select(order_by=desc(u'méil')).execute().fetchall() ==
+        self.assert_(tt1.select(order_by=desc('méil')).execute().fetchall() ==
                      [(2, 7), (1, 5)])
-        self.assert_(tt2.select(order_by=desc(u'méil')).execute().fetchall() ==
+        self.assert_(tt2.select(order_by=desc('méil')).execute().fetchall() ==
                      [(2, 2), (1, 1)])
-        self.assert_(tt3.select(order_by=desc(u'\u6e2c\u8a66_id')).
+        self.assert_(tt3.select(order_by=desc('\u6e2c\u8a66_id')).
                      execute().fetchall() ==
                      [(2, 7, 2, 2), (1, 5, 1, 1)])
         meta.drop_all()
@@ -117,7 +117,7 @@ class EscapesDefaultsTest(fixtures.TestBase):
     def test_default_exec(self):
         metadata = MetaData(testing.db)
         t1 = Table('t1', metadata,
-            Column(u'special_col', Integer, Sequence('special_col'), primary_key=True),
+            Column('special_col', Integer, Sequence('special_col'), primary_key=True),
             Column('data', String(50)) # to appease SQLite without DEFAULT VALUES
             )
         metadata.create_all()
@@ -128,8 +128,8 @@ class EscapesDefaultsTest(fixtures.TestBase):
             # reset the identifier preparer, so that we can force it to cache
             # a unicode identifier
             engine.dialect.identifier_preparer = engine.dialect.preparer(engine.dialect)
-            select([column(u'special_col')]).select_from(t1).execute().close()
-            assert isinstance(engine.dialect.identifier_preparer.format_sequence(Sequence('special_col')), unicode)
+            select([column('special_col')]).select_from(t1).execute().close()
+            assert isinstance(engine.dialect.identifier_preparer.format_sequence(Sequence('special_col')), str)
 
             # now execute, run the sequence.  it should run in u"Special_col.nextid" or similar as
             # a unicode object; cx_oracle asserts that this is None or a String (postgresql lets it pass thru).