Extracting urlconfs into a simple hierarchy for future sanity.

3 files changed, 27 insertions, 24 deletions

diff --git a/djangopypi/urls.py b/djangopypi/urls.py
deleted file mode 100644
index 79b16be..0000000
--- a/djangopypi/urls.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-from django.conf.urls.defaults import patterns, url, include
-
-urlpatterns = patterns("djangopypi.views",
-    # Simple PyPI
-    url(r'^simple/$', "simple",
-        name="djangopypi-simple"),
-
-    url(r'^simple/(?P<dist_name>[\w\d_\.\-]+)/(?P<version>[\w\.\d\-_]+)/$',
-        "show_version",
-        name="djangopypi-show_version"),
-
-    url(r'^simple/(?P<dist_name>[\w\d_\.\-]+)/$', "show_links",
-        name="djangopypi-show_links"),
-
-    url(r'^$', "simple", {'template_name': 'djangopypi/pypi.html'},
-        name="djangopypi-pypi"),
-
-    url(r'^(?P<dist_name>[\w\d_\.\-]+)/$', "show_links",
-        {'template_name': 'djangopypi/pypi_show_links.html'},
-        name="djangopypi-pypi_show_links"),
-    
-    url(r'^search','search',name='djangopypi-search')
-)
\ No newline at end of file
diff --git a/djangopypi/urls/__init__.py b/djangopypi/urls/__init__.py
new file mode 100644
index 0000000..e362edc
--- /dev/null
+++ b/djangopypi/urls/__init__.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+from django.conf.urls.defaults import patterns, include
+
+urlpatterns = patterns('djangopypi.views',
+    (r'^simple/', include('djangopypi.urls.simple')),
+
+    (r'^$', 'simple', {'template_name': 'djangopypi/pypi.html'},
+        'djangopypi-pypi'),
+
+    (r'^(?P<dist_name>[\w\d_\.\-]+)/$', 'show_links',
+        {'template_name': 'djangopypi/pypi_show_links.html'},
+        'djangopypi-pypi_show_links'),
+
+    (r'^search', 'search', {}, 'djangopypi-search'),
+)
diff --git a/djangopypi/urls/simple.py b/djangopypi/urls/simple.py
new file mode 100644
index 0000000..21d3b78
--- /dev/null
+++ b/djangopypi/urls/simple.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+from django.conf.urls.defaults import patterns
+
+urlpatterns = patterns('djangopypi.views',
+    (r'^$', 'simple', {}, 'djangopypi-simple'),
+
+    (r'^(?P<dist_name>[\w\d_\.\-]+)/(?P<version>[\w\.\d\-_]+)/$',
+        'show_version', {}, 'djangopypi-show_version'),
+
+    (r'^(?P<dist_name>[\w\d_\.\-]+)/$', 'show_links', {},
+        'djangopypi-show_links'),
+)