11 files changed, 153 insertions, 128 deletions

diff --git a/AUTHORS b/AUTHORS
index caf5fe5..4deabb0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,3 +5,4 @@ Brian Rosner <brosner@gmail.com>
 Hugo Lopes Tavares <hltbra@gmail.com>
 Sverre Johansen <sverre.johansen@gmail.com>
 Bo Shi <bs@alum.mit.edu>
+Carl Meyer <carl@dirtcircle.com>
diff --git a/README b/README
index 86af4ca..ad431a6 100644
--- a/README
+++ b/README
@@ -27,6 +27,13 @@ Run the PyPI server
 Please note that ``chishop/media/dists`` has to be writable by the
 user the web-server is running as.
 
+In production
+-------------
+
+You may want to copy the file ``chishop/production_example.py`` and modify
+for use as your production settings; you will also need to modify
+``bin/django.wsgi`` to refer to your production settings.
+
 Using Setuptools
 ================
 
diff --git a/buildout.cfg b/buildout.cfg
index 04e0acf..160db4c 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -8,7 +8,7 @@ eggs = pkginfo
 [django]
 recipe = djangorecipe
 version = 1.1.1
-settings = development
+settings = settings
 eggs = ${buildout:eggs}
 test = djangopypi
 project = chishop
diff --git a/chishop/conf/__init__.py b/chishop/conf/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/chishop/conf/__init__.py
diff --git a/chishop/conf/default.py b/chishop/conf/default.py
new file mode 100644
index 0000000..97002b6
--- /dev/null
+++ b/chishop/conf/default.py
@@ -0,0 +1,111 @@
+# Django settings for djangopypi project.
+import os
+
+ADMINS = (
+    # ('Your Name', 'your_email@domain.com'),
+)
+
+# Allow uploading a new distribution file for a project version
+# if a file of that type already exists.
+#
+# The default on PyPI is to not allow this, but it can be real handy
+# if you're sloppy.
+DJANGOPYPI_ALLOW_VERSION_OVERWRITE = False
+DJANGOPYPI_RELEASE_UPLOAD_TO = 'dists'
+
+# change to False if you do not want Django's default server to serve static pages
+LOCAL_DEVELOPMENT = True
+
+REGISTRATION_OPEN = True
+ACCOUNT_ACTIVATION_DAYS = 7
+LOGIN_REDIRECT_URL = "/"
+
+EMAIL_HOST = ''
+DEFAULT_FROM_EMAIL = ''
+SERVER_EMAIL = DEFAULT_FROM_EMAIL
+
+MANAGERS = ADMINS
+
+DATABASE_ENGINE = ''
+DATABASE_NAME = ''
+DATABASE_USER = ''
+DATABASE_PASSWORD = ''
+DATABASE_HOST = ''
+DATABASE_PORT = ''
+
+# 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.
+# If running in a Windows environment this must be set to the same as 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
+
+# Absolute path to the directory that holds media.
+# Example: "/home/media/media.lawrence.com/"
+here = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
+MEDIA_ROOT = os.path.join(here, 'media')
+
+# URL that handles the media served from MEDIA_ROOT. Make sure to use a
+# trailing slash if there is a path component (optional in other cases).
+# Examples: "http://media.lawrence.com", "http://example.com/media/"
+MEDIA_URL = '/media/'
+
+# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
+# trailing slash.
+# Examples: "http://foo.com/media/", "/media/".
+ADMIN_MEDIA_PREFIX = '/admin-media/'
+
+# Make this unique, and don't share it with anybody.
+SECRET_KEY = 'w_#0r2hh)=!zbynb*gg&969@)sy#^-^ia3m*+sd4@lst$zyaxu'
+
+# List of callables that know how to import templates from various sources.
+TEMPLATE_LOADERS = (
+    'django.template.loaders.filesystem.load_template_source',
+    'django.template.loaders.app_directories.load_template_source',
+#     'django.template.loaders.eggs.load_template_source',
+)
+
+MIDDLEWARE_CLASSES = (
+    'django.middleware.common.CommonMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+)
+
+ROOT_URLCONF = 'urls'
+
+TEMPLATE_CONTEXT_PROCESSORS = (
+    "django.core.context_processors.auth",
+    "django.core.context_processors.debug",
+    "django.core.context_processors.i18n",
+    "django.core.context_processors.media",
+    "django.core.context_processors.request",
+)
+
+TEMPLATE_DIRS = (
+    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
+    # Always use forward slashes, even on Windows.
+    # Don't forget to use absolute paths, not relative paths.
+    os.path.join(os.path.dirname(os.path.dirname(__file__)), "templates"),
+)
+
+INSTALLED_APPS = (
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.sites',
+    'django.contrib.admin',
+    'django.contrib.markup',
+    'django.contrib.admindocs',
+    'registration',
+    'djangopypi',
+)
diff --git a/chishop/development.py b/chishop/development.py
deleted file mode 100644
index 0671fc2..0000000
--- a/chishop/development.py
+++ /dev/null
@@ -1,23 +0,0 @@
-from settings import *
-import os
-
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-LOCAL_DEVELOPMENT = True
-
-if LOCAL_DEVELOPMENT:
-    import sys
-    sys.path.append(os.path.dirname(__file__))
-
-ADMINS = (
-     ('chishop', 'example@example.org'),
-)
-
-MANAGERS = ADMINS
-
-DATABASE_ENGINE = 'sqlite3'
-DATABASE_NAME = os.path.join(here, 'devdatabase.db')
-DATABASE_USER = ''
-DATABASE_PASSWORD = ''
-DATABASE_HOST = ''
-DATABASE_PORT = ''
diff --git a/chishop/production_example.py b/chishop/production_example.py
new file mode 100644
index 0000000..b64623e
--- /dev/null
+++ b/chishop/production_example.py
@@ -0,0 +1,18 @@
+from conf.default import *
+import os
+
+DEBUG = False
+TEMPLATE_DEBUG = DEBUG
+
+ADMINS = (
+     ('chishop', 'example@example.org'),
+)
+
+MANAGERS = ADMINS
+
+DATABASE_ENGINE = 'postgresql_psycopg2'
+DATABASE_NAME = 'chishop'
+DATABASE_USER = 'chishop'
+DATABASE_PASSWORD = 'chishop'
+DATABASE_HOST = ''
+DATABASE_PORT = ''
diff --git a/chishop/settings.py b/chishop/settings.py
index ee286b5..e68a4e5 100644
--- a/chishop/settings.py
+++ b/chishop/settings.py
@@ -1,113 +1,23 @@
-# Django settings for djangopypi project.
+from conf.default import *
 import os
 
-ADMINS = (
-    # ('Your Name', 'your_email@domain.com'),
-)
-
-# Allow uploading a new distribution file for a project version
-# if a file of that type already exists.
-#
-# The default on PyPI is to not allow this, but it can be real handy
-# if you're sloppy.
-DJANGOPYPI_ALLOW_VERSION_OVERWRITE = False
-DJANGOPYPI_RELEASE_UPLOAD_TO = 'dists'
-
-# change to False if you do not want Django's default server to serve static pages
+DEBUG = True
+TEMPLATE_DEBUG = DEBUG
 LOCAL_DEVELOPMENT = True
 
-REGISTRATION_OPEN = True
-ACCOUNT_ACTIVATION_DAYS = 7
-LOGIN_REDIRECT_URL = "/"
+if LOCAL_DEVELOPMENT:
+    import sys
+    sys.path.append(os.path.dirname(__file__))
 
-EMAIL_HOST = ''
-DEFAULT_FROM_EMAIL = ''
-SERVER_EMAIL = DEFAULT_FROM_EMAIL
+ADMINS = (
+     ('chishop', 'example@example.org'),
+)
 
 MANAGERS = ADMINS
 
-DATABASE_ENGINE = ''
-DATABASE_NAME = ''
+DATABASE_ENGINE = 'sqlite3'
+DATABASE_NAME = os.path.join(here, 'devdatabase.db')
 DATABASE_USER = ''
 DATABASE_PASSWORD = ''
 DATABASE_HOST = ''
 DATABASE_PORT = ''
-
-# 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.
-# If running in a Windows environment this must be set to the same as 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
-
-# Absolute path to the directory that holds media.
-# Example: "/home/media/media.lawrence.com/"
-here = os.path.abspath(os.path.dirname(__file__))
-MEDIA_ROOT = os.path.join(here, 'media')
-
-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-# trailing slash if there is a path component (optional in other cases).
-# Examples: "http://media.lawrence.com", "http://example.com/media/"
-MEDIA_URL = 'media/'
-
-MEDIA_PREFIX = "/media/"
-
-# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
-# trailing slash.
-# Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/admin-media/'
-
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = 'w_#0r2hh)=!zbynb*gg&969@)sy#^-^ia3m*+sd4@lst$zyaxu'
-
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.load_template_source',
-    'django.template.loaders.app_directories.load_template_source',
-#     'django.template.loaders.eggs.load_template_source',
-)
-
-MIDDLEWARE_CLASSES = (
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-)
-
-ROOT_URLCONF = 'urls'
-
-TEMPLATE_CONTEXT_PROCESSORS = (
-    "django.core.context_processors.auth",
-    "django.core.context_processors.debug",
-    "django.core.context_processors.i18n",
-    "django.core.context_processors.media",
-    "django.core.context_processors.request",
-)
-
-TEMPLATE_DIRS = (
-    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-    os.path.join(os.path.dirname(__file__), "templates"),
-)
-
-INSTALLED_APPS = (
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.sites',
-    'django.contrib.admin',
-    'django.contrib.markup',
-    'django.contrib.admindocs',
-    'registration',
-    'djangopypi',
-)
diff --git a/chishop/urls.py b/chishop/urls.py
index ab2e8a9..5a5dd77 100644
--- a/chishop/urls.py
+++ b/chishop/urls.py
@@ -10,7 +10,7 @@ urlpatterns = patterns('')
 # Serve static pages.
 if settings.LOCAL_DEVELOPMENT:
     urlpatterns += patterns("django.views",
-        url(r"%s(?P<path>.*)$" % settings.MEDIA_URL[1:], "static.serve", {
+        url(r"^%s(?P<path>.*)$" % settings.MEDIA_URL[1:], "static.serve", {
             "document_root": settings.MEDIA_ROOT}))
 
 urlpatterns += patterns("",
diff --git a/djangopypi/tests.py b/djangopypi/tests.py
index 4da4122..44ec3ac 100644
--- a/djangopypi/tests.py
+++ b/djangopypi/tests.py
@@ -84,12 +84,13 @@ class TestParseWeirdPostData(unittest.TestCase):
         data = create_post_data("submit")
         raw_post_data = create_request(data)
         post, files = parse_distutils_request(MockRequest(raw_post_data))
-        print("post: %s files: %s" % (post, files))
         self.assertTrue(post)
 
         for key in post.keys():
             if isinstance(data[key], list):
                 self.assertEquals(data[key], post.getlist(key))
+            elif data[key] == "UNKNOWN":
+                self.assertTrue(post[key] is None)
             else:
                 self.assertEquals(post[key], data[key])
 
diff --git a/djangopypi/views.py b/djangopypi/views.py
index 7e2d0dc..9c78fcf 100644
--- a/djangopypi/views.py
+++ b/djangopypi/views.py
@@ -217,7 +217,7 @@ def show_version(request, dist_name, version,
     try:
         release = Project.objects.get(name=dist_name).releases \
                                         .get(version=version)
-    except Project.DoesNotExist:
+    except (Project.DoesNotExist, Release.DoesNotExist):
         raise Http404()
 
     context = RequestContext(request, {