Cleanup, fighting dist...

Author: Marc Gibbons

MANIFEST.in

@@ -0,0 +1,2 @@
+recursive-include rest_framework_swagger/static *
+recursive-include rest_framework_swagger/templates *

cigar_example/cigar_example/app/templates/index.html

@@ -1,8 +0,0 @@
-from django.conf.urls import patterns, include, url
-from django.contrib import admin
-
-admin.autodiscover()
-
-urlpatterns = patterns('',
-    url(r'^admin/', include(admin.site.urls)),
-)

cigar_example/cigar_example/app/urls.py

@@ -86,7 +86,7 @@
 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.Loader',
     'django.template.loaders.app_directories.Loader',
-#     'django.template.loaders.eggs.Loader',
+    'django.template.loaders.eggs.Loader',
 )
 
 MIDDLEWARE_CLASSES = (

cigar_example/cigar_example/settings.py

@@ -1,4 +1,5 @@
 from django.conf import settings
+from django.core.exceptions import ImproperlyConfigured
 
 VERSION = '0.1.0'
 
@@ -9,8 +10,13 @@
     'enabled_methods': ['get', 'post', 'put', 'patch', 'delete']
 }
 
-SWAGGER_SETTINGS = getattr(settings, 'SWAGGER_SETTINGS', DEFAULT_SWAGGER_SETTINGS)
+try:
+    SWAGGER_SETTINGS = getattr(settings, 'SWAGGER_SETTINGS', DEFAULT_SWAGGER_SETTINGS)
+
+    for key, value in DEFAULT_SWAGGER_SETTINGS.items():
+        if key not in SWAGGER_SETTINGS:
+            SWAGGER_SETTINGS[key] = value
+
+except ImproperlyConfigured:
+    SWAGGER_SETTINGS = DEFAULT_SWAGGER_SETTINGS
 
-for key, value in DEFAULT_SWAGGER_SETTINGS.items():
-    if key not in SWAGGER_SETTINGS:
-        SWAGGER_SETTINGS[key] = value

cigar_example/rest_framework_swagger

@@ -2,8 +2,8 @@
 from django.utils.importlib import import_module
 from django.conf.urls import patterns, url, include
 from django.test import TestCase
-from urlparser import UrlParser
-from docgenerator import DocumentationGenerator
+from rest_framework_swagger.urlparser import UrlParser
+from rest_framework_swagger.docgenerator import DocumentationGenerator
 from django.contrib.admindocs.utils import trim_docstring
 
 from django.views.generic import View

rest_framework_swagger/__init__.py

@@ -2,9 +2,9 @@
 from django.utils.safestring import mark_safe
 from django.shortcuts import render_to_response, RequestContext
 from rest_framework.views import Response
-from urlparser import UrlParser
-from apidocview import APIDocView
-from docgenerator import DocumentationGenerator
+from rest_framework_swagger.urlparser import UrlParser
+from rest_framework_swagger.apidocview import APIDocView
+from rest_framework_swagger.docgenerator import DocumentationGenerator
 
 from rest_framework_swagger import SWAGGER_SETTINGS
 

rest_framework_swagger/tests.py

@@ -23,9 +23,9 @@
 setup(
     name='django-rest-swagger',
     version=VERSION,
-    download_url='https://github.com/marcgibbons/django-rest-framework-docs/raw/master/dist/django-rest-framework-docs-0.1.6.tar.gz',
+#    download_url='https://github.com/marcgibbons/django-rest-framework-docs/raw/master/dist/django-rest-framework-docs-0.1.6.tar.gz',
     packages=['rest_framework_swagger'],
-    package_data={'rest_framework_swagger': ['templates/rest_framework_swagger/*', 'static/rest_framework_swagger/*']},
+    package_data={'rest_framework_swagger': ['rest_framework_swagger/templates/rest_framework_swagger/*', 'rest_framework_swagger/static/rest_framework_swagger/*']},
     include_package_data=True,
     license='FreeBSD License',
     description='Swagger UI for Django REST Framework 2.3+',