1
=== modified file 'django_openid_auth/tests/urls.py'
2
--- django_openid_auth/tests/urls.py	2013-03-13 21:55:40 +0000
3
+++ django_openid_auth/tests/urls.py	2014-02-22 17:07:15 +0000
4
@@ -27,7 +27,7 @@
5
27
# POSSIBILITY OF SUCH DAMAGE.
27
# POSSIBILITY OF SUCH DAMAGE.
6
28
28
7
29
from django.http import HttpResponse
29
from django.http import HttpResponse
9
30
from django.conf.urls.defaults import *
30
from django.conf.urls import *
10
31
31
11
32
32
12
33
def get_user(request):
33
def get_user(request):
13
34
34
14
=== modified file 'django_openid_auth/urls.py'
15
--- django_openid_auth/urls.py	2013-03-13 21:55:40 +0000
16
+++ django_openid_auth/urls.py	2014-02-22 17:07:15 +0000
17
@@ -27,7 +27,7 @@
18
27
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
27
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
19
28
# POSSIBILITY OF SUCH DAMAGE.
28
# POSSIBILITY OF SUCH DAMAGE.
20
29
29
22
30
from django.conf.urls.defaults import *
30
from django.conf.urls import *
23
31
31
24
32
urlpatterns = patterns('django_openid_auth.views',
32
urlpatterns = patterns('django_openid_auth.views',
25
33
    url(r'^login/$', 'login_begin', name='openid-login'),
33
    url(r'^login/$', 'login_begin', name='openid-login'),
26
34
34
27
=== modified file 'example_consumer/manage.py'
28
--- example_consumer/manage.py	2007-05-28 09:01:41 +0000
29
+++ example_consumer/manage.py	2014-02-22 17:07:15 +0000
30
@@ -1,11 +1,15 @@
31
1
#!/usr/bin/env python
1
#!/usr/bin/env python
39
2
from django.core.management import execute_manager
2
import os
40
3
try:
3
import sys
41
4
    import settings # Assumed to be in the same directory.
4
42
5
except ImportError:
5
from django.core.management import execute_from_command_line
36
6
    import sys
37
7
    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__)
38
8
    sys.exit(1)
43
9
6
44
10
if __name__ == "__main__":
7
if __name__ == "__main__":
46
11
    execute_manager(settings)
8
    try:
47
9
        import settings # Assumed to be in the same directory.
48
10
        os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
49
11
    except ImportError:
50
12
        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__)
51
13
        sys.exit(1)
52
14
53
15
    execute_from_command_line(sys.argv)
54
12
16
55
=== modified file 'example_consumer/settings.py'
56
--- example_consumer/settings.py	2013-07-19 18:54:31 +0000
57
+++ example_consumer/settings.py	2014-02-22 17:07:15 +0000
58
@@ -152,3 +152,8 @@
59
152
152
60
153
# Should django_auth_openid be used to sign into the admin interface?
153
# Should django_auth_openid be used to sign into the admin interface?
61
154
OPENID_USE_AS_ADMIN_LOGIN = False
154
OPENID_USE_AS_ADMIN_LOGIN = False
62
155
63
156
# Temporarily modify the session serializer because the json serializer in
64
157
# Django 1.6 can't serialize openid.yadis.manager.YadisServiceManager objects.
65
158
# See LP: #1252826
66
159
SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer'
67
155
160
68
=== modified file 'example_consumer/urls.py'
69
--- example_consumer/urls.py	2013-03-13 21:55:40 +0000
70
+++ example_consumer/urls.py	2014-02-22 17:07:15 +0000
71
@@ -27,7 +27,7 @@
72
27
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
27
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
73
28
# POSSIBILITY OF SUCH DAMAGE.
28
# POSSIBILITY OF SUCH DAMAGE.
74
29
29
76
30
from django.conf.urls.defaults import *
30
from django.conf.urls import *
77
31
from django.contrib import admin
31
from django.contrib import admin
78
32
32
79
33
import views
33
import views
Reviewer	Review Type	Date Requested	Status
Ricardo Kirkner		2013-11-19	Approve on 2013-12-05
Review via email: mp+195793@code.launchpad.net
1	=== modified file 'django_openid_auth/tests/urls.py'
2	--- django_openid_auth/tests/urls.py 2013-03-13 21:55:40 +0000
3	+++ django_openid_auth/tests/urls.py 2014-02-22 17:07:15 +0000
4	@@ -27,7 +27,7 @@
5	27	# POSSIBILITY OF SUCH DAMAGE.	27	# POSSIBILITY OF SUCH DAMAGE.
6	28		28
7	29	from django.http import HttpResponse	29	from django.http import HttpResponse
9	30	from django.conf.urls.defaults import *	30	from django.conf.urls import *
10	31		31
11	32		32
12	33	def get_user(request):	33	def get_user(request):
13	34		34
14	=== modified file 'django_openid_auth/urls.py'
15	--- django_openid_auth/urls.py 2013-03-13 21:55:40 +0000
16	+++ django_openid_auth/urls.py 2014-02-22 17:07:15 +0000
17	@@ -27,7 +27,7 @@
18	27	# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE	27	# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
19	28	# POSSIBILITY OF SUCH DAMAGE.	28	# POSSIBILITY OF SUCH DAMAGE.
20	29		29
22	30	from django.conf.urls.defaults import *	30	from django.conf.urls import *
23	31		31
24	32	urlpatterns = patterns('django_openid_auth.views',	32	urlpatterns = patterns('django_openid_auth.views',
25	33	url(r'^login/$', 'login_begin', name='openid-login'),	33	url(r'^login/$', 'login_begin', name='openid-login'),
26	34		34
27	=== modified file 'example_consumer/manage.py'
28	--- example_consumer/manage.py 2007-05-28 09:01:41 +0000
29	+++ example_consumer/manage.py 2014-02-22 17:07:15 +0000
30	@@ -1,11 +1,15 @@
31	1	#!/usr/bin/env python	1	#!/usr/bin/env python
39	2	from django.core.management import execute_manager	2	import os
40	3	try:	3	import sys
41	4	import settings # Assumed to be in the same directory.	4
42	5	except ImportError:	5	from django.core.management import execute_from_command_line
36	6	import sys
37	7	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__)
38	8	sys.exit(1)
43	9		6
44	10	if __name__ == "__main__":	7	if __name__ == "__main__":
46	11	execute_manager(settings)	8	try:
47			9	import settings # Assumed to be in the same directory.
48			10	os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
49			11	except ImportError:
50			12	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__)
51			13	sys.exit(1)
52			14
53			15	execute_from_command_line(sys.argv)
54	12		16
55	=== modified file 'example_consumer/settings.py'
56	--- example_consumer/settings.py 2013-07-19 18:54:31 +0000
57	+++ example_consumer/settings.py 2014-02-22 17:07:15 +0000
58	@@ -152,3 +152,8 @@
59	152		152
60	153	# Should django_auth_openid be used to sign into the admin interface?	153	# Should django_auth_openid be used to sign into the admin interface?
61	154	OPENID_USE_AS_ADMIN_LOGIN = False	154	OPENID_USE_AS_ADMIN_LOGIN = False
62			155
63			156	# Temporarily modify the session serializer because the json serializer in
64			157	# Django 1.6 can't serialize openid.yadis.manager.YadisServiceManager objects.
65			158	# See LP: #1252826
66			159	SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer'
67	155		160
68	=== modified file 'example_consumer/urls.py'
69	--- example_consumer/urls.py 2013-03-13 21:55:40 +0000
70	+++ example_consumer/urls.py 2014-02-22 17:07:15 +0000
71	@@ -27,7 +27,7 @@
72	27	# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE	27	# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
73	28	# POSSIBILITY OF SUCH DAMAGE.	28	# POSSIBILITY OF SUCH DAMAGE.
74	29		29
76	30	from django.conf.urls.defaults import *	30	from django.conf.urls import *
77	31	from django.contrib import admin	31	from django.contrib import admin
78	32		32
79	33	import views	33	import views