From 92b3364d11cf3a58e29c29c441d741ec2b57d426 Mon Sep 17 00:00:00 2001 From: Stephen McQuay Date: Wed, 24 Apr 2013 00:53:08 -0700 Subject: [PATCH] removed comments, and some pep8 cleanup --- mmg/settings.py | 62 +------------------------------------------------ mmg/urls.py | 4 ---- mmg/views.py | 5 +--- 3 files changed, 2 insertions(+), 69 deletions(-) diff --git a/mmg/settings.py b/mmg/settings.py index a6c70f6..ca0b45a 100644 --- a/mmg/settings.py +++ b/mmg/settings.py @@ -1,88 +1,40 @@ -# Django settings for mmg project. import os DEBUG = False TEMPLATE_DEBUG = DEBUG ADMINS = ( - # ('Your Name', 'your_email@example.com'), + ('Stephen McQuay', 'stephen@mcquay.me'), ) - MANAGERS = ADMINS - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': '/tmp/mmg.sqlite', - } -} - -# Hosts/domain names that are valid for this site; required if DEBUG is False -# See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts ALLOWED_HOSTS = ['mmg.mcquay.me', 'midna.local'] -# Local time zone for this installation. Choices can be found here: -# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name -# although not all choices may be available on all operating systems. -# In a Windows environment this must be set to your system time zone. TIME_ZONE = 'America/Chicago' -# Language code for this installation. All choices can be found here: -# http://www.i18nguy.com/unicode/language-identifiers.html LANGUAGE_CODE = 'en-us' - SITE_ID = 1 - -# If you set this to False, Django will make some optimizations so as not -# to load the internationalization machinery. USE_I18N = True - -# If you set this to False, Django will not format dates, numbers and -# calendars according to the current locale. USE_L10N = True - -# If you set this to False, Django will not use timezone-aware datetimes. USE_TZ = True - -# Absolute filesystem path to the directory that will hold user-uploaded files. -# Example: "/var/www/example.com/media/" MEDIA_ROOT = '' - -# URL that handles the media served from MEDIA_ROOT. Make sure to use a -# trailing slash. -# Examples: "http://example.com/media/", "http://media.example.com/" MEDIA_URL = '' -# Absolute path to the directory static files should be collected to. -# Don't put anything in this directory yourself; store your static files -# in apps' "static/" subdirectories and in STATICFILES_DIRS. -# Example: "/var/www/example.com/static/" STATIC_ROOT = os.path.expanduser('~/tmp/mmg') - -# URL prefix for static files. -# Example: "http://example.com/static/", "http://static.example.com/" STATIC_URL = 'http://tmp.mcquay.me/mmg/' - -# Additional locations of static files STATICFILES_DIRS = ( os.path.expanduser('~/src/mmg/static'), ) -# List of finder classes that know how to find static files in -# various locations. STATICFILES_FINDERS = ( 'django.contrib.staticfiles.finders.FileSystemFinder', 'django.contrib.staticfiles.finders.AppDirectoriesFinder', - # django.contrib.staticfiles.finders.DefaultStorageFinder', ) SECRET_KEY = os.environ.get('MMG_SECRET_KEY') -# List of callables that know how to import templates from various sources. TEMPLATE_LOADERS = ( 'django.template.loaders.filesystem.Loader', 'django.template.loaders.app_directories.Loader', - # 'django.template.loaders.eggs.Loader', ) MIDDLEWARE_CLASSES = ( @@ -90,13 +42,10 @@ MIDDLEWARE_CLASSES = ( 'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', - # Uncomment the next line for simple clickjacking protection: - # 'django.middleware.clickjacking.XFrameOptionsMiddleware', ) ROOT_URLCONF = 'mmg.urls' -# Python dotted path to the WSGI application used by Django's runserver. WSGI_APPLICATION = 'mmg.wsgi.application' TEMPLATE_DIRS = ( @@ -110,19 +59,10 @@ INSTALLED_APPS = ( 'django.contrib.sites', 'django.contrib.messages', 'django.contrib.staticfiles', - # Uncomment the next line to enable the admin: - # 'django.contrib.admin', - # Uncomment the next line to enable admin documentation: - # 'django.contrib.admindocs', ) SESSION_ENGINE = 'django.contrib.sessions.backends.signed_cookies' -# A sample logging configuration. The only tangible logging -# performed by this configuration is to send an email to -# the site admins on every HTTP 500 error when DEBUG=False. -# See http://docs.djangoproject.com/en/dev/topics/logging for -# more details on how to customize your logging configuration. LOGGING = { 'version': 1, 'disable_existing_loggers': False, diff --git a/mmg/urls.py b/mmg/urls.py index 452715d..535f3ca 100644 --- a/mmg/urls.py +++ b/mmg/urls.py @@ -1,9 +1,5 @@ from django.conf.urls import patterns, url -# Uncomment the next two lines to enable the admin: -# from django.contrib import admin -# admin.autodiscover() - urlpatterns = patterns( '', url(r'^$', 'mmg.views.home', name='home'), diff --git a/mmg/views.py b/mmg/views.py index f7b9663..60ababf 100644 --- a/mmg/views.py +++ b/mmg/views.py @@ -1,12 +1,9 @@ import json import random -from django.http import HttpResponseRedirect, HttpResponse -from django.core.urlresolvers import reverse +from django.http import HttpResponse from django.shortcuts import render -from mmg.forms import NumberForm - MAX = 12