Commits

Jannis Leidel committed 5f86962 Merge

Merged.

  • Participants
  • Parent commits 365f65f, cac0d2c

Comments (0)

Files changed (2)

-Copyright (c) 2008-2009, Bela Hausmann and individual contributors
+Copyright (c) 2008-2011, Bela Hausmann and individual contributors
 All rights reserved.
  
 Redistribution and use in source and binary forms, with or without

File licenses/fields.py

         and a shortcut for switching blank/null to True.
     '''
 
-    def __init__(self, **kwargs):
+    def __init__(self, *args, **kwargs):
         kwargs.setdefault('verbose_name', _('license'))
         if kwargs.pop('required', None) == False:
             kwargs['blank'] = True
             kwargs['null'] = True
-        ForeignKey.__init__(self, 'licenses.License', **kwargs)
+        super(ForeignKey, self).__init__('licenses.License', *args, **kwargs)
 
 
-    def south_field_triple(self):
-        "Returns a suitable description of this field for South."
-        return ('licenses.fields.LicenseField', [], {})	
+try:
+    from south.modelsinspector import add_introspection_rules
+    add_introspection_rules([], ['^licenses\.fields\.LicenseField'])
+except ImportError:
+    pass