aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsk Solem <askh@modwheel.net>2009-03-17 14:37:41 +0100
committerAsk Solem Hoel <askh@opera.com>2009-03-17 14:37:41 +0100
commitcbc39e303848aba5c3b691588d46db3e40d26cfb (patch)
tree05feb7d93a88523f693c98e587d0a05c6e8d8df8
parent26705216b38e1f30989481a0b30687d38f833f91 (diff)
downloadchishop-cbc39e303848aba5c3b691588d46db3e40d26cfb.tar.bz2
chishop-cbc39e303848aba5c3b691588d46db3e40d26cfb.tar.xz
chishop-cbc39e303848aba5c3b691588d46db3e40d26cfb.zip
Move djangopypi related urls from chishop to pypi
-rw-r--r--chishop/settings.py8
-rw-r--r--chishop/urls.py14
-rw-r--r--djangopypi/urls.py16
3 files changed, 24 insertions, 14 deletions
diff --git a/chishop/settings.py b/chishop/settings.py
index 4abd490..e1aba7c 100644
--- a/chishop/settings.py
+++ b/chishop/settings.py
@@ -1,14 +1,18 @@
1# Django settings for djangopypi project. 1# Django settings for djangopypi project.
2import os 2import os
3 3
4DEBUG=True
5TEMPLATE_DEBUG=True
6LOCAL_DEVELOPMENT=True
7
4ADMINS = ( 8ADMINS = (
5 # ('Your Name', 'your_email@domain.com'), 9 # ('Your Name', 'your_email@domain.com'),
6) 10)
7 11
8MANAGERS = ADMINS 12MANAGERS = ADMINS
9 13
10DATABASE_ENGINE = '' 14DATABASE_ENGINE = 'sqlite3'
11DATABASE_NAME = '' 15DATABASE_NAME = 'devdatabase.db'
12DATABASE_USER = '' 16DATABASE_USER = ''
13DATABASE_PASSWORD = '' 17DATABASE_PASSWORD = ''
14DATABASE_HOST = '' 18DATABASE_HOST = ''
diff --git a/chishop/urls.py b/chishop/urls.py
index f6709f8..9aa5cb7 100644
--- a/chishop/urls.py
+++ b/chishop/urls.py
@@ -12,22 +12,12 @@ if settings.LOCAL_DEVELOPMENT:
12 urlpatterns += patterns("django.views", 12 urlpatterns += patterns("django.views",
13 url(r"%s(?P<path>.*)$" % settings.MEDIA_URL[1:], "static.serve", { 13 url(r"%s(?P<path>.*)$" % settings.MEDIA_URL[1:], "static.serve", {
14 "document_root": settings.MEDIA_ROOT})) 14 "document_root": settings.MEDIA_ROOT}))
15
15urlpatterns += patterns("", 16urlpatterns += patterns("",
16 # Admin interface 17 # Admin interface
17 url(r'^admin/doc/', include("django.contrib.admindocs.urls")), 18 url(r'^admin/doc/', include("django.contrib.admindocs.urls")),
18 url(r'^admin/(.*)', admin.site.root), 19 url(r'^admin/(.*)', admin.site.root),
19 20
20 # Simple PyPI 21 url(r'', include("djangopypi.urls"))
21 url(r'^/?$', "djangopypi.views.simple",
22 name="djangopypi-simple"),
23
24 url(r'^(?P<dist_name>[\w\d_\-]+)/(?P<version>[\w\.\d\-_]+)/?',
25 "djangopypi.views.show_version",
26 name="djangopypi-show_version"),
27
28 url(r'^(?P<dist_name>[\w\d_\-]+)/?', "djangopypi.views.show_links",
29 name="djangopypi-show_links"),
30
31
32) 22)
33 23
diff --git a/djangopypi/urls.py b/djangopypi/urls.py
new file mode 100644
index 0000000..8ab8d69
--- /dev/null
+++ b/djangopypi/urls.py
@@ -0,0 +1,16 @@
1# -*- coding: utf-8 -*-
2from django.conf.urls.defaults import patterns, url, include
3
4urlpatterns = patterns("",
5 # Simple PyPI
6 url(r'^/?$', "djangopypi.views.simple",
7 name="djangopypi-simple"),
8
9 url(r'^(?P<dist_name>[\w\d_\-]+)/(?P<version>[\w\.\d\-_]+)/?',
10 "djangopypi.views.show_version",
11 name="djangopypi-show_version"),
12
13 url(r'^(?P<dist_name>[\w\d_\-]+)/?', "djangopypi.views.show_links",
14 name="djangopypi-show_links"),
15)
16