diff --git a/helloworld/settings.py b/helloworld/settings.py index 79ecfd4f3a7a4e3cffb9bded48d5556cf82e75b3..bcc946cf008dd93428b3a985abcecab3e2e9b205 100644 --- a/helloworld/settings.py +++ b/helloworld/settings.py @@ -68,6 +68,9 @@ STATIC_URL = '/static/' # http://stackoverflow.com/questions/8222887/where-are-django-admin-sites-static-media-files-and-how-to-configure #ADMIN_MEDIA_PREFIX = '/static/admin/' +# A list of strings representing the host/domain names that this Django site can serve. +ALLOWED_HOSTS = ['127.0.0.1', 'localhost'] + # Additional locations of static files STATICFILES_DIRS = ( # Put strings here, like "/home/html/static" or "C:/www/django/static". diff --git a/helloworld/urls.py b/helloworld/urls.py index f880d3500234e483ce0df865efe7a4df7446a7e1..fcae7dd27b1ba00d83fa33e3ee504f78601a96cb 100644 --- a/helloworld/urls.py +++ b/helloworld/urls.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from django.conf.urls.defaults import * +from django.conf.urls import patterns, include from django.conf import settings # Uncomment the next two lines to enable the admin: diff --git a/setup.py b/setup.py index f964da2e7fd02f3b7e3bb7bebe95346f7905c044..84ee9cd0558d564ea3140c0259cab6a744a6b651 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ setup( platforms=['OS Independent'], classifiers=CLASSIFIERS, install_requires=[ - 'Django==1.4', + 'Django==1.6.5', ], packages=find_packages(exclude=["project","project.*"]), include_package_data=True,