diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ad53006..00f3f64 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,11 +5,11 @@ repos: - id: reorder-python-imports args: ["--application-directories", "src"] - repo: https://github.com/asottile/pyupgrade - rev: v2.38.2 + rev: v3.0.0 hooks: - id: pyupgrade - repo: https://github.com/psf/black - rev: 22.8.0 + rev: 22.10.0 hooks: - id: black - repo: https://github.com/PyCQA/flake8 diff --git a/src/secure_cookie/cookie.py b/src/secure_cookie/cookie.py index 804aae3..673eb64 100644 --- a/src/secure_cookie/cookie.py +++ b/src/secure_cookie/cookie.py @@ -134,7 +134,7 @@ def _date_to_unix(arg): return seconds -class _JSONModule(object): +class _JSONModule: @classmethod def dumps(cls, obj, **kw): kw.setdefault("separators", (",", ":")) @@ -197,7 +197,7 @@ class SecureCookie(ModificationTrackingDict): quote_base64 = True def __init__(self, data=None, secret_key=None, new=True): - super(SecureCookie, self).__init__(data or ()) + super().__init__(data or ()) if secret_key is not None: secret_key = to_bytes(secret_key, "utf-8") diff --git a/src/secure_cookie/session.py b/src/secure_cookie/session.py index f575b7b..7804b90 100644 --- a/src/secure_cookie/session.py +++ b/src/secure_cookie/session.py @@ -119,7 +119,7 @@ def on_update(self): self.modified = True self.modified = False - super(ModificationTrackingDict, self).__init__(on_update=on_update) + super().__init__(on_update=on_update) dict.update(self, *args, **kwargs) def copy(self): @@ -145,7 +145,7 @@ class Session(ModificationTrackingDict): __slots__ = ModificationTrackingDict.__slots__ + ("sid", "new") def __init__(self, data, sid, new=False): - super(Session, self).__init__(data) + super().__init__(data) self.sid = sid self.new = new @@ -162,7 +162,7 @@ def should_save(self): return self.modified -class SessionStore(object): +class SessionStore: """Base class for all session stores. :param session_class: The session class to use. @@ -231,7 +231,7 @@ def __init__( renew_missing=False, mode=0o644, ): - super(FilesystemSessionStore, self).__init__(session_class=session_class) + super().__init__(session_class=session_class) if path: try: @@ -269,7 +269,7 @@ def save(self, session): try: os.rename(tmp, fn) os.chmod(fn, self.mode) - except (IOError, OSError): # noqa: B014 + except OSError: # noqa: B014 pass def delete(self, session): @@ -286,7 +286,7 @@ def get(self, sid): try: f = open(self.get_session_filename(sid), "rb") - except IOError: + except OSError: if self.renew_missing: return self.new() @@ -319,7 +319,7 @@ def list(self): return result -class SessionMiddleware(object): +class SessionMiddleware: """A middleware that puts the session object of a store into the WSGI environ. It automatically sets cookies and restores sessions. diff --git a/tests/test_cookie.py b/tests/test_cookie.py index 5fec8e8..0105a37 100644 --- a/tests/test_cookie.py +++ b/tests/test_cookie.py @@ -72,7 +72,7 @@ def test_wrapper_support(): def test_json(): - class JSONCompat(object): + class JSONCompat: dumps = staticmethod(json.dumps) @staticmethod