Ran black

Author: jesudasjoseph

clients/__init__.py

@@ -1 +1 @@
-__version__ = '2.2.0'
+__version__ = "2.2.0"

clients/arcgis.py

@@ -22,7 +22,6 @@ def __init__(self, message, url=None, **kwargs):
 
 
 class ClientRequestError(ClientError):
-
     def __init__(self, message, params=None, status_code=None, **kwargs):
         super(ClientRequestError, self).__init__(message, **kwargs)
 
@@ -51,7 +50,6 @@ class ServiceTimeout(ServiceError, requests.exceptions.Timeout):
 
 
 class ImageError(ClientError):
-
     def __init__(self, message, params=None, tile_info=None, **kwargs):
         super(ImageError, self).__init__(message, **kwargs)
 
@@ -60,27 +58,25 @@ def __init__(self, message, params=None, tile_info=None, **kwargs):
 
 
 class ValidationError(ClientError, AttributeError):
-
     def __init__(self, message, **kwargs):
         super(ValidationError, self).__init__(message, **kwargs)
 
 
 class BadExtent(ValidationError, ValueError):
-
     def __init__(self, message, extent=None, **kwargs):
         super(BadExtent, self).__init__(message, **kwargs)
         self.error_context["extent"] = self.extent = extent
 
 
 class BadSpatialReference(BadExtent):
-
     def __init__(self, message, spatial_reference=None, **kwargs):
         super(BadSpatialReference, self).__init__(message, **kwargs)
-        self.error_context["spatial_reference"] = self.spatial_reference = spatial_reference
+        self.error_context[
+            "spatial_reference"
+        ] = self.spatial_reference = spatial_reference
 
 
 class BadTileScheme(ValidationError, ValueError):
-
     def __init__(self, message, tile_info=None, **kwargs):
         super(BadTileScheme, self).__init__(message, **kwargs)
         self.error_context["tile_info"] = self.tile_info = tile_info
@@ -91,17 +87,17 @@ class NoLayers(ValidationError):
 
 
 class MissingFields(ValidationError, MissingFieldException):
-
     def __init__(self, message, missing=None, **kwargs):
         super(MissingFields, self).__init__(message, **kwargs)
         self.error_context["missing"] = self.missing = wrap_value(missing)
 
 
 class UnsupportedVersion(ValidationError):
-
     def __init__(self, message, invalid=None, supported=None, **kwargs):
         super(UnsupportedVersion, self).__init__(message, **kwargs)
 
         self.invalid = invalid
         self.supported = wrap_value(supported)
-        self.error_context.update({"invalid": self.invalid, "supported": self.supported})
+        self.error_context.update(
+            {"invalid": self.invalid, "supported": self.supported}
+        )

clients/exceptions.py

@@ -5,11 +5,36 @@
 
 
 FEATURE_LAYER_PARAMS = (
-    "f", "where", "object_ids", "geometry", "geometry_type", "in_sr", "spatial_rel", "relation_param", "time",
-    "distance", "units", "out_fields", "return_geometry", "max_allowable_offset", "geometry_precision",
-    "out_sr", "gdb_version", "return_distinct_values", "return_ids_only", "return_count_only",
-    "return_extent_only", "order_by_fields", "group_by_fields_for_statistics", "out_statistics", "return_z",
-    "return_m", "multipatch_option", "result_offset", "result_record_count", "token"
+    "f",
+    "where",
+    "object_ids",
+    "geometry",
+    "geometry_type",
+    "in_sr",
+    "spatial_rel",
+    "relation_param",
+    "time",
+    "distance",
+    "units",
+    "out_fields",
+    "return_geometry",
+    "max_allowable_offset",
+    "geometry_precision",
+    "out_sr",
+    "gdb_version",
+    "return_distinct_values",
+    "return_ids_only",
+    "return_count_only",
+    "return_extent_only",
+    "order_by_fields",
+    "group_by_fields_for_statistics",
+    "out_statistics",
+    "return_z",
+    "return_m",
+    "multipatch_option",
+    "result_offset",
+    "result_record_count",
+    "token",
 )
 FEATURE_LAYER_QUERY = QueryAction(
     "query",
@@ -39,12 +64,12 @@
         "return_m": "returnM",
         "multipatch_option": "multipatchOption",
         "result_offset": "resultOffset",
-        "result_record_count": "resultRecordCount"
+        "result_record_count": "resultRecordCount",
     },
     params_via_post=True,
     serializer=URLSerializer,
     deserializer=JSONSerializer,
-    response_type=Action.DICT_RESPONSE
+    response_type=Action.DICT_RESPONSE,
 )
 
 FEATURE_LAYER_TIME_PARAMS = ("f", "token")
@@ -57,14 +82,27 @@
     params_via_post=True,
     serializer=URLSerializer,
     deserializer=JSONSerializer,
-    response_type=Action.DICT_RESPONSE
+    response_type=Action.DICT_RESPONSE,
 )
 
 
 FEATURE_SERVER_PARAMS = (
-    "f", "layer_defs", "geometry", "geometry_type", "in_sr", "spatial_rel", "time", "out_sr", "gdb_version",
-    "return_geometry", "max_allowable_offset", "return_ids_only", "return_count_only", "return_z", "return_m",
-    "geometry_precision"
+    "f",
+    "layer_defs",
+    "geometry",
+    "geometry_type",
+    "in_sr",
+    "spatial_rel",
+    "time",
+    "out_sr",
+    "gdb_version",
+    "return_geometry",
+    "max_allowable_offset",
+    "return_ids_only",
+    "return_count_only",
+    "return_z",
+    "return_m",
+    "geometry_precision",
 )
 FEATURE_SERVER_QUERY = QueryAction(
     "query",
@@ -83,9 +121,9 @@
         "return_count_only": "returnCountOnly",
         "return_z": "returnZ",
         "return_m": "returnM",
-        "geometry_precision": "geometryPrecision"
+        "geometry_precision": "geometryPrecision",
     },
     params_via_post=True,
     serializer=URLSerializer,
-    response_type=Action.DICT_RESPONSE
+    response_type=Action.DICT_RESPONSE,
 )

clients/query/arcgis.py

@@ -14,7 +14,9 @@ class DictField(fields.DictField):
     handle defaults and support aliases for dict keys
     """
 
-    def __init__(self, aliases=None, convert_camel=True, defaults=None, *args, **kwargs):
+    def __init__(
+        self, aliases=None, convert_camel=True, defaults=None, *args, **kwargs
+    ):
         self.convert_camel = convert_camel
         self.aliases = aliases or {}
         self.defaults = defaults or []
@@ -41,7 +43,11 @@ def convert(val):
 
         if isinstance(value, dict):
             d = {self.aliases.get(k, k): convert(v) for k, v in value.items()}
-            return {camel_to_snake(k): v for k, v in d.items()} if self.convert_camel else d
+            return (
+                {camel_to_snake(k): v for k, v in d.items()}
+                if self.convert_camel
+                else d
+            )
 
         elif isinstance(value, list):
             return [convert(v) for v in value]
@@ -68,10 +74,19 @@ def to_python(self, value, resource):
 class ObjectField(fields.ObjectField):
     """ Overridden to convert camel properties to snake by default, and to add get_data method to custom types """
 
-    def __init__(self, class_name="AnonymousObject", aliases=None, convert_camel=True, *args, **kwargs):
+    def __init__(
+        self,
+        class_name="AnonymousObject",
+        aliases=None,
+        convert_camel=True,
+        *args,
+        **kwargs,
+    ):
         self.convert_camel = convert_camel
 
-        super(ObjectField, self).__init__(class_name=class_name, aliases=aliases or {}, *args, **kwargs)
+        super(ObjectField, self).__init__(
+            class_name=class_name, aliases=aliases or {}, *args, **kwargs
+        )
 
     def to_data(self, value):
         if isinstance(value, list):
@@ -83,7 +98,9 @@ def to_python(self, value, resource):
 
         if isinstance(value, dict):
             d = {
-                self.aliases.get(k, k): self.to_python(v, resource) if isinstance(v, (dict, list)) else v
+                self.aliases.get(k, k): self.to_python(v, resource)
+                if isinstance(v, (dict, list))
+                else v
                 for k, v in value.items()
             }
             if self.convert_camel:
@@ -100,7 +117,10 @@ def to_python(self, value, resource):
             return obj
 
         elif isinstance(value, list):
-            return [self.to_python(x, resource) if isinstance(x, (dict, list)) else x for x in value]
+            return [
+                self.to_python(x, resource) if isinstance(x, (dict, list)) else x
+                for x in value
+            ]
         else:
             return value
 
@@ -110,7 +130,9 @@ class CommaSeparatedField(fields.TextField):
 
     def to_python(self, value, resource):
         if not isinstance(value, list):
-            value = super(CommaSeparatedField, self).to_python(value, resource).split(",")
+            value = (
+                super(CommaSeparatedField, self).to_python(value, resource).split(",")
+            )
 
         return [str(val).strip() for val in value if val] if value else []
 
@@ -119,12 +141,13 @@ def to_value(self, obj, resource):
 
 
 class DrawingInfoField(ObjectField):
-
     def __init__(self, *args, **kwargs):
         self.renderer_defaults = RENDERER_DEFAULTS
 
         aliases = dict(DRAWING_INFO_ALIASES)
-        super(DrawingInfoField, self).__init__(class_name="DrawingInfo", aliases=aliases, *args, **kwargs)
+        super(DrawingInfoField, self).__init__(
+            class_name="DrawingInfo", aliases=aliases, *args, **kwargs
+        )
 
     def to_python(self, value, resource):
         """ Overridden to ensure the presence of field properties in renderer """
@@ -136,7 +159,6 @@ def to_python(self, value, resource):
 
 
 class BaseExtentField(DictField):
-
     def __init__(self, esri_format=True, *args, **kwargs):
         self.esri_format = esri_format
 
@@ -171,7 +193,6 @@ def _py_to_val(self, obj, resource):
 
 
 class ExtentField(BaseExtentField):
-
     def _val_to_py(self, value, resource):
         try:
             return Extent(value)
@@ -180,17 +201,17 @@ def _val_to_py(self, value, resource):
 
 
 class SpatialReferenceField(BaseExtentField):
-
     def _val_to_py(self, value, resource):
         return SpatialReference(value)
 
 
 class TimeInfoField(ObjectField):
-
     def __init__(self, *args, **kwargs):
         aliases = dict(TIME_INFO_ALIASES)
 
-        super(TimeInfoField, self).__init__(class_name="TimeInfo", aliases=aliases, *args, **kwargs)
+        super(TimeInfoField, self).__init__(
+            class_name="TimeInfo", aliases=aliases, *args, **kwargs
+        )
 
 
 DRAWING_INFO_ALIASES = {
@@ -202,7 +223,6 @@ def __init__(self, *args, **kwargs):
     "minScale": "min_scale",
     "maxScale": "max_scale",
     "whereClause": "where",
-
     # Renderer
     "defaultSymbol": "default_symbol",
     "defaultLabel": "default_label",
@@ -214,12 +234,10 @@ def __init__(self, *args, **kwargs):
     "normalizationTotal": "normalization_total",
     "backgroundFillSymbol": "background_fill_symbol",
     "minValue": "min",
-
     # Class Break Info
     "classBreakInfos": "class_breaks",
     "classMinValue": "min",
     "classMaxValue": "max",
-
     # Symbol
     "xoffset": "offset_x",
     "yoffset": "offset_y",
@@ -232,7 +250,7 @@ def __init__(self, *args, **kwargs):
     "haloColor": "halo_color",
     "horizontalAlignment": "horizontal_alignment",
     "verticalAlignment": "vertical_alignment",
-    "rightToLeft": "is_rtl"
+    "rightToLeft": "is_rtl",
 }
 
 RENDERER_ALIASES = {
@@ -250,20 +268,18 @@ def __init__(self, *args, **kwargs):
     "minValue": "min_val",
     "imageData": "image",
     "xoffset": "offset_x",
-    "yoffset": "offset_y"
+    "yoffset": "offset_y",
 }
 RENDERER_DEFAULTS = ("default_symbol", "field", "field1", "field2", "field3", "label")
 
 TIME_INFO_ALIASES = {
     "startTimeField": "start_field",
     "endTimeField": "end_field",
     "trackIdField": "track_field",
-
     # Used at the map service layer level (time data is layer specific)
     "timeInterval": "interval",
     "timeIntervalUnits": "units",
-
     # Used at the map service level (defaults if not defined in layer)
     "defaultTimeInterval": "default_interval",
-    "defaultTimeIntervalUnits": "default_units"
+    "defaultTimeIntervalUnits": "default_units",
 }