Upgrade pylint to latest version (#41)

pylint 2.9.2 -> 2.15.9 in preparation for pylint 3.x

Author: sbscully

opencage/geocoder.py

@@ -62,7 +62,7 @@ def __init__(self, reset_time, reset_to):
 
     def __unicode__(self):
         """Convert exception to a string."""
-        return "Your rate limit has expired. It will reset to {0} on {1}".format(self.reset_to, self.reset_time.isoformat())
+        return f"Your rate limit has expired. It will reset to {self.reset_to} on {self.reset_time.isoformat()}"
 
     __str__ = __unicode__
 
@@ -235,7 +235,7 @@ def _opencage_request(self, params):
         if self.session:
             response = self.session.get(self.url, params=params)
         else:
-            response = requests.get(self.url, params=params)
+            response = requests.get(self.url, params=params) # pylint: disable=missing-timeout
 
         try:
             response_json = response.json()
@@ -248,7 +248,7 @@ def _opencage_request(self, params):
         if response.status_code == 403:
             raise ForbiddenError()
 
-        if (response.status_code == 402 or response.status_code == 429):
+        if response.status_code in (402, 429):
             # Rate limit exceeded
             reset_time = datetime.utcfromtimestamp(response_json['rate']['reset'])
             raise RateLimitExceededError(reset_to=int(response_json['rate']['limit']), reset_time=reset_time)
@@ -274,7 +274,7 @@ async def _opencage_async_request(self, params):
             if response.status == 403:
                 raise ForbiddenError()
 
-            if (response.status == 402 or response.status == 429):
+            if response.status in (402, 429):
                 # Rate limit exceeded
                 print(response_json)
                 reset_time = datetime.utcfromtimestamp(response_json['rate']['reset'])
@@ -306,7 +306,7 @@ def _query_for_reverse_geocoding(lat, lng):
     # have to do some stupid f/Decimal/str stuff to (a) ensure we get as much
     # decimal places as the user already specified and (b) to ensure we don't
     # get e-5 stuff
-    return "{0:f},{1:f}".format(Decimal(str(lat)), Decimal(str(lng)))
+    return f"{Decimal(str(lat)):f},{Decimal(str(lng)):f}"
 
 
 def float_if_float(float_string):

pylintrc

@@ -54,92 +54,13 @@ confidence=
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use"--disable=all --enable=classes
 # --disable=W"
-disable=print-statement,
-        parameter-unpacking,
-        unpacking-in-except,
-        old-raise-syntax,
-        backtick,
-        long-suffix,
-        old-ne-operator,
-        old-octal-literal,
-        import-star-module-level,
-        non-ascii-bytes-literal,
-        invalid-unicode-literal,
-        raw-checker-failed,
-        bad-inline-option,
-        locally-disabled,
-        locally-enabled,
-        file-ignored,
-        suppressed-message,
-        useless-suppression,
-        deprecated-pragma,
-        apply-builtin,
-        basestring-builtin,
-        buffer-builtin,
-        cmp-builtin,
-        coerce-builtin,
-        execfile-builtin,
-        file-builtin,
-        long-builtin,
-        raw_input-builtin,
-        reduce-builtin,
-        standarderror-builtin,
-        unicode-builtin,
-        xrange-builtin,
-        coerce-method,
-        delslice-method,
-        getslice-method,
-        setslice-method,
-        no-absolute-import,
-        old-division,
-        dict-iter-method,
-        dict-view-method,
-        next-method-called,
-        metaclass-assignment,
-        indexing-exception,
-        raising-string,
-        reload-builtin,
-        oct-method,
-        hex-method,
-        nonzero-method,
-        cmp-method,
-        input-builtin,
-        round-builtin,
-        intern-builtin,
-        unichr-builtin,
-        map-builtin-not-iterating,
-        zip-builtin-not-iterating,
-        range-builtin-not-iterating,
-        filter-builtin-not-iterating,
-        using-cmp-argument,
-        eq-without-hash,
-        div-method,
-        idiv-method,
-        rdiv-method,
-        exception-message-attribute,
-        invalid-str-codec,
-        sys-max-int,
-        bad-python3-import,
-        deprecated-string-function,
-        deprecated-str-translate-call,
-        deprecated-itertools-function,
-        deprecated-types-field,
-        next-method-defined,
-        dict-items-not-iterating,
-        dict-keys-not-iterating,
-        dict-values-not-iterating,
-        deprecated-operator-function,
-        deprecated-urllib-function,
-        xreadlines-attribute,
-        deprecated-sys-function,
-        exception-escape,
-        comprehension-escape,
-        no-else-return,
-        missing-docstring,
-        invalid-name,
-        protected-access,
-        unpacking-non-sequence,
-        R0801
+disable=unrecognized-option,
+      invalid-name,
+      missing-function-docstring,
+      no-else-return,
+      missing-module-docstring,
+      protected-access,
+      duplicate-code
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option

setup.py

@@ -21,7 +21,7 @@
 
 # try for travis
 try:
-    with open(os.path.join(SOURCE_DIR, 'README.md')) as f:
+    with open(os.path.join(SOURCE_DIR, 'README.md'), encoding="utf-8") as f:
         long_description = f.read()
 except FileNotFoundError:
     long_description = ""

test/test_all.py

@@ -19,7 +19,7 @@ def test_gb_postcode():
     httpretty.register_uri(
         httpretty.GET,
         geocoder.url,
-        body=Path('test/fixtures/uk_postcode.json').read_text()
+        body=Path('test/fixtures/uk_postcode.json').read_text(encoding="utf-8")
     )
 
     results = geocoder.geocode("EC1M 5RF")
@@ -31,7 +31,7 @@ def test_australia():
     httpretty.register_uri(
         httpretty.GET,
         geocoder.url,
-        body=Path('test/fixtures/mudgee_australia.json').read_text()
+        body=Path('test/fixtures/mudgee_australia.json').read_text(encoding="utf-8")
     )
 
     results = geocoder.geocode("Mudgee, Australia")
@@ -43,7 +43,7 @@ def testMunster():
     httpretty.register_uri(
         httpretty.GET,
         geocoder.url,
-        body=Path('test/fixtures/muenster.json').read_text()
+        body=Path('test/fixtures/muenster.json').read_text(encoding="utf-8")
     )
 
     results = geocoder.geocode("Münster")
@@ -54,7 +54,7 @@ def testDonostia():
     httpretty.register_uri(
         httpretty.GET,
         geocoder.url,
-        body=Path('test/fixtures/donostia.json').read_text()
+        body=Path('test/fixtures/donostia.json').read_text(encoding="utf-8")
 
     )
 

test/test_error_blocked.py

@@ -15,7 +15,7 @@ def test_api_key_blocked():
     httpretty.register_uri(
         httpretty.GET,
         geocoder.url,
-        body=Path('test/fixtures/403_apikey_disabled.json').read_text(),
+        body=Path('test/fixtures/403_apikey_disabled.json').read_text(encoding="utf-8"),
         status=403,
     )
 

test/test_error_invalid_input.py

@@ -26,10 +26,10 @@ def test_must_be_unicode_string():
 
     with pytest.raises(InvalidInputError) as excinfo:
         geocoder.geocode(utf8_string)
-    assert str(excinfo.value) == "Input must be a unicode string, not {0!r}".format(utf8_string)
+    assert str(excinfo.value) == f"Input must be a unicode string, not {utf8_string!r}"
     assert excinfo.value.bad_value == utf8_string
 
     with pytest.raises(InvalidInputError) as excinfo:
         geocoder.geocode(latin1_string)
-    assert str(excinfo.value) == "Input must be a unicode string, not {0!r}".format(latin1_string)
+    assert str(excinfo.value) == f"Input must be a unicode string, not {latin1_string!r}"
     assert excinfo.value.bad_value == latin1_string

test/test_error_not_authorized.py

@@ -14,7 +14,7 @@ def test_api_key_not_authorized():
     httpretty.register_uri(
         httpretty.GET,
         geocoder.url,
-        body=Path('test/fixtures/401_not_authorized.json').read_text(),
+        body=Path('test/fixtures/401_not_authorized.json').read_text(encoding="utf-8"),
         status=401,
     )
 

test/test_error_ratelimit_exceeded.py

@@ -15,7 +15,7 @@ def test_no_rate_limit():
     httpretty.register_uri(
         httpretty.GET,
         geocoder.url,
-        body=Path('test/fixtures/no_ratelimit.json').read_text()
+        body=Path('test/fixtures/no_ratelimit.json').read_text(encoding="utf-8")
     )
     # shouldn't raise an exception
     geocoder.geocode("whatever")
@@ -27,7 +27,7 @@ def test_rate_limit_exceeded():
     httpretty.register_uri(
         httpretty.GET,
         geocoder.url,
-        body=Path('test/fixtures/402_rate_limit_exceeded.json').read_text(),
+        body=Path('test/fixtures/402_rate_limit_exceeded.json').read_text(encoding="utf-8"),
         status=402,
         adding_headers={'X-RateLimit-Limit': '2500', 'X-RateLimit-Remaining': '0', 'X-RateLimit-Reset': '1402185600'},
     )

test/test_session.py

@@ -16,7 +16,7 @@ def test_success():
         httpretty.register_uri(
             httpretty.GET,
             geocoder.url,
-            body=Path('test/fixtures/uk_postcode.json').read_text()
+            body=Path('test/fixtures/uk_postcode.json').read_text(encoding="utf-8")
         )
 
         results = geocoder.geocode("EC1M 5RF")
@@ -28,7 +28,7 @@ def test_failure():
         httpretty.register_uri(
             httpretty.GET,
             geocoder.url,
-            body=Path('test/fixtures/401_not_authorized.json').read_text(),
+            body=Path('test/fixtures/401_not_authorized.json').read_text(encoding="utf-8"),
             status=401,
         )
 

tox.ini

@@ -12,6 +12,6 @@ commands = pytest test
 usedevelop = True
 deps =
     httpretty
-    pylint==2.9.1
+    pylint==2.15.9
     pytest
 commands = pylint opencage examples/demo.py setup.py test