django 1.6

connect.py

@@ -24,7 +24,7 @@ from multiprocessing import Pool
 
 
 os.environ['DJANGO_SETTINGS_MODULE'] = 'jumpserver.settings'
-django.setup()
+#django.setup()
 from juser.models import User
 
 from jlog.models import Log

docs/AddUserAsset.py

@@ -7,7 +7,7 @@ import datetime
 
 sys.path.append('../')
 os.environ['DJANGO_SETTINGS_MODULE'] = 'jumpserver.settings'
-django.setup()
+#django.setup()
 
 
 from juser.views import db_add_user, md5_crypt, CRYPTOR, db_add_group

docs/install.py

@@ -7,7 +7,7 @@ import datetime
 
 sys.path.append('../')
 os.environ['DJANGO_SETTINGS_MODULE'] = 'jumpserver.settings'
-django.setup()
+#django.setup()
 
 
 from juser.views import db_add_user, md5_crypt, CRYPTOR, db_add_group

docs/require.txt → docs/requirements.txt

-pexpect==3.3
-sphinx-me==0.3
+sphinx-me
 django==1.6
-python-ldap==2.4.18
-paramiko==1.15.1
-pycrypto==2.6.1
+python-ldap
+paramiko
+pycrypto
 ecdsa>=0.11
-MySQL-python==1.2.5
+MySQL-python
 readline
 django-uuidfield
 psutil
\ No newline at end of file

jumpserver/settings.py

@@ -66,7 +66,7 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     #'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
+    #'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 )

log_handler.py

@@ -10,7 +10,7 @@ from datetime import datetime
 os.environ['DJANGO_SETTINGS_MODULE'] = 'jumpserver.settings'
 
 import django
-django.setup()
+#django.setup()
 from jlog.models import Log