[python3 porting] style fixes

unused imports, import order, blank lines, exceptions that are never raised.

Author: pawelmhm

scrapyrt/log.py

@@ -1,19 +1,17 @@
 # -*- coding: utf-8 -*-
-import six
-from logging.config import dictConfig
 import logging
 import os
 import sys
+from logging.config import dictConfig
 
-
+from scrapy.settings import Settings
+from scrapy.utils.log import DEFAULT_LOGGING, TopLevelFormatter
 from twisted.python import log
 from twisted.python.log import startLoggingWithObserver
 from twisted.python.logfile import DailyLogFile
-from scrapy.settings import Settings
-from scrapy.utils.log import DEFAULT_LOGGING, TopLevelFormatter
 
-from scrapyrt.utils import to_bytes
 from .conf import settings as scrapyrt_settings
+from .utils import to_bytes
 
 DEBUG = logging.DEBUG
 INFO = logging.INFO

scrapyrt/resources.py

@@ -145,7 +145,7 @@ def render_POST(self, request, **kwargs):
         request_body = request.content.getvalue()
         try:
             api_params = demjson.decode(request_body)
-        except (ValueError, demjson.JSONDecodeError) as e:
+        except demjson.JSONDecodeError as e:
             message = "Invalid JSON in POST body. {}"
             message = message.format(e.pretty_description())
             raise Error('400', message=message)

setup.py

@@ -37,7 +37,7 @@
         'Twisted>=14.0.0',
         'Scrapy>=1.0.0',
         'demjson',
-        'six'
+        'six>=1.5.2'
     ],
     package_data={
         'scrapyrt': [

tests/test_resource_serviceresource.py

@@ -188,7 +188,7 @@ def _test_access_control_allow_methods_header(self):
         access_control_allow_methods = headers['Access-Control-Allow-Methods']
         self.assertEqual(
             self.resource.allowedMethods,
-            list(map(lambda s: s.strip(), access_control_allow_methods.split(',')))
+            [s.strip() for s in access_control_allow_methods.split(',')]
         )
 
     def test_access_control_allow_methods_header_get(self):