Merge remote-tracking branch 'anderspetersson/master' into develop

envelope/urls.py

@@ -1,6 +1,10 @@
 # -*- coding: utf-8 -*-
-
-from django.conf.urls.defaults import patterns, url
+try:
+	# Django 1.5 and below.
+    from django.conf.urls.defaults import patterns, url
+except ImportError:
+	# Django 1.6+
+    from django.conf.urls import patterns, url
 
 from envelope.views import ContactView
 

example_project/manage.py

@@ -1,11 +1,10 @@
 #!/usr/bin/env python
-from django.core.management import execute_manager
-try:
-    import settings # Assumed to be in the same directory.
-except ImportError:
-    import sys
-    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
-    sys.exit(1)
+import os
+import sys
 
 if __name__ == "__main__":
-    execute_manager(settings)
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
+
+    from django.core.management import execute_from_command_line
+
+    execute_from_command_line(sys.argv)

example_project/requirements.txt

@@ -0,0 +1 @@
+django-honeypot

example_project/urls.py

@@ -1,4 +1,9 @@
-from django.conf.urls.defaults import *
+try:
+	# Django 1.5 and below.
+    from django.conf.urls.defaults import patterns, url
+except ImportError:
+	# Django 1.6+
+    from django.conf.urls import patterns, url
 
 urlpatterns = patterns('',
     (r'', include('envelope.urls')),