Cleanups

Author: Greger Stolt Nilsen

clickhouse_sqlalchemy/drivers/compilers/typecompiler.py

@@ -131,7 +131,7 @@ def visit_map(self, type_, **kw):
             self.process(key_type, **kw),
             self.process(value_type, **kw)
         )
-    
+
     def visit_point(self, type_, **kw):
         return 'Point'
 
@@ -143,4 +143,3 @@ def visit_polygon(self, type_, *kw):
 
     def visit_multipolygon(self, type_, *kw):
         return 'MultiPolygon'
-    

clickhouse_sqlalchemy/drivers/http/transport.py

@@ -46,23 +46,29 @@ def nullable_converter(subtype_str, x):
 def nothing_converter(x):
     return None
 
+
 POINT_RE = re.compile(r'(-?\d*\.?\d+)')
 RING_RE = re.compile(r'(\(.*?\))')
 POLYGON_RE = re.compile(r'(\[.*?\])')
 MULTIPOLYGON_RE = re.compile(r'\[\[.*?\]\]')
 
+
 def point_converter(x):
     return tuple([float(f) for f in POINT_RE.findall(x[1:-1])])
 
+
 def ring_converter(x):
     return [point_converter(f) for f in RING_RE.findall(x[1:-1])]
 
+
 def polygon_converter(x):
     return [ring_converter(f) for f in POLYGON_RE.findall(x[1:-1])]
 
+
 def multipolygon_converter(x):
     return [polygon_converter(f) for f in MULTIPOLYGON_RE.findall(x[1:-1])]
 
+
 converters = {
     'Int8': int,
     'UInt8': int,

clickhouse_sqlalchemy/types/__init__.py

@@ -77,4 +77,3 @@
 from .geo import Ring
 from .geo import Polygon
 from .geo import MultiPolygon
-

clickhouse_sqlalchemy/types/geo.py

@@ -4,11 +4,14 @@
 class Point(types.UserDefinedType):
     __visit_name__ = "point"
 
+
 class Ring(types.UserDefinedType):
     __visit_name__ = "ring"
 
+
 class Polygon(types.UserDefinedType):
     __visit_name__ = "polygon"
 
+
 class MultiPolygon(types.UserDefinedType):
     __visit_name__ = "multipolygon"

tests/types/test_geo.py

@@ -5,6 +5,7 @@
 from tests.testcase import BaseTestCase
 from tests.util import with_native_and_http_sessions
 
+
 @with_native_and_http_sessions
 class GeoPointTestCase(BaseTestCase):
     table = Table(
@@ -18,7 +19,7 @@ def test_create_table(self):
             self.compile(CreateTable(self.table)),
             'CREATE TABLE test (p Point) ENGINE = Memory'
         )
-    
+
     def test_select_insert(self):
         a = (10.1, 12.3)
 
@@ -38,8 +39,6 @@ def test_select_where_point(self):
                 self.table.c.p == (10.1, 12.3)).scalar(), a)
 
 
-
-
 @with_native_and_http_sessions
 class GeoRingTestCase(BaseTestCase):
     table = Table(
@@ -53,7 +52,7 @@ def test_create_table(self):
             self.compile(CreateTable(self.table)),
             'CREATE TABLE test (r Ring) ENGINE = Memory'
         )
-    
+
     def test_select_insert(self):
         a = [(0, 0), (10, 0), (10, 10), (0, 10)]
 
@@ -79,7 +78,8 @@ def test_create_table(self):
         )
 
     def test_select_insert(self):
-        a = [[(20, 20), (50, 20), (50, 50), (20, 50)], [(30, 30), (50, 50), (50, 30)]]
+        a = [[(20, 20), (50, 20), (50, 50), (20, 50)],
+             [(30, 30), (50, 50), (50, 30)]]
 
         with self.create_table(self.table):
             self.session.execute(self.table.insert(), [{'pg': a}])
@@ -88,8 +88,6 @@ def test_select_insert(self):
             self.assertEqual(res, a)
 
 
-
-
 @with_native_and_http_sessions
 class GeoMultiPolygonTestCase(BaseTestCase):
     table = Table(
@@ -104,16 +102,13 @@ def test_create_table(self):
             'CREATE TABLE test (mpg MultiPolygon) ENGINE = Memory'
         )
 
-
     def test_select_insert(self):
-        a = [[[(0, 0), (10, 0), (10, 10), (0, 10)]], [[(20, 20), (50, 20), (50, 50), (20, 50)],[(30, 30), (50, 50), (50, 30)]]]
+        a = [[[(0, 0), (10, 0), (10, 10), (0, 10)]],
+             [[(20, 20), (50, 20), (50, 50), (20, 50)],
+              [(30, 30), (50, 50), (50, 30)]]]
 
         with self.create_table(self.table):
             self.session.execute(self.table.insert(), [{'mpg': a}])
             qres = self.session.query(self.table.c.mpg)
             res = qres.scalar()
             self.assertEqual(res, a)
-
-
-
-