Revert "Renamed djangomod module and state to django while enforcing absolute imports."

This reverts commit 2f4d82b295.

doc/ref/modules/all/index.rst

@@ -41,7 +41,7 @@ Full list of builtin execution modules
     debian_service
     dig
     disk
-    django
+    djangomod
     dnsmasq
     dnsutil
     dpkg

doc/ref/modules/all/salt.modules.django.rst

@@ -1,6 +0,0 @@
-===================
-salt.modules.django
-===================
-
-.. automodule:: salt.modules.django
-    :members:

doc/ref/modules/all/salt.modules.djangomod.rst

@@ -1 +1,6 @@
-Please see :doc:`salt.modules.django`.
+======================
+salt.modules.djangomod
+======================
+
+.. automodule:: salt.modules.djangomod
+    :members:

salt/modules/djangomod.py

@@ -3,12 +3,11 @@ Manage Django sites
 '''
 
 # Import python libs
-from __future__ import absolute_import
 import os
 
 
 def __virtual__():
-    return True
+    return 'django'
 
 
 def _get_django_admin(bin_env):
@@ -84,7 +83,7 @@ def syncdb(settings_module,
         args.append('noinput')
 
     return command(settings_module,
-                   'syncdb',
+                  'syncdb',
                    bin_env,
                    pythonpath,
                    env,

tests/integration/modules/django.py

@@ -8,7 +8,7 @@ ensure_in_syspath('../../')
 
 # Import salt libs
 import integration
-from salt.modules import django
+from salt.modules import djangomod as django
 
 try:
     from mock import MagicMock, patch