Merge lp:~fgallina/django-openid-auth/example-consumer-fixes into lp:~django-openid-auth/django-openid-auth/trunk

[Fabián Ezequiel Gallina]

Added Django 1.4 based manage.py for example_consumer

This commit also contain changes that drop compatibility for the no longer supported Django 1.3 (and lower).

[lp:~fgallina/django-openid-auth/example-consumer-fixes]

111. By Fabián Ezequiel Gallina on 2014-04-22

Fix example_consumer urls

[Ricardo Kirkner (ricardokirkner)]

LGTM

review: Approve

=== modified file 'example_consumer/manage.py'
--- example_consumer/manage.py	2007-05-28 09:01:41 +0000
+++ example_consumer/manage.py	2014-04-22 20:03:29 +0000
@@ -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)

=== modified file 'example_consumer/urls.py'
--- example_consumer/urls.py	2013-03-13 21:55:40 +0000
+++ example_consumer/urls.py	2014-04-22 20:03:29 +0000
@@ -27,7 +27,7 @@
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 from django.contrib import admin
 
 import views

=== modified file 'setup.py'
--- setup.py	2013-07-22 15:17:15 +0000
+++ setup.py	2014-04-22 20:03:29 +0000
@@ -77,5 +77,5 @@
         'django_openid_auth': ['templates/openid/*.html'],
         },
     provides=['django_openid_auth'],
-    requires=['django (>=1.3)', 'openid (>=2.2.0)', 'south'],
+    requires=['django (>=1.4)', 'openid (>=2.2.0)', 'south'],
     )

=== modified file 'tox.ini'
--- tox.ini	2013-07-22 15:26:29 +0000
+++ tox.ini	2014-04-22 20:03:29 +0000
@@ -1,37 +1,11 @@
 [tox]
 envlist =
-        py2.6-django1.3, py2.6-django1.4, py2.6-django1.5,
-        py2.7-django1.3, py2.7-django1.4, py2.7-django1.5
+        py2.7-django1.4, py2.7-django1.5
 
 [testenv]
 commands = make check
 
-# Python 2.6
-[testenv:py2.6-django1.3]
-basepython = python2.6
-deps = django >= 1.3, < 1.4
-       python-openid
-       south
-
-[testenv:py2.6-django1.4]
-basepython = python2.6
-deps = django >= 1.4, < 1.5
-       python-openid
-       south
-
-[testenv:py2.6-django1.5]
-basepython = python2.6
-deps = django >= 1.5, < 1.6
-       python-openid
-       south
-
 # Python 2.7
-[testenv:py2.7-django1.3]
-basepython = python2.7
-deps = django >= 1.3, < 1.4
-       python-openid
-       south
-
 [testenv:py2.7-django1.4]
 basepython = python2.7
 deps = django >= 1.4, < 1.5