Apply pyupgrade --py36plus to overpy,examples,tests

Author: eumiro

examples/get_areas.py

@@ -18,4 +18,4 @@
         )
     )
     for n, v in area.tags.items():
-        print("  Tag: %s = %s" % (n, v))
+        print(f"  Tag: {n} = {v}")

examples/get_nodes.py

@@ -5,7 +5,7 @@
 
 # We can also see a node's metadata:
 jet_deau = 60018172
-result = api.query("node({}); out meta;".format(jet_deau))
+result = api.query(f"node({jet_deau}); out meta;")
 node = result.get_node(jet_deau)
 
 print(

examples/get_ways.py

@@ -15,4 +15,4 @@
     print("  Highway: %s" % way.tags.get("highway", "n/a"))
     print("  Nodes:")
     for node in way.nodes:
-        print("    Lat: %f, Lon: %f" % (node.lat, node.lon))
+        print(f"    Lat: {node.lat:f}, Lon: {node.lon:f}")

overpy/__init__.py

@@ -49,7 +49,7 @@ def is_valid_type(element, cls):
     return isinstance(element, cls) and element.id is not None
 
 
-class Overpass(object):
+class Overpass:
     """
     Class to access the Overpass API
 
@@ -78,7 +78,7 @@ def __init__(self, read_chunk_size=None, url=None, xml_parser=XML_PARSER_SAX, ma
         if url is not None:
             self.url = url
 
-        self._regex_extract_error_msg = re.compile(b"\<p\>(?P<msg>\<strong\s.*?)\</p\>")
+        self._regex_extract_error_msg = re.compile(br"\<p\>(?P<msg>\<strong\s.*?)\</p\>")
         self._regex_remove_tag = re.compile(b"<[^>]*?>")
         if read_chunk_size is None:
             read_chunk_size = self.default_read_chunk_size
@@ -245,7 +245,7 @@ def parse_xml(self, data, encoding="utf-8", parser=None):
         return Result.from_xml(data, api=self, parser=parser)
 
 
-class Result(object):
+class Result:
     """
     Class to handle the result.
     """
@@ -603,7 +603,7 @@ def get_ways(self, way_id=None, **kwargs):
     ways = property(get_ways)
 
 
-class Element(object):
+class Element:
     """
     Base element
     """
@@ -679,7 +679,7 @@ def __init__(self, area_id=None, **kwargs):
         self.id = area_id
 
     def __repr__(self):
-        return "<overpy.Area id={}>".format(self.id)
+        return f"<overpy.Area id={self.id}>"
 
     @classmethod
     def from_json(cls, data, result=None):
@@ -782,7 +782,7 @@ def __init__(self, node_id=None, lat=None, lon=None, **kwargs):
         self.lon = lon
 
     def __repr__(self):
-        return "<overpy.Node id={} lat={} lon={}>".format(self.id, self.lat, self.lon)
+        return f"<overpy.Node id={self.id} lat={self.lat} lon={self.lon}>"
 
     @classmethod
     def from_json(cls, data, result=None):
@@ -897,7 +897,7 @@ def __init__(self, way_id=None, center_lat=None, center_lon=None, node_ids=None,
         self.center_lon = center_lon
 
     def __repr__(self):
-        return "<overpy.Way id={} nodes={}>".format(self.id, self._node_ids)
+        return f"<overpy.Way id={self.id} nodes={self._node_ids}>"
 
     @property
     def nodes(self):
@@ -1086,7 +1086,7 @@ def __init__(self, rel_id=None, center_lat=None, center_lon=None, members=None,
         self.center_lon = center_lon
 
     def __repr__(self):
-        return "<overpy.Relation id={}>".format(self.id)
+        return f"<overpy.Relation id={self.id}>"
 
     @classmethod
     def from_json(cls, data, result=None):
@@ -1211,7 +1211,7 @@ def from_xml(cls, child, result=None):
         )
 
 
-class RelationMember(object):
+class RelationMember:
     """
     Base class to represent a member of a relation.
     """
@@ -1340,7 +1340,7 @@ def resolve(self, resolve_missing=False):
         return self._result.get_node(self.ref, resolve_missing=resolve_missing)
 
     def __repr__(self):
-        return "<overpy.RelationNode ref={} role={}>".format(self.ref, self.role)
+        return f"<overpy.RelationNode ref={self.ref} role={self.role}>"
 
 
 class RelationWay(RelationMember):
@@ -1350,16 +1350,16 @@ def resolve(self, resolve_missing=False):
         return self._result.get_way(self.ref, resolve_missing=resolve_missing)
 
     def __repr__(self):
-        return "<overpy.RelationWay ref={} role={}>".format(self.ref, self.role)
+        return f"<overpy.RelationWay ref={self.ref} role={self.role}>"
 
 
-class RelationWayGeometryValue(object):
+class RelationWayGeometryValue:
     def __init__(self, lat, lon):
         self.lat = lat
         self.lon = lon
 
     def __repr__(self):
-        return "<overpy.RelationWayGeometryValue lat={} lon={}>".format(self.lat, self.lon)
+        return f"<overpy.RelationWayGeometryValue lat={self.lat} lon={self.lon}>"
 
 
 class RelationRelation(RelationMember):
@@ -1369,7 +1369,7 @@ def resolve(self, resolve_missing=False):
         return self._result.get_relation(self.ref, resolve_missing=resolve_missing)
 
     def __repr__(self):
-        return "<overpy.RelationRelation ref={} role={}>".format(self.ref, self.role)
+        return f"<overpy.RelationRelation ref={self.ref} role={self.role}>"
 
 
 class RelationArea(RelationMember):
@@ -1379,7 +1379,7 @@ def resolve(self, resolve_missing=False):
         return self._result.get_area(self.ref, resolve_missing=resolve_missing)
 
     def __repr__(self):
-        return "<overpy.RelationArea ref={} role={}>".format(self.ref, self.role)
+        return f"<overpy.RelationArea ref={self.ref} role={self.role}>"
 
 
 class OSMSAXHandler(handler.ContentHandler):

overpy/exception.py

@@ -31,7 +31,7 @@ def __init__(self, type_expected, type_provided=None):
         self.type_provided = type_provided
 
     def __str__(self):
-        return "Type expected '%s' but '%s' provided" % (
+        return "Type expected '{}' but '{}' provided".format(
             self.type_expected,
             str(self.type_provided)
         )

setup.py

@@ -12,7 +12,7 @@
 filename_readme = os.path.join(base_dir, "README.rst")
 if sys.version_info[0] == 2:
     import io
-    fp = io.open(filename_readme, encoding="utf-8")
+    fp = open(filename_readme, encoding="utf-8")
 else:
     fp = open(filename_readme, encoding="utf-8")
 long_description = fp.read()

tests/base_class.py

@@ -9,7 +9,7 @@
 from tests import read_file
 
 
-class BaseTestAreas(object):
+class BaseTestAreas:
     def _test_area01(self, result):
         assert len(result.areas) == 4
         assert len(result.nodes) == 0
@@ -76,7 +76,7 @@ def _test_area01(self, result):
         assert len(result.get_way_ids()) == 0
 
 
-class BaseTestNodes(object):
+class BaseTestNodes:
     def _test_node01(self, result):
         assert len(result.nodes) == 3
         assert len(result.relations) == 0
@@ -150,7 +150,7 @@ def _test_node01(self, result):
         assert len(result.get_way_ids()) == 0
 
 
-class BaseTestRelation(object):
+class BaseTestRelation:
     def _test_relation01(self, result):
         assert len(result.nodes) == 0
         assert len(result.relations) == 1
@@ -288,7 +288,7 @@ def _test_relation04(self, result):
         assert way.geometry[0].lon == Decimal("6.9813352")
 
 
-class BaseTestWay(object):
+class BaseTestWay:
     def _test_way01(self, result):
         assert len(result.nodes) == 0
         assert len(result.relations) == 0

tests/test_exception.py

@@ -1,7 +1,7 @@
 import overpy
 
 
-class TestExceptions(object):
+class TestExceptions:
     def test_element_data_wrong_type(self):
         e = overpy.exception.ElementDataWrongType("from1")
         assert e.type_expected == "from1"

tests/test_json.py

@@ -64,7 +64,7 @@ def test_way04(self):
             api.parse_json(read_file("json/way-04.json"))
 
 
-class TestDataError(object):
+class TestDataError:
     def test_element_wrong_type(self):
         with pytest.raises(overpy.exception.ElementDataWrongType):
             overpy.Node.from_json(
@@ -101,7 +101,7 @@ def test_element_wrong_type(self):
             )
 
 
-class TestRemark(object):
+class TestRemark:
     def test_remark_runtime_error(self):
         api = overpy.Overpass()
         with pytest.raises(overpy.exception.OverpassRuntimeError):

tests/test_request.py

@@ -126,7 +126,7 @@ def do_POST(self):
         f(self)
 
 
-class TestQuery(object):
+class TestQuery:
     def test_chunk_size(self):
         url, server = new_server_thread(HandleResponseJSON)
 
@@ -143,10 +143,10 @@ def test_overpass_syntax_error(self):
         api.url = url
         with pytest.raises(overpy.exception.OverpassBadRequest):
             # Missing ; after way(1)
-            api.query((
+            api.query(
                 "way(1)"
                 "out body;"
-            ))
+            )
         stop_server_thread(server)
 
     def test_overpass_syntax_error_encoding_error(self):
@@ -161,10 +161,10 @@ def test_overpass_syntax_error_encoding_error(self):
         api.url = url
         with pytest.raises(overpy.exception.OverpassBadRequest):
             # Missing ; after way(1)
-            api.query((
+            api.query(
                 "way(1)"
                 "out body;"
-            ))
+            )
         stop_server_thread(server)
 
     def test_overpass_too_many_requests(self):
@@ -173,10 +173,10 @@ def test_overpass_too_many_requests(self):
         api = overpy.Overpass()
         api.url = url
         with pytest.raises(overpy.exception.OverpassTooManyRequests):
-            api.query((
+            api.query(
                 "way(1);"
                 "out body;"
-            ))
+            )
         stop_server_thread(server)
 
     def test_overpass_gateway_timeout(self):
@@ -185,10 +185,10 @@ def test_overpass_gateway_timeout(self):
         api = overpy.Overpass()
         api.url = url
         with pytest.raises(overpy.exception.OverpassGatewayTimeout):
-            api.query((
+            api.query(
                 "way(1);"
                 "out body;"
-            ))
+            )
         stop_server_thread(server)
 
     def test_overpass_unknown_status_code(self):
@@ -197,10 +197,10 @@ def test_overpass_unknown_status_code(self):
         api = overpy.Overpass()
         api.url = url
         with pytest.raises(overpy.exception.OverpassUnknownHTTPStatusCode):
-            api.query((
+            api.query(
                 "way(1);"
                 "out body;"
-            ))
+            )
         stop_server_thread(server)
 
     def test_response_json(self):
@@ -238,8 +238,8 @@ def test_retry(self):
         api.max_retry_count = len(HandleRetry.default_handler_func) - 1
         api.url = url
         with pytest.raises(overpy.exception.MaxRetriesReached):
-            api.query((
+            api.query(
                 "way(1);"
                 "out body;"
-            ))
+            )
         stop_server_thread(server)