[1.0.X] Fixed up the tests added for #9779 to run under Python 2.3, which doesn't have set.

Merge of the part of [10392] that applies to the 1.0.X branch.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10393 bcc190cf-cafb-0310-a4f2-bffc1f526a37

tests/regressiontests/introspection/tests.py

@@ -5,13 +5,18 @@ from django.utils import functional
 
 from models import Reporter, Article
 
+try:
+    set
+except NameError:
+    from sets import Set as set     # Python 2.3 fallback
+
 #
 # The introspection module is optional, so methods tested here might raise
 # NotImplementedError. This is perfectly acceptable behavior for the backend
 # in question, but the tests need to handle this without failing. Ideally we'd
 # skip these tests, but until #4788 is done we'll just ignore them.
 #
-# The easiest way to accomplish this is to decorate every test case with a 
+# The easiest way to accomplish this is to decorate every test case with a
 # wrapper that ignores the exception.
 #
 # The metaclass is just for fun.
@@ -35,14 +40,14 @@ class IgnoreNotimplementedError(type):
 
 class IntrospectionTests(TestCase):
     __metaclass__ = IgnoreNotimplementedError
-    
+
     def test_table_names(self):
         tl = connection.introspection.table_names()
-        self.assert_(Reporter._meta.db_table in tl, 
+        self.assert_(Reporter._meta.db_table in tl,
                      "'%s' isn't in table_list()." % Reporter._meta.db_table)
-        self.assert_(Article._meta.db_table in tl, 
+        self.assert_(Article._meta.db_table in tl,
                      "'%s' isn't in table_list()." % Article._meta.db_table)
-                     
+
     def test_django_table_names(self):
         cursor = connection.cursor()
         cursor.execute('CREATE TABLE django_introspection_test_table (id INTEGER);');
@@ -50,26 +55,26 @@ class IntrospectionTests(TestCase):
         cursor.execute("DROP TABLE django_introspection_test_table;")
         self.assert_('django_introspection_testcase_table' not in tl,
                      "django_table_names() returned a non-Django table")
-                        
+
     def test_installed_models(self):
         tables = [Article._meta.db_table, Reporter._meta.db_table]
         models = connection.introspection.installed_models(tables)
         self.assertEqual(models, set([Article, Reporter]))
-        
+
     def test_sequence_list(self):
         sequences = connection.introspection.sequence_list()
         expected = {'table': Reporter._meta.db_table, 'column': 'id'}
-        self.assert_(expected in sequences, 
+        self.assert_(expected in sequences,
                      'Reporter sequence not found in sequence_list()')
-                     
+
     def test_get_table_description_names(self):
         cursor = connection.cursor()
         desc = connection.introspection.get_table_description(cursor, Reporter._meta.db_table)
         self.assertEqual([r[0] for r in desc],
                          [f.column for f in Reporter._meta.fields])
-    
+
     def test_get_table_description_types(self):
-        cursor = connection.cursor()            
+        cursor = connection.cursor()
         desc = connection.introspection.get_table_description(cursor, Reporter._meta.db_table)
         self.assertEqual([datatype(r[1]) for r in desc],
                           ['IntegerField', 'CharField', 'CharField', 'CharField'])
@@ -78,7 +83,7 @@ class IntrospectionTests(TestCase):
     if settings.DATABASE_ENGINE.startswith('postgresql'):
         def test_postgresql_real_type(self):
             cursor = connection.cursor()
-            cursor.execute("CREATE TABLE django_introspection_real_test_table (number REAL);") 
+            cursor.execute("CREATE TABLE django_introspection_real_test_table (number REAL);")
             desc = connection.introspection.get_table_description(cursor, 'django_introspection_real_test_table')
             cursor.execute('DROP TABLE django_introspection_real_test_table;')
             self.assertEqual(datatype(desc[0][1]), 'FloatField')
@@ -86,19 +91,19 @@ class IntrospectionTests(TestCase):
     def test_get_relations(self):
         cursor = connection.cursor()
         relations = connection.introspection.get_relations(cursor, Article._meta.db_table)
-        
+
         # Older versions of MySQL don't have the chops to report on this stuff,
         # so just skip it if no relations come back. If they do, though, we
         # should test that the response is correct.
         if relations:
             # That's {field_index: (field_index_other_table, other_table)}
             self.assertEqual(relations, {3: (0, Reporter._meta.db_table)})
-            
+
     def test_get_indexes(self):
         cursor = connection.cursor()
         indexes = connection.introspection.get_indexes(cursor, Article._meta.db_table)
         self.assertEqual(indexes['reporter_id'], {'unique': False, 'primary_key': False})
-        
+
 def datatype(dbtype):
     """Helper to convert a data type into a string."""
     dt = connection.introspection.data_types_reverse[dbtype]