Fix object lookups for Python 3.6

Author: kesmit13

singlestoredb/http/connection.py

@@ -30,7 +30,7 @@
     has_pygeos = False
 
 try:
-    import shapely
+    import shapely.geometry
     import shapely.wkt
     has_shapely = True
 except ImportError:
@@ -171,9 +171,9 @@ def b64decode_converter(
 
 
 if has_shapely:
-    shapely_Point = shapely.Point
-    shapely_Polygon = shapely.Polygon
-    shapely_LineString = shapely.LineString
+    shapely_Point = shapely.geometry.Point
+    shapely_Polygon = shapely.geometry.Polygon
+    shapely_LineString = shapely.geometry.LineString
 
 if has_numpy:
     np_ndarray = np.ndarray

singlestoredb/mysql/converters.py

@@ -13,7 +13,7 @@
     has_numpy = False
 
 try:
-    import shapely
+    import shapely.geometry
     import shapely.wkt
     has_shapely = True
 except ImportError:
@@ -209,12 +209,9 @@ def escape_shapely(value, mapping=None):
         """Convert shapely geo objects."""
         return escape_str(shapely.wkt.dumps(value), mapping=mapping)
 
-    if hasattr(shapely, 'Polygon'):
-        encoders[shapely.Polygon] = escape_shapely
-    if hasattr(shapely, 'Point'):
-        encoders[shapely.Point] = escape_shapely
-    if hasattr(shapely, 'LineString'):
-        encoders[shapely.LineString] = escape_shapely
+    encoders[shapely.geometry.Polygon] = escape_shapely
+    encoders[shapely.geometry.Point] = escape_shapely
+    encoders[shapely.geometry.LineString] = escape_shapely
 
 if has_pygeos: