fixes PEP8, and update version 0.3.2

tokibito · Oct 1, 2015 · a2fa94d · a2fa94d
1 parent a8fa3f7
commit a2fa94d
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,9 +9,11 @@ env:
   - TOXENV=py27-dj15
   - TOXENV=py27-dj16
   - TOXENV=py27-dj17
+  - TOXENV=py27-dj18
   - TOXENV=py33-dj16
   - TOXENV=py34-dj16
   - TOXENV=py34-dj17
+  - TOXENV=py34-dj18
   - TOXENV=flake8
   - TOXENV=coverage
 script:

diff --git a/ChangeLog.rst b/ChangeLog.rst
@@ -2,6 +2,12 @@
 Change History
 ==============
 
+0.3.2
+=====
+:release-date: 2015-10-02
+
+* #7 support Custom Authorizer and Handler classes via settings
+
 0.3.1
 =====
 :release-date: 2015-03-29

diff --git a/setup.py b/setup.py
@@ -15,7 +15,7 @@ def read(filename):
 
 setup(
     name='django-ftpserver',
-    version='0.3.1',
+    version='0.3.2',
     description="FTP server application for Django.",
     long_description=read('README.rst'),
     package_dir={'': 'src'},

diff --git a/src/django_ftpserver/__init__.py b/src/django_ftpserver/__init__.py
@@ -1 +1 @@
-__version__ = '0.3.1'
+__version__ = '0.3.2'
diff --git a/src/django_ftpserver/management/commands/ftpserver.py b/src/django_ftpserver/management/commands/ftpserver.py
@@ -118,13 +118,17 @@ def handle(self, *args, **options):
         # select handler class
         if certfile or keyfile:
             if hasattr(handlers, 'TLS_FTPHandler'):
-                handler_class = utils.get_settings_value('FTPSERVER_TLSHANDLER') or handlers.TLS_FTPHandler
+                handler_class = (
+                    utils.get_settings_value('FTPSERVER_TLSHANDLER')
+                ) or handlers.TLS_FTPHandler
             else:
                 # unsupported
                 raise CommandError(
                     "Can't import OpenSSL. Please install pyOpenSSL.")
         else:
-            handler_class = utils.get_settings_value('FTPSERVER_HANDLER') or handlers.FTPHandler
+            handler_class = (
+                utils.get_settings_value('FTPSERVER_HANDLER')
+            ) or handlers.FTPHandler
 
         authorizer_class = utils.get_settings_value('FTPSERVER_AUTHORIZER') \
             or FTPAccountAuthorizer

diff --git a/src/django_ftpserver/utils.py b/src/django_ftpserver/utils.py
@@ -30,6 +30,7 @@ def import_class(class_path):
     module = import_module(module)
     return getattr(module, cls)
 
+
 def make_server(
         server_class, handler_class, authorizer_class, host_port,
         file_access_user=None, **handler_options):

diff --git a/tox.ini b/tox.ini
@@ -7,9 +7,11 @@ envlist =
   py27-dj15,
   py27-dj16,
   py27-dj17,
+  py27-dj18,
   py33-dj16,
   py34-dj16,
   py34-dj17,
+  py34-dj18,
   flake8
 
 [testenv]
@@ -60,6 +62,12 @@ deps =
   django>=1.7,<1.8
   {[testenv]deps}
 
+[testenv:py27-dj18]
+basepython = python2.7
+deps =
+  django>=1.8,<1.9
+  {[testenv]deps}
+
 [testenv:py33-dj16]
 basepython = python3.3
 deps =
@@ -78,6 +86,12 @@ deps =
   django>=1.7,<1.8
   {[testenv]deps}
 
+[testenv:py34-dj18]
+basepython = python3.4
+deps =
+  django>=1.8,<1.9
+  {[testenv]deps}
+
 [testenv:flake8]
 basepython = python2.7
 deps =