Commit 35d2f0a

author

Emmanouil Konstantinidis

committed

Merge branch 'master' into support-viewsets

2 parents 225c47b + 0ccef88 commit 35d2f0aCopy full SHA for 35d2f0a

File tree

-1

lines changed

-1

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+from importlib import import_module`
`1`	`2`	`from django.conf import settings`
`2`	`3`	`from django.core.urlresolvers import RegexURLResolver, RegexURLPattern`
`3`	`4`	`from django.utils.module_loading import import_string`
`@@ -9,7 +10,11 @@ class ApiDocumentation(object):`
`9`	`10`
`10`	`11`	`def __init__(self):`
`11`	`12`	`self.endpoints = []`
`12`		`- root_urlconf = import_string(settings.ROOT_URLCONF)`
	`13`	`+ try:`
	`14`	`+ root_urlconf = import_string(settings.ROOT_URLCONF)`
	`15`	`+ except ImportError:`
	`16`	`+ # Handle a case when there's no dot in ROOT_URLCONF`
	`17`	`+ root_urlconf = import_module(settings.ROOT_URLCONF)`
`13`	`18`	`if hasattr(root_urlconf, 'urls'):`
`14`	`19`	`self.get_all_view_names(root_urlconf.urls.urlpatterns)`
`15`	`20`	`else:`

Comments

(0)