diff --git a/circle/circle/settings/base.py b/circle/circle/settings/base.py
index a1cb518..3d439bb 100644
--- a/circle/circle/settings/base.py
+++ b/circle/circle/settings/base.py
@@ -4,13 +4,14 @@
from os import environ
from os.path import abspath, basename, dirname, join, normpath
from json import loads
-from socket import SOCK_STREAM
+# from socket import SOCK_STREAM
from sys import path
# Normally you should not import ANYTHING from Django directly
# into your settings, but ImproperlyConfigured is an exception.
from django.core.exceptions import ImproperlyConfigured
+
def get_env_variable(var_name, default=None):
""" Get the environment variable or return exception/default """
try:
@@ -64,7 +65,7 @@ MANAGERS = ADMINS
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.' +
- get_env_variable('DJANG_DB_TYPE', 'postgresql_psycopg2'),
+ get_env_variable('DJANG_DB_TYPE', 'postgresql_psycopg2'),
'NAME': get_env_variable('DJANGO_DB_NAME', 'circle'),
'USER': get_env_variable('DJANGO_DB_USER', 'circle'),
'PASSWORD': get_env_variable('DJANGO_DB_PASSWORD'),
@@ -79,7 +80,7 @@ DATABASES = {
# See: https://docs.djangoproject.com/en/dev/ref/settings/#time-zone
try:
with open("/etc/timezone", "r") as f:
- systz = f.readline().rstrip()
+ systz = f.readline().rstrip()
except:
systz = None
@@ -247,7 +248,7 @@ INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS
LOGGING = {
'version': 1,
'disable_existing_loggers': False,
- 'formatters':{
+ 'formatters': {
'simple': {
'format': '%(asctime)s [%(levelname)s]: %(name)s %(message)s',
'datefmt': '%Y-%m-%d %H:%M:%S',
@@ -264,14 +265,14 @@ LOGGING = {
'filters': ['require_debug_false'],
'class': 'django.utils.log.AdminEmailHandler'
},
- 'syslog': {
- 'level': 'INFO',
- 'class': 'logging.handlers.SysLogHandler',
+ 'syslog': {
+ 'level': 'INFO',
+ 'class': 'logging.handlers.SysLogHandler',
'formatter': 'simple',
- 'address': '/dev/log',
- # 'socktype': SOCK_STREAM,
- # 'address': ('host', '514'),
- }
+ 'address': '/dev/log',
+ # 'socktype': SOCK_STREAM,
+ # 'address': ('host', '514'),
+ }
},
'loggers': {
'django.request': {
diff --git a/circle/circle/settings/local.py b/circle/circle/settings/local.py
index 5a8cd25..d3dc6cd 100644
--- a/circle/circle/settings/local.py
+++ b/circle/circle/settings/local.py
@@ -1,7 +1,7 @@
"""Development settings and globals."""
-from os.path import join, normpath
+# from os.path import join, normpath
from base import *
@@ -47,23 +47,25 @@ CACHES = {
########## TOOLBAR CONFIGURATION
-# See: https://github.com/django-debug-toolbar/django-debug-toolbar#installation
+# https://github.com/django-debug-toolbar/django-debug-toolbar#installation
if get_env_variable('DJANGO_TOOLBAR', 'FALSE') == 'TRUE':
INSTALLED_APPS += (
- 'debug_toolbar',
+ 'debug_toolbar',
)
- # See: https://github.com/django-debug-toolbar/django-debug-toolbar#installation
- INTERNAL_IPS = (get_env_variable('SSH_CLIENT', '127.0.0.1').split(' ')[0], )
+ # https://github.com/django-debug-toolbar/django-debug-toolbar#installation
+ INTERNAL_IPS = (
+ get_env_variable('SSH_CLIENT', '127.0.0.1').split(' ')[0],
+ )
- # See: https://github.com/django-debug-toolbar/django-debug-toolbar#installation
+ # https://github.com/django-debug-toolbar/django-debug-toolbar#installation
MIDDLEWARE_CLASSES += (
- 'debug_toolbar.middleware.DebugToolbarMiddleware',
+ 'debug_toolbar.middleware.DebugToolbarMiddleware',
)
- # See: https://github.com/django-debug-toolbar/django-debug-toolbar#installation
+ # https://github.com/django-debug-toolbar/django-debug-toolbar#installation
DEBUG_TOOLBAR_CONFIG = {
- 'INTERCEPT_REDIRECTS': False,
- 'SHOW_TEMPLATE_CONTEXT': True,
+ 'INTERCEPT_REDIRECTS': False,
+ 'SHOW_TEMPLATE_CONTEXT': True,
}
########## END TOOLBAR CONFIGURATION
diff --git a/circle/circle/settings/production.py b/circle/circle/settings/production.py
index 394f92f..087935c 100644
--- a/circle/circle/settings/production.py
+++ b/circle/circle/settings/production.py
@@ -29,7 +29,7 @@ try:
except ImproperlyConfigured:
pass
else:
- # See: https://docs.djangoproject.com/en/dev/ref/settings/#email-host-password
+ # https://docs.djangoproject.com/en/dev/ref/settings/#email-host-password
EMAIL_HOST_PASSWORD = environ.get('EMAIL_HOST_PASSWORD', '')
# See: https://docs.djangoproject.com/en/dev/ref/settings/#email-host-user
@@ -49,22 +49,21 @@ SERVER_EMAIL = EMAIL_HOST_USER
########## END EMAIL CONFIGURATION
-
########## CACHE CONFIGURATION
# See: https://docs.djangoproject.com/en/dev/ref/settings/#caches
try:
CACHES = {
- 'default': {
- 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
- 'LOCATION': get_env_variable('DJANGO_MEMCACHED'),
- }
+ 'default': {
+ 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+ 'LOCATION': get_env_variable('DJANGO_MEMCACHED'),
+ }
}
except ImproperlyConfigured:
CACHES = {
- 'default': {
- 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
- 'LOCATION': SITE_NAME,
- }
+ 'default': {
+ 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+ 'LOCATION': SITE_NAME,
+ }
}
########## END CACHE CONFIGURATION
diff --git a/circle/circle/urls.py b/circle/circle/urls.py
index 5ba7475..07c6bc4 100644
--- a/circle/circle/urls.py
+++ b/circle/circle/urls.py
@@ -1,10 +1,11 @@
from django.conf.urls import patterns, include, url
-from django.views.generic import TemplateView
+# from django.views.generic import TemplateView
from django.contrib import admin
admin.autodiscover()
-urlpatterns = patterns('',
+urlpatterns = patterns(
+ '',
#url(r'^$', TemplateView.as_view(template_name='base.html')),
# Examples:
diff --git a/circle/circle/wsgi.py b/circle/circle/wsgi.py
index 33fb982..ac29533 100644
--- a/circle/circle/wsgi.py
+++ b/circle/circle/wsgi.py
@@ -33,6 +33,7 @@ from django.core.wsgi import get_wsgi_application
_application = get_wsgi_application()
+
def application(environ, start_response):
# copy DJANGO_* wsgi-env vars to process-env
for i in environ.keys():
diff --git a/circle/dashboard/urls.py b/circle/dashboard/urls.py
index 783b15d..1b67228 100644
--- a/circle/dashboard/urls.py
+++ b/circle/dashboard/urls.py
@@ -1,8 +1,9 @@
-from django.conf.urls import patterns, include, url
+from django.conf.urls import patterns, url
from .views import IndexView, VmDetailView
-urlpatterns = patterns('',
- url(r'^$', IndexView.as_view()),
- url(r'^vm/\d+/$', VmDetailView.as_view()),
+urlpatterns = patterns(
+ '',
+ url(r'^$', IndexView.as_view()),
+ url(r'^vm/\d+/$', VmDetailView.as_view()),
)
diff --git a/circle/dashboard/views.py b/circle/dashboard/views.py
index dda2e22..7ab6429 100644
--- a/circle/dashboard/views.py
+++ b/circle/dashboard/views.py
@@ -2,8 +2,8 @@ from django.views.generic import TemplateView
class IndexView(TemplateView):
- template_name="dashboard/index.html"
+ template_name = "dashboard/index.html"
class VmDetailView(TemplateView):
- template_name="dashboard/vm-detail.html"
+ template_name = "dashboard/vm-detail.html"
diff --git a/circle/storage/models.py b/circle/storage/models.py
index 2641d17..d07e6ad 100644
--- a/circle/storage/models.py
+++ b/circle/storage/models.py
@@ -76,7 +76,6 @@ class Disk(TimeStampedModel):
'target_device': self.device_type + self.dev_num
}
-
def to_json(self):
self.base_name = self.base.name if self.base else None
self.dir = self.datastore.path