Merge branch 'master' of https://github.com/k3oni/pydash

main/views.py

@@ -128,9 +128,6 @@ def get_users():
     except Exception, err:
 	data = str(err)
     
-    if data[0] == []:
-	data = [['No', 'data', 'available']]
-    
     return data
 	
 def get_traffic(request):
@@ -308,9 +305,6 @@ def get_netstat():
     except Exception, err:
         data = str(err)
     
-    if data[0] == []:
-	data = [['No', 'data', 'available']]
-
     return data
 
 

pydash/settings.py

@@ -18,7 +18,8 @@ BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 # See https://docs.djangoproject.com/en/1.6/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = '1)$crmowu-23tz@i2-d=7tb3t+1u&(pm!lnjyuarki^72h!3a9'
+SECRET_KEY = '1)$crmowu-23tz@i2-d=7tb3t+1u&(pm!lnjyuarki^72h!3af'
+#SECRET_KEY = '1)$-23tz@i2-d=7tb3t+1u&(pm!lnjyuarki^72h!3a9'
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = False