Make sure import statements are sorted

Cito · Cito · commit 536805c83e6c · 2023-09-01T22:59:03.000+02:00
diff --git a/pg.py b/pg.py
@@ -150,7 +150,6 @@
     'version', '__version__']
 
 import select
-import warnings
 import weakref
 from collections import OrderedDict, namedtuple
 from datetime import date, datetime, time, timedelta
diff --git a/pyproject.toml b/pyproject.toml
@@ -45,6 +45,7 @@ line-length = 79
 select = [
   "E",   # pycodestyle
   "F",   # pyflakes
+  "I",   # isort
   "UP",  # pyupgrade
   "D",   # pydocstyle
 ]
diff --git a/tests/test_dbapi20.py b/tests/test_dbapi20.py
@@ -2,19 +2,13 @@
 
 import gc
 import unittest
-
-from datetime import date, time, datetime, timedelta, timezone
+from datetime import date, datetime, time, timedelta, timezone
 from uuid import UUID as Uuid
 
 import pgdb
 
-try:
-    from . import dbapi20
-except (ImportError, ValueError, SystemError):
-    # noinspection PyUnresolvedReferences
-    import dbapi20
-
-from .config import dbname, dbhost, dbport, dbuser, dbpasswd
+from . import dbapi20
+from .config import dbhost, dbname, dbpasswd, dbport, dbuser
 
 
 class PgBitString:
@@ -27,7 +21,7 @@ def __pg_repr__(self):
         return f"B'{self.value:b}'"
 
 
-class test_PyGreSQL(dbapi20.DatabaseAPI20Test):
+class TestPgDb(dbapi20.DatabaseAPI20Test):
 
     driver = pgdb
     connect_args = ()
@@ -38,7 +32,7 @@ class test_PyGreSQL(dbapi20.DatabaseAPI20Test):
     lower_func = 'lower'  # For stored procedure test
 
     def setUp(self):
-        dbapi20.DatabaseAPI20Test.setUp(self)
+        super().setUp()
         try:
             con = self._connect()
             con.close()
@@ -52,7 +46,7 @@ def setUp(self):
             db.query('create database ' + dbname)
 
     def tearDown(self):
-        dbapi20.DatabaseAPI20Test.tearDown(self)
+        super().tearDown()
 
     def test_version(self):
         v = pgdb.version
@@ -542,7 +536,7 @@ def test_sqlstate(self):
 
     def test_float(self):
         nan, inf = float('nan'), float('inf')
-        from math import isnan, isinf
+        from math import isinf, isnan
         self.assertTrue(isnan(nan) and not isinf(nan))
         self.assertTrue(isinf(inf) and not isnan(inf))
         values = [0, 1, 0.03125, -42.53125, nan, inf, -inf,
diff --git a/tests/test_tutorial.py b/tests/test_tutorial.py
@@ -5,7 +5,7 @@
 from pg import DB
 from pgdb import connect
 
-from .config import dbname, dbhost, dbport, dbuser, dbpasswd
+from .config import dbhost, dbname, dbpasswd, dbport, dbuser
 
 
 class TestClassicTutorial(unittest.TestCase):

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ line-length = 79`
`45`	`45`	`select = [`
`46`	`46`	`"E", # pycodestyle`
`47`	`47`	`"F", # pyflakes`
	`48`	`+ "I", # isort`
`48`	`49`	`"UP", # pyupgrade`
`49`	`50`	`"D", # pydocstyle`
`50`	`51`	`]`