flake8 fixes

thijstriemstra · thijstriemstra · commit bf5436ae957f · 2016-02-17T23:03:28.000+01:00
diff --git a/encode/__init__.py b/encode/__init__.py
@@ -1,4 +1,5 @@
-# Copyright Collab 2012-2015
+# Copyright Collab 2012-2016
+# See LICENSE for details.
 
 """
 `django-encode` application.
diff --git a/encode/admin.py b/encode/admin.py
@@ -1,4 +1,5 @@
-# Copyright Collab 2012-2015
+# Copyright Collab 2012-2016
+# See LICENSE for details.
 
 """
 Admin functionality.
diff --git a/encode/conf.py b/encode/conf.py
@@ -1,4 +1,5 @@
-# Copyright Collab 2013-2015
+# Copyright Collab 2013-2016
+# See LICENSE for details.
 
 """
 Configuration options.
diff --git a/encode/encoders.py b/encode/encoders.py
@@ -1,4 +1,5 @@
-# Copyright Collab 2013-2015
+# Copyright Collab 2013-2016
+# See LICENSE for details.
 
 """
 Encoders.
diff --git a/encode/forms.py b/encode/forms.py
@@ -1,4 +1,5 @@
-# Copyright Collab 2014-2015
+# Copyright Collab 2014-2016
+# See LICENSE for details.
 
 """
 Forms.
diff --git a/encode/models.py b/encode/models.py
@@ -1,4 +1,5 @@
-# Copyright Collab 2012-2015
+# Copyright Collab 2012-2016
+# See LICENSE for details.
 
 """
 Models.
diff --git a/encode/signals.py b/encode/signals.py
@@ -1,4 +1,5 @@
-# Copyright Collab 2012-2015
+# Copyright Collab 2012-2016
+# See LICENSE for details.
 
 """
 Signals.
diff --git a/encode/static/encode/js/media.js b/encode/static/encode/js/media.js
@@ -1,4 +1,5 @@
-// Copyright Collab 2014-2015
+// Copyright Collab 2014-2016
+// See LICENSE for details.
 
 !function ($)
 {
@@ -57,7 +58,7 @@
                                 }
                             }
                         });
-                        
+
                         // change player background color
                         player.el().style.backgroundColor = "#BDBBBC";
                     }
@@ -73,7 +74,7 @@
                     {
                         markup = '<video id="myVideo' + index + '" class="video-js vjs-default-skin"></video>';
                         players.append(markup);
-                        
+
                         // add video player
                         var player = videojs("myVideo" + index,
                         {
diff --git a/encode/storage.py b/encode/storage.py
@@ -1,4 +1,5 @@
-# Copyright Collab 2015
+# Copyright Collab 2015-2016
+# See LICENSE for details.
 
 """
 Storage.
@@ -26,4 +27,3 @@ def __init__(self,
             remote_options=remote_options,
             delayed=delayed,
             *args, **kwargs)
-
diff --git a/encode/tasks.py b/encode/tasks.py
@@ -1,4 +1,5 @@
-# Copyright Collab 2012-2015
+# Copyright Collab 2012-2016
+# See LICENSE for details.
 
 """
 Tasks.
diff --git a/encode/tests/__init__.py b/encode/tests/__init__.py
@@ -1,7 +1,8 @@
-# Copyright Collab 2012-2015
+# Copyright Collab 2012-2016
+# See LICENSE for details.
 
 """
 Tests for the :py:mod:`encode` project.
 """
 
-from .celery import app
+from .celery import app  # flake8: noqa
diff --git a/encode/tests/celery.py b/encode/tests/celery.py
@@ -1,4 +1,5 @@
-# Copyright Collab 2013-2015
+# Copyright Collab 2013-2016
+# See LICENSE for details.
 
 """
 Celery configuration for the :py:mod:`encode` application.
diff --git a/encode/tests/helpers.py b/encode/tests/helpers.py
@@ -1,4 +1,5 @@
-# Copyright Collab 2012-2015
+# Copyright Collab 2012-2016
+# See LICENSE for details.
 
 """
 Utilities and test data.
diff --git a/encode/tests/runner.py b/encode/tests/runner.py
@@ -1,4 +1,5 @@
-# Copyright Collab 2014-2015
+# Copyright Collab 2014-2016
+# See LICENSE for details.
 
 """
 Custom test runner.
diff --git a/encode/tests/settings.py b/encode/tests/settings.py
@@ -1,4 +1,5 @@
-# Copyright Collab 2013-2015
+# Copyright Collab 2013-2016
+# See LICENSE for details.
 
 import os
 
@@ -104,7 +105,7 @@
 )
 
 # Logging configuration.
-# See http://docs.djangoproject.com/en/dev/topics/logging for
+# See https://docs.djangoproject.com/en/dev/topics/logging for
 # more details on how to customize your logging configuration.
 
 LOG_HANDLER = 'null'
@@ -118,9 +119,6 @@
         }
     },
     'formatters': {
-        'verbose': {
-            'format': '%(asctime)s %(levelname)-6s %(name)-15s - %(process)d %(thread)d %(message)s'
-        },
         'simple': {
             'format': '%(asctime)s %(levelname)-6s %(name)-15s - %(message)s'
         },
diff --git a/encode/tests/test_admin.py b/encode/tests/test_admin.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-# Copyright Collab 2014-2015
+# Copyright Collab 2014-2016
+# See LICENSE for details.
 
 """
 Tests for the :py:mod:`encode.admin` module.
diff --git a/encode/tests/test_encoders.py b/encode/tests/test_encoders.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-# Copyright Collab 2013-2015
+# Copyright Collab 2013-2016
+# See LICENSE for details.
 
 """
 Tests for the :py:mod:`encode.encoders` module.
diff --git a/encode/tests/test_models.py b/encode/tests/test_models.py
@@ -1,4 +1,5 @@
-# Copyright Collab 2014-2015
+# Copyright Collab 2014-2016
+# See LICENSE for details.
 
 """
 Tests for the :py:mod:`encode.models` module.
diff --git a/encode/tests/test_tasks.py b/encode/tests/test_tasks.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-# Copyright Collab 2013-2015
+# Copyright Collab 2013-2016
+# See LICENSE for details.
 
 """
 Tests for the :py:mod:`encode.tasks` module.
diff --git a/encode/tests/test_util.py b/encode/tests/test_util.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-# Copyright Collab 2013-2015
+# Copyright Collab 2013-2016
+# See LICENSE for details.
 
 """
 Tests for the :py:mod:`encode.util` module.
diff --git a/encode/tests/test_widgets.py b/encode/tests/test_widgets.py
@@ -1,4 +1,5 @@
-# Copyright Collab 2015
+# Copyright Collab 2015-2016
+# See LICENSE for details.
 
 """
 Tests for the :py:mod:`encode.widgets` module.
diff --git a/encode/tests/urls.py b/encode/tests/urls.py
@@ -1,4 +1,5 @@
-# Copyright Collab 2014-2015
+# Copyright Collab 2014-2016
+# See LICENSE for details.
 
 """
 URLConf for :py:mod:`encode` tests.
diff --git a/encode/util.py b/encode/util.py
@@ -1,4 +1,5 @@
-# Copyright Collab 2012-2015
+# Copyright Collab 2012-2016
+# See LICENSE for details.
 
 """
 Utilities.
@@ -98,14 +99,14 @@ def parseMedia(data):
     :type data: str
     :rtype: str
     """
-    #logger.debug("Got frame data: %s" % str(len(data)))
-    #logger.debug("Data URI header: %s" % data[0:40])
+    # logger.debug("Got frame data: %s" % str(len(data)))
+    # logger.debug("Data URI header: %s" % data[0:40])
 
     try:
         header_len = data.find(",")
         payload = data[header_len + 1:]
         binary = b64decode(payload)
-        #logger.debug("Binary id: %s" % binary[0:4])
+        # logger.debug("Binary id: %s" % binary[0:4])
 
         return binary
 
diff --git a/encode/widgets.py b/encode/widgets.py
@@ -1,4 +1,5 @@
-# Copyright Collab 2014-2015
+# Copyright Collab 2014-2016
+# See LICENSE for details.
 
 """
 Widgets.
@@ -29,7 +30,8 @@ def render(self, name, value, attrs=None, choices=()):
                 if option_value in [int(x) for x in value]:
                     try:
                         from encode import models
-                        path = models.MediaFile.objects.get(title=option_label).file.url
+                        path = models.MediaFile.objects.get(
+                            title=option_label).file.url
                         paths.append(path)
                     except models.MediaFile.DoesNotExist:
                         pass
diff --git a/runtests.py b/runtests.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
-# Copyright Collab 2014-2015
+# Copyright Collab 2014-2016
+# See LICENSE for details.
 
 import os
 import sys
diff --git a/setup.cfg b/setup.cfg
@@ -1,3 +1,3 @@
 [flake8]
-ignore = E121, E125, E128
-exclude = doc/*, encode/migrations/*
+ignore = E121, E122, E123, E125, E126, E128
+exclude = doc/*, encode/migrations/*, encode/tests/*
diff --git a/setup.py b/setup.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
-# Copyright Collab 2012-2015
+# Copyright Collab 2012-2016
+# See LICENSE for details.
 
 import os
 import sys
@@ -10,16 +11,15 @@
 README = open(os.path.join(os.path.dirname(__file__), 'README.rst')).read()
 
 # get version nr
-sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), 'encode')))
-from encode import version
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__),
+    'encode')))
+from encode import version  # flake8: noqa
 sys.path.pop(0)
 
 
 class Tox(TestCommand):
     """
-    Makes the `python setup.py test` command work.
-
-    See http://testrun.org/tox/latest/example/basic.html#integration-with-setuptools-distribute-test-commands
+    Makes the `python setup.py test` command work with Tox.
     """
     def finalize_options(self):
         TestCommand.finalize_options(self)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-// Copyright Collab 2014-2015`
	`1`	`+// Copyright Collab 2014-2016`
	`2`	`+// See LICENSE for details.`
`2`	`3`
`3`	`4`	`!function ($)`
`4`	`5`	`{`
`@@ -57,7 +58,7 @@`
`57`	`58`	`}`
`58`	`59`	`}`
`59`	`60`	`});`
`60`		`-`
	`61`	`+`
`61`	`62`	`// change player background color`
`62`	`63`	`player.el().style.backgroundColor = "#BDBBBC";`
`63`	`64`	`}`
`@@ -73,7 +74,7 @@`
`73`	`74`	`{`
`74`	`75`	`markup = '<video id="myVideo' + index + '" class="video-js vjs-default-skin"></video>';`
`75`	`76`	`players.append(markup);`
`76`		`-`
	`77`	`+`
`77`	`78`	`// add video player`
`78`	`79`	`var player = videojs("myVideo" + index,`
`79`	`80`	`{`