Merge pull request #14 from kimetrica/pep8-fixes

PEP8 fixes

Author: johanneswilm

binary_database_files/manager.py

@@ -1,7 +1,6 @@
-import os
-
 from django.db import models
 
+
 class FileManager(models.Manager):
     def get_from_name(self, name):
         return self.get(name=name)

binary_database_files/models.py

@@ -1,10 +1,6 @@
 # -*- coding: utf-8 -*-
 from __future__ import print_function, unicode_literals
 
-import base64
-
-import six
-
 from django.conf import settings
 from django.db import models
 from django.utils import timezone
@@ -16,8 +12,6 @@
 from binary_database_files.utils import write_file, is_fresh
 from binary_database_files.manager import FileManager
 
-from . import settings as _settings
-
 
 @python_2_unicode_compatible
 class File(models.Model):

binary_database_files/settings.py

@@ -7,18 +7,21 @@
 # to the local file system for faster serving.
 DB_FILES_AUTO_EXPORT_DB_TO_FS = settings.DB_FILES_AUTO_EXPORT_DB_TO_FS = getattr(settings, 'DB_FILES_AUTO_EXPORT_DB_TO_FS', True)
 
+
 def URL_METHOD_1(name):
     """
     Construct file URL based on media URL.
     """
     return os.path.join(settings.MEDIA_URL, name)
 
+
 def URL_METHOD_2(name):
     """
     Construct file URL based on configured URL pattern.
     """
     return reverse('database_file', kwargs={'name': name})
 
+
 URL_METHODS = (
     ('URL_METHOD_1', URL_METHOD_1),
     ('URL_METHOD_2', URL_METHOD_2),

binary_database_files/tests/models.py

@@ -1,4 +1,5 @@
 from django.db import models
 
+
 class Thing(models.Model):
     upload = models.FileField(upload_to='i/special', max_length=500)

binary_database_files/tests/settings.py

@@ -1,10 +1,9 @@
 import os
-import sys
 
 PROJECT_DIR = os.path.dirname(__file__)
 
 DATABASES = {
-    'default':{
+    'default': {
         'ENGINE': 'django.db.backends.sqlite3',
     }
 }
@@ -40,7 +39,7 @@
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
-    #'django.middleware.transaction.TransactionMiddleware',
+    # 'django.middleware.transaction.TransactionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.locale.LocaleMiddleware',

binary_database_files/utils.py

@@ -7,6 +7,7 @@
 from django.conf import settings
 from binary_database_files import settings as _settings
 
+
 def is_fresh(name, content_hash):
     """
     Returns true if the file exists on the local filesystem and matches the
@@ -34,19 +35,20 @@ def is_fresh(name, content_hash):
     local_content_hash = get_file_hash(fqfn)
     return local_content_hash == content_hash
 
+
 def get_hash_fn(name):
     """
     Returns the filename for the hash file.
     """
     fqfn = os.path.join(settings.MEDIA_ROOT, name)
     fqfn = os.path.normpath(fqfn)
-    dirs, fn = os.path.split(fqfn)
-    if not os.path.isdir(dirs):
-        os.makedirs(dirs)
     fqfn_parts = os.path.split(fqfn)
+    if not os.path.isdir(fqfn_parts[0]):
+        os.makedirs(fqfn_parts[0])
     hash_fn = os.path.join(fqfn_parts[0], _settings.DB_FILES_DEFAULT_HASH_FN_TEMPLATE % fqfn_parts[1])
     return hash_fn
 
+
 def write_file(name, content, overwrite=False):
     """
     Writes the given content to the relative filename under the MEDIA_ROOT.
@@ -55,9 +57,9 @@ def write_file(name, content, overwrite=False):
     fqfn = os.path.normpath(fqfn)
     if os.path.isfile(fqfn) and not overwrite:
         return
-    dirs, fn = os.path.split(fqfn)
-    if not os.path.isdir(dirs):
-        os.makedirs(dirs)
+    fqfn_parts = os.path.split(fqfn)
+    if not os.path.isdir(fqfn_parts[0]):
+        os.makedirs(fqfn_parts[0])
     open(fqfn, 'wb').write(content)
 
     # Cache hash.
@@ -74,14 +76,15 @@ def write_file(name, content, overwrite=False):
     uname = getattr(settings, 'DATABASE_FILES_USER', None)
     gname = getattr(settings, 'DATABASE_FILES_GROUP', None)
     if gname:
-        gname = ':'+gname
+        gname = ':' + gname
     if uname:
-        os.system('chown -RL %s%s "%s"' % (uname, gname, dirs))
+        os.system('chown -RL %s%s "%s"' % (uname, gname, fqfn_parts[0]))
 
     # Set permissions.
     perms = getattr(settings, 'DATABASE_FILES_PERMS', None)
     if perms:
-        os.system('chmod -R %s "%s"' % (perms, dirs))
+        os.system('chmod -R %s "%s"' % (perms, fqfn_parts[0]))
+
 
 def get_file_hash(fin, force_encoding=None, encoding=None, errors=None, chunk_size=128):
     """
@@ -109,6 +112,7 @@ def get_file_hash(fin, force_encoding=None, encoding=None, errors=None, chunk_si
             h.update(text)
     return h.hexdigest()
 
+
 def get_text_hash_0004(text):
     """
     Returns the hash of the given text.
@@ -119,6 +123,7 @@ def get_text_hash_0004(text):
     h.update(text.encode('utf-8', 'replace'))
     return h.hexdigest()
 
+
 def get_text_hash(text, force_encoding=None, encoding=None, errors=None):
     """
     Returns the hash of the given text.

binary_database_files/views.py

@@ -1,6 +1,4 @@
-import base64
 import mimetypes
-import os
 
 from django.conf import settings
 from django.http import Http404, HttpResponse
@@ -10,6 +8,7 @@
 
 from binary_database_files.models import File
 
+
 @cache_control(max_age=86400)
 def serve(request, name):
     """
@@ -23,6 +22,7 @@ def serve(request, name):
     response['Content-Length'] = f.size
     return response
 
+
 def serve_mixed(request, *args, **kwargs):
     """
     First attempts to serve the file from the filesystem,

pylint.rc

@@ -80,7 +80,6 @@ disable-msg-cat=I
 # W0401: wildcard import.
 # W0404: reimport check...this is sometimes wrong.
 # W0511: TODO check.
-# W0612: unused variable check.
 # W0613: unused argument check. Too vague.
 # W0614: wildcard import usage check.
 # W0704: empty except check.
@@ -104,7 +103,7 @@ disable-msg-cat=I
 # R0204: *Redefinition of %s type from %s to %s*
 # R0101: *Too many nested blocks (%s/%s)*
 # I0011: *Locally disabling %s (%s)*
-disable=C1001,C0103,R0201,W0212,W0614,W0401,W0704,E1101,W0142,R0904,R0913,W0404,R0903,W0232,C0111,W0613,W0612,W0511,W0104,R0902,R0921,R0401,E1103,C0303,W0311,C0330,F0401,E1002,E1120,R0901,W0611,E1123,C0302,R0801,R0914,R0912,R0915,W0703,E1003,E0202,W0201,W0221,C0325,R0916,R0204,R0101,I0011
+disable=C1001,C0103,R0201,W0212,W0614,W0401,W0704,E1101,W0142,R0904,R0913,W0404,R0903,W0232,C0111,W0613,W0511,W0104,R0902,R0921,R0401,E1103,C0303,W0311,C0330,F0401,E1002,E1120,R0901,W0611,E1123,C0302,R0801,R0914,R0912,R0915,W0703,E1003,E0202,W0201,W0221,C0325,R0916,R0204,R0101,I0011
 
 [REPORTS]