summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2014-06-28 13:10:53 -0500
committerDan McGee <dan@archlinux.org>2014-09-01 18:26:05 -0500
commit28d486870de2c68b53e544a7082c991983d0d763 (patch)
tree91dc22627a052462213f5131492ad63028192cb2
parentdf672693d9530acadcac0cbc75553749fb58f9cd (diff)
More changes for move to Django 1.7
The removal of the root `__init__.py` file is so the testing framework does consistent imports of our models now that the loading strategy has changed. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--__init__.py0
-rw-r--r--packages/views/__init__.py5
-rw-r--r--urls.py1
3 files changed, 1 insertions, 5 deletions
diff --git a/__init__.py b/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/__init__.py
+++ /dev/null
diff --git a/packages/views/__init__.py b/packages/views/__init__.py
index c1f0f492..46c99985 100644
--- a/packages/views/__init__.py
+++ b/packages/views/__init__.py
@@ -27,10 +27,7 @@ from .signoff import signoffs, signoff_package, signoff_options, signoffs_json
@require_safe
@cache_control(public=True, max_age=86400)
def opensearch(request):
- if request.is_secure():
- domain = "https://%s" % request.META['HTTP_HOST']
- else:
- domain = "http://%s" % request.META['HTTP_HOST']
+ domain = "%s://%s" % (request.scheme, request.META['HTTP_HOST'])
return render(request, 'packages/opensearch.xml',
{'domain': domain},
diff --git a/urls.py b/urls.py
index 46c8ace6..e7f2b24c 100644
--- a/urls.py
+++ b/urls.py
@@ -18,7 +18,6 @@ our_sitemaps = {
'releases': sitemaps.ReleasesSitemap,
}
-admin.autodiscover()
urlpatterns = []
# Public pages