Removed some Django 0.96-only code

 - Legacy-Id: 1870

Author: pasieronen

ietf/bin/convert-096.py

@@ -329,12 +329,6 @@ def stable_dictsort(value, arg):
     decorated.sort(lambda a, b: cmp(a[0], b[0]))
     return [item[1] for item in decorated]
 
-# DJANGO_096: a dummy safe filter for Django 0.96
-if django.VERSION[0] == 0:
-    @register.filter
-    def safe(x):
-        return x
-
 def _test():
     import doctest
     doctest.testmod()

ietf/idtracker/templatetags/ietf_filters.py

@@ -23,51 +23,22 @@
 phone_re = re.compile(r'^\+?[0-9 ]*(\([0-9]+\))?[0-9 -]+( ?x ?[0-9]+)?$')
 phone_error_message = """Phone numbers may have a leading "+", and otherwise only contain numbers [0-9]; dash, period or space; parentheses, and an optional extension number indicated by 'x'."""
 
-if django.VERSION[0] == 0:
-
-    def ipr_detail_form_callback(field, **kwargs):
-        if field.name == "licensing_option":
-            return forms.IntegerField(widget=forms.RadioSelect(choices=models.LICENSE_CHOICES), required=False, **kwargs)
-        if field.name in ["is_pending", "applies_to_all"]:
-            return forms.IntegerField(widget=forms.RadioSelect(choices=((1, "YES"), (2, "NO"))), required=False, **kwargs)
-        if field.name in ("rfc_number", "id_document_tag"): #, 'legacy_url_0','legacy_url_1','legacy_title_1','legacy_url_2','legacy_title_2'):
-            return None
-        return field.formfield(**kwargs)
-
-    def ipr_contact_form_callback(field, **kwargs):
-        if field.name in ('ipr', 'contact_type'):
-            return None
-        if field.name == "telephone":
-            return forms.RegexField(phone_re, error_message=phone_error_message, **kwargs)
-        if field.name == "fax":
-            return forms.RegexField(phone_re, error_message=phone_error_message, required=False, **kwargs)
-        return field.formfield(**kwargs)
-        # TODO:
-        #   Add rfc existence validation for RFC field
-        #   Add draft existence validation for Drafts field
-
-    # Get base form classes for our models
-    BaseIprForm = forms.form_for_model(models.IprDetail, formfield_callback=ipr_detail_form_callback)
-    BaseContactForm = forms.form_for_model(models.IprContact, formfield_callback=ipr_contact_form_callback)
-    
-else:
-    # Django 1.x
-    
-    from django.forms import ModelForm
-    class BaseIprForm(ModelForm):
-        licensing_option = forms.IntegerField(widget=forms.RadioSelect(choices=models.LICENSE_CHOICES), required=False)
-        is_pending = forms.IntegerField(widget=forms.RadioSelect(choices=((1, "YES"), (2, "NO"))), required=False)
-        applies_to_all = forms.IntegerField(widget=forms.RadioSelect(choices=((1, "YES"), (2, "NO"))), required=False)
-        class Meta:
-            model = models.IprDetail
-            exclude = ('rfc_document', 'id_document_tag') # 'legacy_url_0','legacy_url_1','legacy_title_1','legacy_url_2','legacy_title_2')
-            
-    class BaseContactForm(ModelForm):
-        telephone = forms.RegexField(phone_re, error_message=phone_error_message)
-        fax = forms.RegexField(phone_re, error_message=phone_error_message, required=False)
-        class Meta:
-            model = models.IprContact
-            exclude = ('ipr', 'contact_type')
+from django.forms import ModelForm
+
+class BaseIprForm(ModelForm):
+    licensing_option = forms.IntegerField(widget=forms.RadioSelect(choices=models.LICENSE_CHOICES), required=False)
+    is_pending = forms.IntegerField(widget=forms.RadioSelect(choices=((1, "YES"), (2, "NO"))), required=False)
+    applies_to_all = forms.IntegerField(widget=forms.RadioSelect(choices=((1, "YES"), (2, "NO"))), required=False)
+    class Meta:
+        model = models.IprDetail
+        exclude = ('rfc_document', 'id_document_tag') # 'legacy_url_0','legacy_url_1','legacy_title_1','legacy_url_2','legacy_title_2')
+        
+class BaseContactForm(ModelForm):
+    telephone = forms.RegexField(phone_re, error_message=phone_error_message)
+    fax = forms.RegexField(phone_re, error_message=phone_error_message, required=False)
+    class Meta:
+        model = models.IprContact
+        exclude = ('ipr', 'contact_type')
 
 # Some subclassing:
 

ietf/ipr/new.py

@@ -179,9 +179,6 @@ def get_templates():
 
 class TemplateCoverageTestCase(unittest.TestCase):
     def testTemplateCoverage(self):
-        if django.VERSION[0] == 0:
-            print "Not testing template coverage under Django 0.96"
-            return
         if not test_runner.loaded_templates:
             print "Skipping template coverage test"
             return

ietf/redirects/tests.py

@@ -63,12 +63,6 @@
      (r'^accounts/(?P<dir>\w+)/', 'django.views.generic.simple.redirect_to', { 'url': '/account/%(dir)s/' }),
 )
 
-# New admin site works differently, and needs work                       
-if django.VERSION[0] == 0:
-    urlpatterns += patterns('',
-        (r'^admin/', include('django.contrib.admin.urls')),
-        )
-
 if settings.SERVER_MODE in ('development', 'test'):
     urlpatterns += patterns('',
         (r'^(?P<path>(?:images|css|js)/.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}),

ietf/urls.py

@@ -44,14 +44,6 @@
 old_destroy = None
 old_create = None
 
-def safe_create_0(verbosity, *args, **kwargs):
-    global test_database_name, old_create
-    print "Creating test database..."
-    x = old_create(0, *args, **kwargs)
-    print "Saving test database name "+settings.DATABASE_NAME+"..."
-    test_database_name = settings.DATABASE_NAME
-    return x
-
 def safe_create_1(self, verbosity, *args, **kwargs):
     global test_database_name, old_create
     print "Creating test database..."
@@ -68,21 +60,6 @@ def safe_destroy_0_1(*args, **kwargs):
         settings.DATABASE_NAME = test_database_name
     return old_destroy(*args, **kwargs)
 
-# Test that test/r5106.patch has been applied. This is not written
-# as normal test case, because it needs to be run before Django's
-# test framework takes over. This test applies only to Django 0.96,
-# and can be removed once we transition to 1.x.
-def test_django_foreignkey_patch():
-    print "Testing Django 0.96 ForeignKey patch..."
-    try:
-        import ietf
-        t = django.core.management._get_sql_model_create(ietf.idtracker.models.GoalMilestone)
-    except KeyError, f:
-        if str(f.args) == "('ForeignKey',)":
-            raise Exception("Django 0.96 patch in test/r5106.patch not installed?")
-        else:
-            raise
-
 def test_send_smtp(msg, bcc=None):
     global mail_outbox
     mail_outbox.append(msg)
@@ -93,17 +70,6 @@ def template_coverage_loader(template_name, dirs):
 
 template_coverage_loader.is_usable = True
 
-def run_tests_0(*args, **kwargs):
-    global old_destroy, old_create, test_database_name
-    import django.test.utils
-    m = sys.modules['django.test.utils']
-    old_create = m.create_test_db
-    m.create_test_db = safe_create_0
-    old_destroy = m.destroy_test_db
-    m.destroy_test_db = safe_destroy_0_1
-    from django.test.simple import run_tests
-    run_tests(*args, **kwargs)
-
 def run_tests_1(test_labels, *args, **kwargs):
     global old_destroy, old_create, test_database_name
     from django.db import connection
@@ -125,9 +91,5 @@ def run_tests(*args, **kwargs):
         raise EnvironmentError("Refusing to run tests on core3")
     import ietf.utils.mail
     ietf.utils.mail.send_smtp = test_send_smtp
-    if django.VERSION[0] == 0:
-        test_django_foreignkey_patch()
-        run_tests_0(*args, **kwargs)
-    else:
-        run_tests_1(*args, **kwargs)
+    run_tests_1(*args, **kwargs)
 

ietf/utils/test_runner.py

@@ -60,18 +60,12 @@ def tearDownRealDatabase(self):
         self._setDatabaseName(self._original_testdb)
 
     def _getDatabaseName(self):
-        if django.VERSION[0] == 0:
-            return django.conf.settings.DATABASE_NAME 
-        else:
-            return connection.settings_dict['DATABASE_NAME'] 
+        return connection.settings_dict['DATABASE_NAME'] 
 
     def _setDatabaseName(self, name):        
         connection.close()
-        if django.VERSION[0] == 0:
-            django.conf.settings.DATABASE_NAME = name
-        else:
-            django.conf.settings.DATABASE_NAME = name
-            connection.settings_dict['DATABASE_NAME'] = name
+        django.conf.settings.DATABASE_NAME = name
+        connection.settings_dict['DATABASE_NAME'] = name
         connection.cursor()
 
 def read_testurls(filename):