diff --git a/pastebin/conf/common/__init__.py b/pastebin/conf/common/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/pastebin/conf/common/urls/__init__.py b/pastebin/conf/common/urls/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/pastebin/conf/common/urls/admin.py b/pastebin/conf/common/urls/admin.py deleted file mode 100644 index e330a95..0000000 --- a/pastebin/conf/common/urls/admin.py +++ /dev/null @@ -1,9 +0,0 @@ -from django.conf.urls.defaults import patterns, include -from django.contrib import admin - -admin.autodiscover() - -urlpatterns = patterns('', - (r'^admin/doc/', include('django.contrib.admindocs.urls')), - (r'^admin/', include(admin.site.urls)), -) diff --git a/pastebin/conf/dev/__init__.py b/pastebin/conf/dev/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/pastebin/conf/dev/settings.py b/pastebin/conf/dev/settings.py deleted file mode 100644 index b0f2358..0000000 --- a/pastebin/conf/dev/settings.py +++ /dev/null @@ -1,17 +0,0 @@ -from pastebin.conf.settings import * - -DEBUG = True -TEMPLATE_DEBUG = DEBUG - -ROOT_URLCONF = 'pastebin.conf.dev.urls' - -MEDIA_ROOT = os.path.join(VAR_ROOT, 'uploads') - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'NAME': 'pastebin', -# 'USER': 'dbuser', -# 'PASSWORD': 'dbpassword', - } -} diff --git a/pastebin/conf/dev/urls.py b/pastebin/conf/dev/urls.py deleted file mode 100644 index a44386d..0000000 --- a/pastebin/conf/dev/urls.py +++ /dev/null @@ -1,9 +0,0 @@ -from django.conf.urls.defaults import * -from django.conf import settings - -CONF_MODULE = '%s.conf' % settings.PROJECT_MODULE_NAME - -urlpatterns = patterns('', - (r'', include('%s.urls' % CONF_MODULE)), - (r'', include('%s.common.urls.admin' % CONF_MODULE)), -) diff --git a/pastebin/conf/test/__init__.py b/pastebin/conf/test/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/pastebin/conf/test/settings.py b/pastebin/conf/test/settings.py deleted file mode 100644 index 5a706bc..0000000 --- a/pastebin/conf/test/settings.py +++ /dev/null @@ -1,16 +0,0 @@ -from pastebin.conf.settings import * - -DEBUG = False -TEMPLATE_DEBUG = DEBUG - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': ':memory:', - } -} -ROOT_URLCONF = 'pastebin.conf.test.urls' - -INSTALLED_APPS += ('django_nose',) - -TEST_RUNNER = 'django_nose.NoseTestSuiteRunner' diff --git a/pastebin/conf/test/urls.py b/pastebin/conf/test/urls.py deleted file mode 100644 index a44386d..0000000 --- a/pastebin/conf/test/urls.py +++ /dev/null @@ -1,9 +0,0 @@ -from django.conf.urls.defaults import * -from django.conf import settings - -CONF_MODULE = '%s.conf' % settings.PROJECT_MODULE_NAME - -urlpatterns = patterns('', - (r'', include('%s.urls' % CONF_MODULE)), - (r'', include('%s.common.urls.admin' % CONF_MODULE)), -)