diff --git a/crates/sre_engine/generate_tests.py b/crates/sre_engine/generate_tests.py index 3af4d7e6a..542852a24 100644 --- a/crates/sre_engine/generate_tests.py +++ b/crates/sre_engine/generate_tests.py @@ -1,8 +1,8 @@ -import os -from pathlib import Path -import re import json +import os +import re from itertools import chain +from pathlib import Path m = re.search(r"const SRE_MAGIC: usize = (\d+);", open("src/constants.rs").read()) sre_engine_magic = int(m.group(1)) diff --git a/crawl_sourcecode.py b/crawl_sourcecode.py index a96ec283f..30e01d044 100644 --- a/crawl_sourcecode.py +++ b/crawl_sourcecode.py @@ -9,9 +9,9 @@ $ diff cpython.txt rustpython.txt """ import ast -import sys -import symtable import dis +import symtable +import sys filename = sys.argv[1] print("Crawling file:", filename) diff --git a/extra_tests/custom_text_test_runner.py b/extra_tests/custom_text_test_runner.py index 4c48e615c..018121f0d 100644 --- a/extra_tests/custom_text_test_runner.py +++ b/extra_tests/custom_text_test_runner.py @@ -25,16 +25,17 @@ # SOFTWARE. -import unittest -import os, sys, traceback import inspect import json -import time -import re import operator -from unittest.runner import result -from unittest.runner import registerResult +import os +import re +import sys +import time +import traceback +import unittest from functools import reduce +from unittest.runner import registerResult, result class TablePrinter(object): diff --git a/extra_tests/jsontests.py b/extra_tests/jsontests.py index a54fd4234..c1f92509f 100644 --- a/extra_tests/jsontests.py +++ b/extra_tests/jsontests.py @@ -1,8 +1,8 @@ +import os import unittest + from custom_text_test_runner import CustomTextTestRunner as Runner from test.libregrtest.runtest import findtests -import os - testnames = findtests() # idk why this fixes the hanging, if it does diff --git a/extra_tests/snippets/builtin_all.py b/extra_tests/snippets/builtin_all.py index cf0eea393..ba11ce0de 100644 --- a/extra_tests/snippets/builtin_all.py +++ b/extra_tests/snippets/builtin_all.py @@ -1,5 +1,4 @@ -from testutils import assert_raises -from testutils import TestFailingBool, TestFailingIter +from testutils import TestFailingBool, TestFailingIter, assert_raises assert all([True]) assert not all([False]) diff --git a/extra_tests/snippets/builtin_any.py b/extra_tests/snippets/builtin_any.py index 59b4514f8..11b47d1f0 100644 --- a/extra_tests/snippets/builtin_any.py +++ b/extra_tests/snippets/builtin_any.py @@ -1,5 +1,4 @@ -from testutils import assert_raises -from testutils import TestFailingBool, TestFailingIter +from testutils import TestFailingBool, TestFailingIter, assert_raises assert any([True]) assert not any([False]) diff --git a/extra_tests/snippets/builtin_bytearray.py b/extra_tests/snippets/builtin_bytearray.py index 1a6993e20..0b7e41939 100644 --- a/extra_tests/snippets/builtin_bytearray.py +++ b/extra_tests/snippets/builtin_bytearray.py @@ -1,7 +1,8 @@ -from testutils import assert_raises import pickle import sys +from testutils import assert_raises + # new assert bytearray([1, 2, 3]) assert bytearray((1, 2, 3)) diff --git a/extra_tests/snippets/builtin_exceptions.py b/extra_tests/snippets/builtin_exceptions.py index 82aa54d63..490f831f5 100644 --- a/extra_tests/snippets/builtin_exceptions.py +++ b/extra_tests/snippets/builtin_exceptions.py @@ -1,6 +1,6 @@ import builtins -import platform import pickle +import platform import sys diff --git a/extra_tests/snippets/builtin_pow.py b/extra_tests/snippets/builtin_pow.py index c76991423..d38b57c37 100644 --- a/extra_tests/snippets/builtin_pow.py +++ b/extra_tests/snippets/builtin_pow.py @@ -1,4 +1,4 @@ -from testutils import assert_raises, assert_equal +from testutils import assert_equal, assert_raises assert pow(3, 2) == 9 assert pow(5, 3, 100) == 25 diff --git a/extra_tests/snippets/builtin_print.py b/extra_tests/snippets/builtin_print.py index b9f3b8cc1..2778cff65 100644 --- a/extra_tests/snippets/builtin_print.py +++ b/extra_tests/snippets/builtin_print.py @@ -1,6 +1,7 @@ -from testutils import assert_raises import io +from testutils import assert_raises + print(2 + 3) assert_raises(TypeError, print, "test", end=4, _msg="wrong type passed to end") diff --git a/extra_tests/snippets/builtin_str.py b/extra_tests/snippets/builtin_str.py index 1b9a7bde1..415156184 100644 --- a/extra_tests/snippets/builtin_str.py +++ b/extra_tests/snippets/builtin_str.py @@ -1,4 +1,4 @@ -from testutils import assert_raises, AssertRaises, skip_if_unsupported +from testutils import AssertRaises, assert_raises, skip_if_unsupported assert "".__eq__(1) == NotImplemented assert "a" == "a" diff --git a/extra_tests/snippets/dir_module/__init__.py b/extra_tests/snippets/dir_module/__init__.py index 5d9faff33..7408005f5 100644 --- a/extra_tests/snippets/dir_module/__init__.py +++ b/extra_tests/snippets/dir_module/__init__.py @@ -1,2 +1,2 @@ -from .relative import value from .dir_module_inner import value2 +from .relative import value diff --git a/extra_tests/snippets/forbidden_instantiation.py b/extra_tests/snippets/forbidden_instantiation.py index 904c5c6f0..50b6f58f0 100644 --- a/extra_tests/snippets/forbidden_instantiation.py +++ b/extra_tests/snippets/forbidden_instantiation.py @@ -1,18 +1,19 @@ -from typing import Type from types import ( - GeneratorType, - CoroutineType, AsyncGeneratorType, BuiltinFunctionType, BuiltinMethodType, - WrapperDescriptorType, - MethodWrapperType, - MethodDescriptorType, ClassMethodDescriptorType, + CoroutineType, FrameType, + GeneratorType, GetSetDescriptorType, MemberDescriptorType, + MethodDescriptorType, + MethodWrapperType, + WrapperDescriptorType, ) +from typing import Type + from testutils import assert_raises diff --git a/extra_tests/snippets/import.py b/extra_tests/snippets/import.py index 466e1315a..435e62241 100644 --- a/extra_tests/snippets/import.py +++ b/extra_tests/snippets/import.py @@ -1,9 +1,10 @@ -import import_target, import_target as aliased -from import_target import func, other_func -from import_target import func as aliased_func, other_func as aliased_other_func -from import_star import * - import import_mutual1 +import import_target +import import_target as aliased +from import_star import * +from import_target import func, other_func +from import_target import func as aliased_func +from import_target import other_func as aliased_other_func assert import_target.X == import_target.func() assert import_target.X == func() diff --git a/extra_tests/snippets/protocol_index_bad.py b/extra_tests/snippets/protocol_index_bad.py index d4ac003c8..51d904260 100644 --- a/extra_tests/snippets/protocol_index_bad.py +++ b/extra_tests/snippets/protocol_index_bad.py @@ -1,9 +1,10 @@ """Test that indexing ops don't hang when an object with a mutating __index__ is used.""" -from testutils import assert_raises from array import array +from testutils import assert_raises + class BadIndex: def __index__(self): diff --git a/extra_tests/snippets/stdlib_array.py b/extra_tests/snippets/stdlib_array.py index a31b2f8e4..34eac9491 100644 --- a/extra_tests/snippets/stdlib_array.py +++ b/extra_tests/snippets/stdlib_array.py @@ -1,7 +1,8 @@ -from testutils import assert_raises from array import array from pickle import dumps, loads +from testutils import assert_raises + a1 = array("b", [0, 1, 2, 3]) assert a1.tobytes() == b"\x00\x01\x02\x03" diff --git a/extra_tests/snippets/stdlib_binascii.py b/extra_tests/snippets/stdlib_binascii.py index 5dcb5a032..c4c2121fa 100644 --- a/extra_tests/snippets/stdlib_binascii.py +++ b/extra_tests/snippets/stdlib_binascii.py @@ -1,6 +1,6 @@ import binascii -from testutils import assert_raises, assert_equal +from testutils import assert_equal, assert_raises # hexlify tests h = binascii.hexlify diff --git a/extra_tests/snippets/stdlib_collections.py b/extra_tests/snippets/stdlib_collections.py index 8fd7cb6a8..8a9bdb453 100644 --- a/extra_tests/snippets/stdlib_collections.py +++ b/extra_tests/snippets/stdlib_collections.py @@ -1,6 +1,5 @@ from collections import deque - d = deque([0, 1, 2]) d.append(1) diff --git a/extra_tests/snippets/stdlib_collections_deque.py b/extra_tests/snippets/stdlib_collections_deque.py index 86e566f41..25b2069f6 100644 --- a/extra_tests/snippets/stdlib_collections_deque.py +++ b/extra_tests/snippets/stdlib_collections_deque.py @@ -1,7 +1,8 @@ -from testutils import assert_raises from collections import deque from typing import Deque +from testutils import assert_raises + def test_deque_iterator__new__(): klass = type(iter(deque())) diff --git a/extra_tests/snippets/stdlib_csv.py b/extra_tests/snippets/stdlib_csv.py index f762c5801..eb3461e90 100644 --- a/extra_tests/snippets/stdlib_csv.py +++ b/extra_tests/snippets/stdlib_csv.py @@ -1,7 +1,7 @@ -from testutils import assert_raises - import csv +from testutils import assert_raises + for row in csv.reader(["one,two,three"]): [one, two, three] = row assert one == "one" diff --git a/extra_tests/snippets/stdlib_ctypes.py b/extra_tests/snippets/stdlib_ctypes.py index b4bc05dcb..0ec7568a8 100644 --- a/extra_tests/snippets/stdlib_ctypes.py +++ b/extra_tests/snippets/stdlib_ctypes.py @@ -1,14 +1,10 @@ -import os as _os, sys as _sys +import os as _os +import sys as _sys import types as _types - -from _ctypes import RTLD_LOCAL, RTLD_GLOBAL -from _ctypes import sizeof -from _ctypes import _SimpleCData, Array +from _ctypes import RTLD_GLOBAL, RTLD_LOCAL, Array, _SimpleCData, sizeof from _ctypes import CFuncPtr as _CFuncPtr - from struct import calcsize as _calcsize - assert Array.__class__.__name__ == "PyCArrayType" assert Array.__base__.__name__ == "_CData" @@ -24,8 +20,14 @@ if _os.name == "posix" and _sys.platform == "darwin": from _ctypes import ( FUNCFLAG_CDECL as _FUNCFLAG_CDECL, +) +from _ctypes import ( FUNCFLAG_PYTHONAPI as _FUNCFLAG_PYTHONAPI, +) +from _ctypes import ( FUNCFLAG_USE_ERRNO as _FUNCFLAG_USE_ERRNO, +) +from _ctypes import ( FUNCFLAG_USE_LASTERROR as _FUNCFLAG_USE_LASTERROR, ) @@ -210,8 +212,8 @@ assert i.value == 42 assert abs(f.value - 3.14) < 1e-06 if _os.name == "nt": - from _ctypes import LoadLibrary as _dlopen from _ctypes import FUNCFLAG_STDCALL as _FUNCFLAG_STDCALL + from _ctypes import LoadLibrary as _dlopen elif _os.name == "posix": from _ctypes import dlopen as _dlopen diff --git a/extra_tests/snippets/stdlib_datetime.py b/extra_tests/snippets/stdlib_datetime.py index 60e804940..57ffd3a44 100644 --- a/extra_tests/snippets/stdlib_datetime.py +++ b/extra_tests/snippets/stdlib_datetime.py @@ -4,27 +4,20 @@ See http://www.zope.org/Members/fdrake/DateTimeWiki/TestCases """ # import copy -import sys -import random - -from operator import lt, le, gt, ge, eq, ne, truediv, floordiv, mod - import datetime as datetime_module -from datetime import MINYEAR, MAXYEAR -from datetime import timedelta -from datetime import tzinfo -from datetime import time -from datetime import timezone -from datetime import date, datetime +import random +import sys import time as _time +from datetime import MAXYEAR, MINYEAR, date, datetime, time, timedelta, timezone, tzinfo +from operator import eq, floordiv, ge, gt, le, lt, mod, ne, truediv from testutils import ( - assert_raises, assert_equal, - assert_true, assert_false, - assert_isinstance, assert_in, + assert_isinstance, + assert_raises, + assert_true, ) # An arbitrary collection of objects of non-datetime types, for testing diff --git a/extra_tests/snippets/stdlib_dir_module.py b/extra_tests/snippets/stdlib_dir_module.py index a8ab233f3..db00055c7 100644 --- a/extra_tests/snippets/stdlib_dir_module.py +++ b/extra_tests/snippets/stdlib_dir_module.py @@ -1,6 +1,5 @@ -from testutils import assert_equal - import dir_module +from testutils import assert_equal assert dir_module.value == 5 assert dir_module.value2 == 7 diff --git a/extra_tests/snippets/stdlib_functools.py b/extra_tests/snippets/stdlib_functools.py index 3d323bfba..d3e2495e8 100644 --- a/extra_tests/snippets/stdlib_functools.py +++ b/extra_tests/snippets/stdlib_functools.py @@ -1,4 +1,5 @@ from functools import reduce + from testutils import assert_raises diff --git a/extra_tests/snippets/stdlib_io.py b/extra_tests/snippets/stdlib_io.py index 011bb051c..722886d34 100644 --- a/extra_tests/snippets/stdlib_io.py +++ b/extra_tests/snippets/stdlib_io.py @@ -1,5 +1,6 @@ -from io import BufferedReader, FileIO, StringIO, BytesIO import os +from io import BufferedReader, BytesIO, FileIO, StringIO + from testutils import assert_raises fi = FileIO("README.md") diff --git a/extra_tests/snippets/stdlib_itertools.py b/extra_tests/snippets/stdlib_itertools.py index 31d8adbfd..4d2e9f6e1 100644 --- a/extra_tests/snippets/stdlib_itertools.py +++ b/extra_tests/snippets/stdlib_itertools.py @@ -1,9 +1,8 @@ import itertools +import pickle from testutils import assert_raises -import pickle - # itertools.chain tests chain = itertools.chain diff --git a/extra_tests/snippets/stdlib_json.py b/extra_tests/snippets/stdlib_json.py index ca35c2c2b..758cd129c 100644 --- a/extra_tests/snippets/stdlib_json.py +++ b/extra_tests/snippets/stdlib_json.py @@ -1,6 +1,7 @@ -from testutils import assert_raises import json -from io import StringIO, BytesIO +from io import BytesIO, StringIO + +from testutils import assert_raises def round_trip_test(obj): diff --git a/extra_tests/snippets/stdlib_marshal.py b/extra_tests/snippets/stdlib_marshal.py index c5fb1e533..db843ff65 100644 --- a/extra_tests/snippets/stdlib_marshal.py +++ b/extra_tests/snippets/stdlib_marshal.py @@ -1,5 +1,5 @@ -import unittest import marshal +import unittest class MarshalTests(unittest.TestCase): diff --git a/extra_tests/snippets/stdlib_math.py b/extra_tests/snippets/stdlib_math.py index 090de710e..a6bb0099c 100644 --- a/extra_tests/snippets/stdlib_math.py +++ b/extra_tests/snippets/stdlib_math.py @@ -1,4 +1,5 @@ import math + from testutils import assert_raises, skip_if_unsupported NAN = float("nan") diff --git a/extra_tests/snippets/stdlib_os.py b/extra_tests/snippets/stdlib_os.py index f5d26030a..a538365f7 100644 --- a/extra_tests/snippets/stdlib_os.py +++ b/extra_tests/snippets/stdlib_os.py @@ -1,7 +1,7 @@ import os -import time import stat import sys +import time from testutils import assert_raises diff --git a/extra_tests/snippets/stdlib_pwd.py b/extra_tests/snippets/stdlib_pwd.py index 2a44aed32..c3aeb7c87 100644 --- a/extra_tests/snippets/stdlib_pwd.py +++ b/extra_tests/snippets/stdlib_pwd.py @@ -4,9 +4,10 @@ import sys if sys.platform.startswith("win"): exit(0) -from testutils import assert_raises import pwd +from testutils import assert_raises + with assert_raises(KeyError): fake_name = "fake_user" while pwd.getpwnam(fake_name): diff --git a/extra_tests/snippets/stdlib_select.py b/extra_tests/snippets/stdlib_select.py index fe246db99..d27bb82b1 100644 --- a/extra_tests/snippets/stdlib_select.py +++ b/extra_tests/snippets/stdlib_select.py @@ -1,8 +1,8 @@ -from testutils import assert_raises - import select -import sys import socket +import sys + +from testutils import assert_raises class Nope: diff --git a/extra_tests/snippets/stdlib_signal.py b/extra_tests/snippets/stdlib_signal.py index 0abfd7cb7..9d0b13bbd 100644 --- a/extra_tests/snippets/stdlib_signal.py +++ b/extra_tests/snippets/stdlib_signal.py @@ -1,6 +1,7 @@ import signal -import time import sys +import time + from testutils import assert_raises assert_raises(TypeError, lambda: signal.signal(signal.SIGINT, 2)) diff --git a/extra_tests/snippets/stdlib_socket.py b/extra_tests/snippets/stdlib_socket.py index 199ff9fe4..b49fdcf08 100644 --- a/extra_tests/snippets/stdlib_socket.py +++ b/extra_tests/snippets/stdlib_socket.py @@ -1,6 +1,7 @@ import _socket -import socket import os +import socket + from testutils import assert_raises assert _socket.socket == _socket.SocketType diff --git a/extra_tests/snippets/stdlib_string.py b/extra_tests/snippets/stdlib_string.py index ae544f328..02bfc95c2 100644 --- a/extra_tests/snippets/stdlib_string.py +++ b/extra_tests/snippets/stdlib_string.py @@ -1,6 +1,5 @@ import string - assert string.ascii_letters == "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" assert string.ascii_lowercase == "abcdefghijklmnopqrstuvwxyz" assert string.ascii_uppercase == "ABCDEFGHIJKLMNOPQRSTUVWXYZ" diff --git a/extra_tests/snippets/stdlib_struct.py b/extra_tests/snippets/stdlib_struct.py index 1e08d0a22..3f97f2519 100644 --- a/extra_tests/snippets/stdlib_struct.py +++ b/extra_tests/snippets/stdlib_struct.py @@ -1,6 +1,7 @@ -from testutils import assert_raises import struct +from testutils import assert_raises + data = struct.pack("IH", 14, 12) assert data == bytes([14, 0, 0, 0, 12, 0]) diff --git a/extra_tests/snippets/stdlib_subprocess.py b/extra_tests/snippets/stdlib_subprocess.py index a2aa026f4..014011ea1 100644 --- a/extra_tests/snippets/stdlib_subprocess.py +++ b/extra_tests/snippets/stdlib_subprocess.py @@ -1,7 +1,7 @@ -import subprocess -import time -import sys import signal +import subprocess +import sys +import time from testutils import assert_raises diff --git a/extra_tests/snippets/stdlib_sys.py b/extra_tests/snippets/stdlib_sys.py index a3e9367c5..155fc905a 100644 --- a/extra_tests/snippets/stdlib_sys.py +++ b/extra_tests/snippets/stdlib_sys.py @@ -1,6 +1,6 @@ -import sys import os import subprocess +import sys from testutils import assert_raises diff --git a/extra_tests/snippets/stdlib_weakref.py b/extra_tests/snippets/stdlib_weakref.py index 059ddd000..17762addc 100644 --- a/extra_tests/snippets/stdlib_weakref.py +++ b/extra_tests/snippets/stdlib_weakref.py @@ -1,4 +1,5 @@ -from _weakref import ref, proxy +from _weakref import proxy, ref + from testutils import assert_raises diff --git a/extra_tests/snippets/stdlib_zlib.py b/extra_tests/snippets/stdlib_zlib.py index 308a8d23b..ac2b525b0 100644 --- a/extra_tests/snippets/stdlib_zlib.py +++ b/extra_tests/snippets/stdlib_zlib.py @@ -1,4 +1,5 @@ import zlib + from testutils import assert_raises # checksum functions diff --git a/extra_tests/test_snippets.py b/extra_tests/test_snippets.py index 5ff944c77..d58b86f66 100644 --- a/extra_tests/test_snippets.py +++ b/extra_tests/test_snippets.py @@ -2,14 +2,14 @@ # in the snippets folder. -import sys -import os -import unittest -import glob -import logging -import subprocess import contextlib import enum +import glob +import logging +import os +import subprocess +import sys +import unittest from pathlib import Path diff --git a/scripts/generate_checklist.py b/scripts/generate_checklist.py index 9a444b16e..759e4bd2a 100644 --- a/scripts/generate_checklist.py +++ b/scripts/generate_checklist.py @@ -7,8 +7,8 @@ import argparse import dataclasses import difflib import pathlib -from typing import Optional import warnings +from typing import Optional import requests from jinja2 import Environment, FileSystemLoader diff --git a/scripts/make_ssl_data_rs.py b/scripts/make_ssl_data_rs.py index b6891416a..a089fe6ee 100755 --- a/scripts/make_ssl_data_rs.py +++ b/scripts/make_ssl_data_rs.py @@ -19,7 +19,6 @@ import os import re import sys - parser = argparse.ArgumentParser( description="Generate ssl_data.rs from OpenSSL sources" ) diff --git a/wasm/demo/snippets/asyncbrowser.py b/wasm/demo/snippets/asyncbrowser.py index d3a9dca85..979c1d389 100644 --- a/wasm/demo/snippets/asyncbrowser.py +++ b/wasm/demo/snippets/asyncbrowser.py @@ -1,5 +1,5 @@ -import browser import asyncweb +import browser async def main(delay): diff --git a/wasm/demo/snippets/import_pypi.py b/wasm/demo/snippets/import_pypi.py index e3325d56f..547fe2365 100644 --- a/wasm/demo/snippets/import_pypi.py +++ b/wasm/demo/snippets/import_pypi.py @@ -2,7 +2,6 @@ # available as os.path as well as a few other utilities, but will raise an # OSError for anything that actually requires an OS import _dummy_os - import asyncweb import whlimport @@ -13,8 +12,8 @@ whlimport.setup() async def main(): await whlimport.load_package("pygments") import pygments - import pygments.lexers import pygments.formatters.html + import pygments.lexers lexer = pygments.lexers.get_lexer_by_name("python") fmter = pygments.formatters.html.HtmlFormatter(noclasses=True, style="default") diff --git a/wasm/example/src/main.py b/wasm/example/src/main.py index b5a1bda7c..855b1e2ce 100644 --- a/wasm/example/src/main.py +++ b/wasm/example/src/main.py @@ -1,4 +1,4 @@ -from browser import fetch, alert +from browser import alert, fetch def fetch_handler(repos): diff --git a/wasm/tests/conftest.py b/wasm/tests/conftest.py index e01f5eddc..c7555c995 100644 --- a/wasm/tests/conftest.py +++ b/wasm/tests/conftest.py @@ -1,10 +1,11 @@ -import subprocess -import os -import time -import socket import atexit -import pytest +import os +import socket +import subprocess import sys +import time + +import pytest PORT = 8080 @@ -65,11 +66,11 @@ def wait_for_port(port, host="localhost", timeout=5.0): from selenium import webdriver -from selenium.webdriver.firefox.options import Options -from selenium.webdriver.common.by import By -from selenium.webdriver.support.ui import WebDriverWait -from selenium.webdriver.support import expected_conditions as EC from selenium.common.exceptions import JavascriptException +from selenium.webdriver.common.by import By +from selenium.webdriver.firefox.options import Options +from selenium.webdriver.support import expected_conditions as EC +from selenium.webdriver.support.ui import WebDriverWait class Driver(webdriver.Firefox): diff --git a/whats_left.py b/whats_left.py index c79bfb146..91e46bef7 100755 --- a/whats_left.py +++ b/whats_left.py @@ -17,15 +17,14 @@ # We then run this second generated script with RustPython. import argparse -import re -import os -import re -import sys -import json -import warnings import inspect -import subprocess +import json +import os import platform +import re +import subprocess +import sys +import warnings from pydoc import ModuleScanner if not sys.flags.isolated: @@ -327,13 +326,13 @@ libdir = "" def compare(): import inspect import io + import json import os + import platform import re import sys import warnings from contextlib import redirect_stdout - import json - import platform def method_incompatibility_reason(typ, method_name, real_method_value): has_method = hasattr(typ, method_name)