Assorted pre-Black fixes

Fixes to the test suite, a few errant imports, and setup.py:

- mysql and postgresql have unused 'json' imports; remove
- postgresql is exporting the 'json' symbol, remove
- make sure setup.py can find __version__ using " or '
- retry logic in provision create database for postgresql fixed
- refactor test_magazine to use cls.tables rather than globals
- remove unused class in test_scoping
- add a comment to test_deprecations that this test suite itself
  is deprecated
- don't use mapper() and orm_mapper() in test_unitofwork, just
  use mapper()
- remove dupe test_scalar_set_None test in test_attributes
- Python 2.7 and above includes unittest.SkipTest, remove pre-2.7
  fallback
- use imported SkipTest in profiling
- declarative test_reflection tests with "reflectable_autoincrement"
  already don't run on oracle or firebird; remove conditional logic
  for these, which also removes an "id" symbol
- clean up test in test_functions, remove print statement
- remove dupe test_literal_processor_coercion_native_int_out_of_range
  in test/sql/test_types.py
- fix psycopg2_hstore ref

Change-Id: I7b3444f8546aac82be81cd1e7b6d8b2ad6834fe6

1 files changed, 0 insertions, 18 deletions

diff --git a/test/ext/declarative/test_reflection.py b/test/ext/declarative/test_reflection.py
index fd6a37867..fef9d794c 100644
--- a/test/ext/declarative/test_reflection.py
+++ b/test/ext/declarative/test_reflection.py
@@ -56,18 +56,12 @@ class DeclarativeReflectionTest(DeclarativeReflectionBase):
 
             __tablename__ = 'users'
             __autoload__ = True
-            if testing.against('oracle', 'firebird'):
-                id = Column('id', Integer, primary_key=True,
-                            test_needs_autoincrement=True)
             addresses = relationship('Address', backref='user')
 
         class Address(Base, fixtures.ComparableEntity):
 
             __tablename__ = 'addresses'
             __autoload__ = True
-            if testing.against('oracle', 'firebird'):
-                id = Column('id', Integer, primary_key=True,
-                            test_needs_autoincrement=True)
 
         u1 = User(name='u1', addresses=[Address(email='one'),
                                         Address(email='two')])
@@ -87,9 +81,6 @@ class DeclarativeReflectionTest(DeclarativeReflectionBase):
 
             __tablename__ = 'users'
             __autoload__ = True
-            if testing.against('oracle', 'firebird'):
-                id = Column('id', Integer, primary_key=True,
-                            test_needs_autoincrement=True)
             nom = Column('name', String(50), key='nom')
             addresses = relationship('Address', backref='user')
 
@@ -97,9 +88,6 @@ class DeclarativeReflectionTest(DeclarativeReflectionBase):
 
             __tablename__ = 'addresses'
             __autoload__ = True
-            if testing.against('oracle', 'firebird'):
-                id = Column('id', Integer, primary_key=True,
-                            test_needs_autoincrement=True)
 
         u1 = User(nom='u1', addresses=[Address(email='one'),
                                        Address(email='two')])
@@ -120,18 +108,12 @@ class DeclarativeReflectionTest(DeclarativeReflectionBase):
 
             __tablename__ = 'imhandles'
             __autoload__ = True
-            if testing.against('oracle', 'firebird'):
-                id = Column('id', Integer, primary_key=True,
-                            test_needs_autoincrement=True)
             user_id = Column('user_id', Integer, ForeignKey('users.id'))
 
         class User(Base, fixtures.ComparableEntity):
 
             __tablename__ = 'users'
             __autoload__ = True
-            if testing.against('oracle', 'firebird'):
-                id = Column('id', Integer, primary_key=True,
-                            test_needs_autoincrement=True)
             handles = relationship('IMHandle', backref='user')
 
         u1 = User(name='u1', handles=[