pre-commit: Add isort --profile=black (webpy#742)

* pre-commit: Add isort --profile=black * codespell: Add asend * Remove Python 2 code from web/webapi.py * Remove Python 2 code from web/db.py * Remove Python 2 code from web/httpserver.py

Author: cclauss

.github/workflows/lint_python.yml

@@ -41,7 +41,7 @@ jobs:
 
  - run: pip install black codespell flake8 isort pytest
  - run: black --check .
- - run: codespell . --ignore-words-list=eith,gae --skip=./.*
+ - run: codespell . --ignore-words-list=asend,gae --skip=./.*
  - run: flake8 --count --ignore=E203,E265,E722,E731,W503 --max-line-length=477 --show-source --statistics
  - run: isort --profile black .
 

.pre-commit-config.yaml

@@ -5,6 +5,13 @@ repos:
  rev: 22.10.0
  hooks:
  - id: black
+
+- repo: https://github.com/pycqa/isort
+ rev: 5.10.1
+ hooks:
+ - id: isort
+ args: [--profile, black]
+
 - repo: https://gitlab.com/pycqa/flake8
  rev: '3.9.2' # pick a git hash / tag to point to
  hooks:

tests/test_session.py

@@ -1,9 +1,9 @@
 import os
-import time
+import shutil
 import tempfile
 import threading
+import time
 import unittest
-import shutil
 
 import web
 

web/application.py

@@ -8,8 +8,10 @@
 import sys
 import traceback
 import wsgiref.handlers
+from importlib import reload
 from inspect import isclass
 from io import BytesIO
+from urllib.parse import unquote, urlencode, urlparse
 
 from . import browser, httpserver, utils
 from . import webapi as web
@@ -18,11 +20,6 @@
 from .py3helpers import iteritems
 from .utils import lstrips
 
-from urllib.parse import urlparse, urlencode, unquote
-
-from importlib import reload
-
-
 __all__ = [
  "application",
  "auto_application",

web/browser.py

@@ -3,17 +3,15 @@
 """
 import os
 import webbrowser
+from http.cookiejar import CookieJar
 from io import BytesIO
-
-from .net import htmlunquote
-from .utils import re_compile
-
-from urllib.request import HTTPHandler, HTTPCookieProcessor, Request, HTTPError
-from urllib.request import build_opener as urllib_build_opener
 from urllib.parse import urljoin
-from http.cookiejar import CookieJar
+from urllib.request import HTTPCookieProcessor, HTTPError, HTTPHandler, Request
+from urllib.request import build_opener as urllib_build_opener
 from urllib.response import addinfourl
 
+from .net import htmlunquote
+from .utils import re_compile
 
 DEBUG = False
 

web/db.py

@@ -7,20 +7,15 @@
 import os
 import re
 import time
+from urllib import parse as urlparse
+from urllib.parse import unquote
 
 from .py3helpers import iteritems
 from .utils import iters, safestr, safeunicode, storage, threadeddict
 
-try:
- from urllib import parse as urlparse
- from urllib.parse import unquote
-except ImportError:
- import urlparse
- from urllib import unquote
-
 try:
  # db module can work independent of web.py
- from .webapi import debug, config
+ from .webapi import config, debug
 except ImportError:
  import sys
 

web/httpserver.py

@@ -1,28 +1,14 @@
 import os
 import posixpath
 import sys
+from http.server import BaseHTTPRequestHandler, HTTPServer, SimpleHTTPRequestHandler
+from io import BytesIO
+from urllib import parse as urlparse
+from urllib.parse import unquote
 
 from . import utils
 from . import webapi as web
 
-try:
- from io import BytesIO
-except ImportError:
- from StringIO import BytesIO
-
-try:
- from http.server import HTTPServer, SimpleHTTPRequestHandler, BaseHTTPRequestHandler
-except ImportError:
- from SimpleHTTPServer import SimpleHTTPRequestHandler
- from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
-
-try:
- from urllib import parse as urlparse
- from urllib.parse import unquote
-except ImportError:
- import urlparse
- from urllib import unquote
-
 __all__ = ["runsimple"]
 
 
@@ -41,11 +27,12 @@ def runbasic(func, server_address=("0.0.0.0", 8080)):
  # Used under the modified BSD license:
  # http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5
 
- import SocketServer
- import socket
  import errno
+ import socket
  import traceback
 
+ import SocketServer
+
  class WSGIHandler(SimpleHTTPRequestHandler):
  def run_wsgi_app(self):
  protocol, host, path, parameters, query, fragment = urlparse.urlparse(

web/session.py

@@ -21,9 +21,7 @@
 except ImportError:
  import pickle
 
-
-from base64 import encodebytes, decodebytes
-
+from base64 import decodebytes, encodebytes
 
 __all__ = ["Session", "SessionExpired", "Store", "DiskStore", "DBStore", "MemoryStore"]
 

web/utils.py

@@ -15,10 +15,7 @@
 import traceback
 from threading import local as threadlocal
 
-from .py3helpers import (
- iteritems,
- itervalues,
-)
+from .py3helpers import iteritems, itervalues
 
 try:
  from StringIO import StringIO
@@ -1172,8 +1169,8 @@ def __init__(self, func):
 
  def __call__(self, *args): # , **kw): kw unused
  import cProfile
- import pstats
  import os
+ import pstats
  import tempfile
 
  f, filename = tempfile.mkstemp()

web/webapi.py

@@ -7,18 +7,12 @@
 import pprint
 import sys
 import tempfile
+from http.cookies import CookieError, Morsel, SimpleCookie
 from io import BytesIO
-from urllib.parse import urljoin
+from urllib.parse import quote, unquote, urljoin
 
 from .utils import dictadd, intget, safestr, storage, storify, threadeddict
 
-try:
- from urllib.parse import unquote, quote
- from http.cookies import CookieError, Morsel, SimpleCookie
-except ImportError:
- from urllib import unquote, quote
- from Cookie import CookieError, Morsel, SimpleCookie
-
 __all__ = [
  "config",
  "header",