Merge pull request justinmayer#9 from philb61/master

Don't override manager if it's in the arguments.

Author: neithere

autoslug/fields.py

@@ -244,6 +244,9 @@ def deconstruct(self):
         if self.always_update:
             kwargs['always_update'] = self.always_update
 
+        if 'manager' in kwargs:
+            del kwargs['manager']
+
         return name, path, args, kwargs
 
     def pre_save(self, instance, add):

autoslug/tests/tests.py

@@ -241,6 +241,12 @@ def test_autoslug_with_manager_name(self):
         b = NonDeletableModelWithUniqueSlug.objects.create(name='My name')
         self.assertEqual(b.slug, u'my-name-2')
 
+    def test_deconstruct_with_manager(self):
+        a = SharedSlugSpace(name='TestName')
+        a.save()
+        _, _, _, kwargs = a._meta.get_field('slug').deconstruct()
+        self.assertNotIn('manager', kwargs)
+
 
 class AutoSlugModelTranslationTestCase(TestCase):