Cleanup (#1428)

weasyl/define.py

@@ -1,3 +1,4 @@
+import functools
 import os
 import time
 import hashlib
@@ -948,9 +949,8 @@ def query_string(query):
     return urlencode(pairs)
 
 
-def _requests_wrapper(func_name):
-    func = getattr(requests, func_name)
-
+def _requests_wrapper(func):
+    @functools.wraps(func)
     def wrapper(*a, **kw):
         try:
             return func(*a, **kw)
@@ -962,8 +962,7 @@ def wrapper(*a, **kw):
     return wrapper
 
 
-http_get = _requests_wrapper('get')
-http_post = _requests_wrapper('post')
+http_get = _requests_wrapper(requests.get)
 
 
 def metric(*a, **kw):

weasyl/login.py

@@ -1,5 +1,4 @@
 import os
-from io import open
 
 import bcrypt
 from publicsuffixlist import PublicSuffixList

weasyl/turnstile.py

@@ -46,7 +46,7 @@ def _check(request) -> Result:
         error_codes = turnstile_validation["error-codes"]
 
         if not {"invalid-input-response", "timeout-or-duplicate"}.issuperset(error_codes):
-            logger.warn("Unexpected Turnstile error codes: %r", error_codes)  # pragma: no cover
+            logger.warning("Unexpected Turnstile error codes: %r", error_codes)  # pragma: no cover
 
         return Result.INVALID
 
@@ -68,4 +68,4 @@ def require(request) -> None:
     if result == Result.NOT_LOADED:
         logger.info("Form submitted without Turnstile field in non-enforcing mode")
     else:
-        logger.warn("Turnstile validation failed in non-enforcing mode: %s", result)
+        logger.warning("Turnstile validation failed in non-enforcing mode: %s", result)