Merge branch 'release/0.18.1'

CHANGES.rst

@@ -1,6 +1,10 @@
 Change Log
 ==========
 
+0.18.1
+------
+* Don't assume Django projects include a `wsgi.py`.
+
 0.18.0
 ------
 * Python implementaiton specific builds using tox so that Python2 and 

dddp/__init__.py

@@ -5,7 +5,7 @@ import sys
 from gevent.local import local
 from dddp import alea
 
-__version__ = '0.18.0'
+__version__ = '0.18.1'
 
 default_app_config = 'dddp.apps.DjangoDDPConfig'
 

dddp/main.py

@@ -109,10 +109,14 @@ class DDPLauncher(object):
 
         # use settings.WSGI_APPLICATION or fallback to default Django WSGI app
         from django.conf import settings
+        self.wsgi_app = None
         if hasattr(settings, 'WSGI_APPLICATION'):
             self.wsgi_name = settings.WSGI_APPLICATION
-            self.wsgi_app = import_string(self.wsgi_name)
-        else:
+            try:
+                self.wsgi_app = import_string(self.wsgi_name)
+            except ImportError:
+                pass
+        if self.wsgi_app is None:
             from django.core.wsgi import get_wsgi_application
             self.wsgi_app = get_wsgi_application()
             self.wsgi_name = str(self.wsgi_app.__class__)

docs/conf.py

@@ -62,7 +62,7 @@ copyright = u'2015, Tyson Clugg'
 # The short X.Y version.
 version = '0.18'
 # The full version, including alpha/beta/rc tags.
-release = '0.18.0'
+release = '0.18.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -60,7 +60,7 @@ IMPLEMENTATION_INSTALL_REQUIRES = {
 
 setup(
     name='django-ddp',
-    version='0.18.0',
+    version='0.18.1',
     description=__doc__,
     long_description=open('README.rst').read(),
     author='Tyson Clugg',