Code reformatting

Makefile

@@ -31,3 +31,6 @@ kill_redis:
 redis: kill_redis
 	@redis-server redis.conf ; sleep 1
 	@redis-cli -p 7778 -a hey_you info
+
+flake:
+	@flake8 . --ignore=W801,E501

tests/__init__.py

@@ -4,7 +4,7 @@
 # thumbor imaging service
 # https://github.com/globocom/thumbor/wiki
 
-# Licensed under the MIT license: 
+# Licensed under the MIT license:
 # http://www.opensource.org/licenses/mit-license
 # Copyright (c) 2011 globo.com timehome@corp.globo.com
 

tests/fixtures/conf.py

@@ -4,7 +4,6 @@
 # thumbor imaging service
 # https://github.com/globocom/thumbor/wiki
 
-# Licensed under the MIT license: 
+# Licensed under the MIT license:
 # http://www.opensource.org/licenses/mit-license
 # Copyright (c) 2011 globo.com timehome@corp.globo.com
-

tests/fixtures/conf1.py

@@ -4,6 +4,6 @@
 # thumbor imaging service
 # https://github.com/globocom/thumbor/wiki
 
-# Licensed under the MIT license: 
+# Licensed under the MIT license:
 # http://www.opensource.org/licenses/mit-license
 # Copyright (c) 2011 globo.com timehome@corp.globo.com

tests/fixtures/default.py

@@ -4,7 +4,7 @@
 # thumbor imaging service
 # https://github.com/globocom/thumbor/wiki
 
-# Licensed under the MIT license: 
+# Licensed under the MIT license:
 # http://www.opensource.org/licenses/mit-license
 # Copyright (c) 2011 globo.com timehome@corp.globo.com
 

tests/fixtures/file_loader_conf.py

@@ -4,7 +4,7 @@
 # thumbor imaging service
 # https://github.com/globocom/thumbor/wiki
 
-# Licensed under the MIT license: 
+# Licensed under the MIT license:
 # http://www.opensource.org/licenses/mit-license
 # Copyright (c) 2011 globo.com timehome@corp.globo.com
 

tests/fixtures/file_storage_conf.py

@@ -4,7 +4,7 @@
 # thumbor imaging service
 # https://github.com/globocom/thumbor/wiki
 
-# Licensed under the MIT license: 
+# Licensed under the MIT license:
 # http://www.opensource.org/licenses/mit-license
 # Copyright (c) 2011 globo.com timehome@corp.globo.com
 

tests/fixtures/file_storage_conf_2.py

@@ -4,7 +4,7 @@
 # thumbor imaging service
 # https://github.com/globocom/thumbor/wiki
 
-# Licensed under the MIT license: 
+# Licensed under the MIT license:
 # http://www.opensource.org/licenses/mit-license
 # Copyright (c) 2011 globo.com timehome@corp.globo.com
 

tests/fixtures/file_storage_conf_3.py

@@ -4,7 +4,7 @@
 # thumbor imaging service
 # https://github.com/globocom/thumbor/wiki
 
-# Licensed under the MIT license: 
+# Licensed under the MIT license:
 # http://www.opensource.org/licenses/mit-license
 # Copyright (c) 2011 globo.com timehome@corp.globo.com
 

tests/fixtures/jsonp.py

@@ -4,7 +4,7 @@
 # thumbor imaging service
 # https://github.com/globocom/thumbor/wiki
 
-# Licensed under the MIT license: 
+# Licensed under the MIT license:
 # http://www.opensource.org/licenses/mit-license
 # Copyright (c) 2011 globo.com timehome@corp.globo.com
 

tests/fixtures/mongo_storage_conf.py

@@ -4,7 +4,7 @@
 # thumbor imaging service
 # https://github.com/globocom/thumbor/wiki
 
-# Licensed under the MIT license: 
+# Licensed under the MIT license:
 # http://www.opensource.org/licenses/mit-license
 # Copyright (c) 2011 globo.com timehome@corp.globo.com
 

tests/fixtures/mysql_storage_conf.py

@@ -4,7 +4,7 @@
 # thumbor imaging service
 # https://github.com/globocom/thumbor/wiki
 
-# Licensed under the MIT license: 
+# Licensed under the MIT license:
 # http://www.opensource.org/licenses/mit-license
 # Copyright (c) 2011 globo.com timehome@corp.globo.com
 

tests/fixtures/no_storage_conf.py

@@ -4,7 +4,7 @@
 # thumbor imaging service
 # https://github.com/globocom/thumbor/wiki
 
-# Licensed under the MIT license: 
+# Licensed under the MIT license:
 # http://www.opensource.org/licenses/mit-license
 # Copyright (c) 2011 globo.com timehome@corp.globo.com
 

tests/test_app.py

@@ -4,7 +4,7 @@
 # thumbor imaging service
 # https://github.com/globocom/thumbor/wiki
 
-# Licensed under the MIT license: 
+# Licensed under the MIT license:
 # http://www.opensource.org/licenses/mit-license
 # Copyright (c) 2011 globo.com timehome@corp.globo.com
 

tests/test_drop_shadow_filter.py

@@ -12,6 +12,7 @@
 
 from thumbor.filters.drop_shadow import Filter
 
+
 def test_drop_shadow_filter_regex():
     reg = Filter.regex
 

tests/test_file_loader.py

@@ -4,7 +4,7 @@
 # thumbor imaging service
 # https://github.com/globocom/thumbor/wiki
 
-# Licensed under the MIT license: 
+# Licensed under the MIT license:
 # http://www.opensource.org/licenses/mit-license
 # Copyright (c) 2011 globo.com timehome@corp.globo.com
 
@@ -18,6 +18,7 @@
 
 fixtures_folder = join(abspath(dirname(__file__)), 'fixtures')
 
+
 class FileLoaderTest(AsyncHTTPTestCase):
 
     def get_app(self):

tests/test_focal_points.py

@@ -4,30 +4,34 @@
 # thumbor imaging service
 # https://github.com/globocom/thumbor/wiki
 
-# Licensed under the MIT license: 
+# Licensed under the MIT license:
 # http://www.opensource.org/licenses/mit-license
 # Copyright (c) 2011 globo.com timehome@corp.globo.com
 
 from thumbor.point import FocalPoint
 
+
 def test_focal_point():
     point = FocalPoint(x=10.0, y=20.0, weight=3.4)
 
     assert point.x == 10.0
     assert point.y == 20.0
     assert point.weight == 3.4
 
+
 def test_default_weight_is_one():
     point = FocalPoint(x=10.0, y=20.0)
 
     assert point.weight == 1.0
 
+
 def test_from_square():
     point = FocalPoint.from_square(x=10.0, y=20.0, width=100, height=200)
     assert point.x == 55.0
     assert point.y == 110.0
     assert point.weight == 20000.0
 
+
 def test_focal_points_alignments():
     for point in [
         ('left', 'top', 100, 200, 0.0, 0.0),
@@ -42,11 +46,10 @@ def test_focal_points_alignments():
     ]:
         yield assert_point_from_alignment, point
 
+
 def assert_point_from_alignment(point):
     comp_point = FocalPoint.from_alignment(point[0], point[1], width=point[2], height=point[3])
 
     assert comp_point.x == point[4], "Expected x => %.2f Got x => %.2f" % (point[4], comp_point.x)
     assert comp_point.y == point[5], "Expected y => %.2f Got y => %.2f" % (point[5], comp_point.y)
     assert comp_point.weight == 1.0
-
-

tests/test_meta_transform.py

@@ -18,6 +18,7 @@
 
 get_conf_path = lambda filename: abspath(join(dirname(__file__), 'fixtures', filename))
 
+
 class MetaHandlerTestCase(AsyncHTTPTestCase):
 
     def get_app(self):
@@ -173,6 +174,7 @@ def test_meta_returns_proper_json_for_flip(self):
         assert operations[2]['type'] == 'flip_horizontally'
         assert operations[3]['type'] == 'flip_vertically'
 
+
 class MetaHandlerJSONPTestCase(AsyncHTTPTestCase):
 
     def get_app(self):
@@ -187,5 +189,3 @@ def test_meta_returns_proper_json_for_no_ops_with_callback(self):
 
         assert text.strip().startswith('callback({')
         assert text.strip().endswith('});')
-
-

tests/test_urls.py

@@ -7,4 +7,3 @@
 # Licensed under the MIT license:
 # http://www.opensource.org/licenses/mit-license
 # Copyright (c) 2011 globo.com timehome@corp.globo.com
-

tests/transform_helper.py

@@ -4,7 +4,6 @@
 # thumbor imaging service
 # https://github.com/globocom/thumbor/wiki
 
-# Licensed under the MIT license: 
+# Licensed under the MIT license:
 # http://www.opensource.org/licenses/mit-license
 # Copyright (c) 2011 globo.com timehome@corp.globo.com
-

tests/visual_test/__init__.py

@@ -4,6 +4,6 @@
 # thumbor imaging service
 # https://github.com/globocom/thumbor/wiki
 
-# Licensed under the MIT license: 
+# Licensed under the MIT license:
 # http://www.opensource.org/licenses/mit-license
 # Copyright (c) 2011 globo.com timehome@corp.globo.com

tests/visual_test/compare_engines.py

@@ -17,11 +17,13 @@
 REPETITIONS = 200
 IMAGE_NAME = 'fred'
 
+
 def get_engine(engine_name):
     module_name = 'thumbor.engines.%s' % engine_name
     module = __import__(module_name)
     return reduce(getattr, module_name.split('.')[1:], module).Engine
 
+
 def main():
     root = abspath(dirname(__file__))
     image = join(root, '%s.jpg' % IMAGE_NAME)
@@ -80,7 +82,7 @@ def main():
             engine.load(source, '.jpg')
             engine.crop(100, 100, 200, 200)
             engine.resize(50, 50)
-            result = engine.read('.jpg')
+            engine.read('.jpg')
 
         times[key] = "%.6f" % (time.time() - start)
 

tests/visual_test/detect.py

@@ -4,7 +4,7 @@
 # thumbor imaging service
 # https://github.com/globocom/thumbor/wiki
 
-# Licensed under the MIT license: 
+# Licensed under the MIT license:
 # http://www.opensource.org/licenses/mit-license
 # Copyright (c) 2011 globo.com timehome@corp.globo.com
 
@@ -39,7 +39,7 @@
     loaded_cascade_file = cv.Load(cascade_file)
 
     for image_path in images_path:
-        
+
         with tempfile.NamedTemporaryFile() as temp_file:
             file_name = temp_file.name
 
@@ -53,7 +53,8 @@
 
             grayscale = cv.LoadImageM(file_name, cv.CV_LOAD_IMAGE_GRAYSCALE)
 
-            faces = cv.HaarDetectObjects(grayscale, loaded_cascade_file,
+            faces = cv.HaarDetectObjects(
+                grayscale, loaded_cascade_file,
                 cv.CreateMemStorage(), 1.1, 3, cv.CV_HAAR_DO_CANNY_PRUNING, (30, 30))
 
             if faces:

thumbor/console.py

@@ -13,14 +13,15 @@
 from thumbor.context import ServerParameters
 from thumbor import __version__
 
+
 def get_server_parameters(arguments=None):
     parser = optparse.OptionParser(usage="thumbor or type thumbor -h (--help) for help", description=__doc__, version=__version__)
-    parser.add_option("-p", "--port", type="int", dest="port", default=8888, help = "The port to run this thumbor instance at [default: %default]." )
-    parser.add_option("-i", "--ip", dest="ip", default="0.0.0.0", help = "The host address to run this thumbor instance at [default: %default]." )
-    parser.add_option("-c", "--conf", dest="conf", default="", help = "The path of the configuration file to use for this thumbor instance [default: %default]." )
-    parser.add_option("-k", "--keyfile", dest="keyfile", default="", help = "The path of the security key file to use for this thumbor instance [default: %default]." )
-    parser.add_option("-l", "--log-level", dest="log_level", default="warning", help = "The log level to be used. Possible values are: debug, info, warning, error, critical or notset. [default: %default]." )
-    parser.add_option("-a", "--app", dest="app", default='thumbor.app.ThumborServiceApp', help = "A custom app to use for this thumbor server in case you subclassed ThumborServiceApp [default: %default]." )
+    parser.add_option("-p", "--port", type="int", dest="port", default=8888, help="The port to run this thumbor instance at [default: %default].")
+    parser.add_option("-i", "--ip", dest="ip", default="0.0.0.0", help="The host address to run this thumbor instance at [default: %default].")
+    parser.add_option("-c", "--conf", dest="conf", default="", help="The path of the configuration file to use for this thumbor instance [default: %default].")
+    parser.add_option("-k", "--keyfile", dest="keyfile", default="", help="The path of the security key file to use for this thumbor instance [default: %default].")
+    parser.add_option("-l", "--log-level", dest="log_level", default="warning", help="The log level to be used. Possible values are: debug, info, warning, error, critical or notset. [default: %default].")
+    parser.add_option("-a", "--app", dest="app", default='thumbor.app.ThumborServiceApp', help="A custom app to use for this thumbor server in case you subclassed ThumborServiceApp [default: %default].")
 
     (options, args) = parser.parse_args(arguments)
 
@@ -36,4 +37,3 @@ def get_server_parameters(arguments=None):
                             keyfile=keyfile,
                             log_level=log_level,
                             app_class=options.app)
-

thumbor/context.py

@@ -108,10 +108,11 @@ def __init__(self,
                 'bottom': self.int_or_0(crop_bottom)
             }
 
-        self.should_crop = self.crop['left'] > 0 or \
-                           self.crop['top'] > 0 or \
-                           self.crop['right'] > 0 or \
-                           self.crop['bottom'] > 0
+        self.should_crop = \
+            self.crop['left'] > 0 or \
+            self.crop['top'] > 0 or \
+            self.crop['right'] > 0 or \
+            self.crop['bottom'] > 0
 
         self.adaptive = bool(adaptive)
         self.fit_in = bool(fit_in)