Skip to content

Commit 71cfa38

Browse files
DeinAlptraumDeinAlptraum
authored
[libclang/python/tests] Clean up imports (llvm#114409)
Sort imports using `isort`. Remove unused imports. Collect multiple imports from the same module into a single import statement. Unify import style.
1 parent d6b9028 commit 71cfa38

21 files changed

+92
-134
lines changed

‎clang/bindings/python/tests/cindex/test_access_specifiers.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
import os
2-
from clang.cindex import Config
2+
3+
from clang.cindex import AccessSpecifier, Config
34

45
if "CLANG_LIBRARY_PATH" in os.environ:
56
Config.set_library_path(os.environ["CLANG_LIBRARY_PATH"])
67

7-
from clang.cindex import AccessSpecifier
8-
from clang.cindex import Cursor
9-
from clang.cindex import TranslationUnit
10-
11-
from .util import get_cursor
12-
from .util import get_tu
13-
148
import unittest
159

10+
from .util import get_cursor, get_tu
11+
1612

1713
class TestAccessSpecifiers(unittest.TestCase):
1814
def test_access_specifiers(self):

‎clang/bindings/python/tests/cindex/test_cdb.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
import os
2-
from clang.cindex import Config
2+
3+
from clang.cindex import CompilationDatabase, CompilationDatabaseError, Config
34

45
if "CLANG_LIBRARY_PATH" in os.environ:
56
Config.set_library_path(os.environ["CLANG_LIBRARY_PATH"])
67

7-
from clang.cindex import CompilationDatabase
8-
from clang.cindex import CompilationDatabaseError
9-
from clang.cindex import CompileCommands
10-
from clang.cindex import CompileCommand
11-
import os
128
import gc
139
import unittest
1410
import sys

‎clang/bindings/python/tests/cindex/test_code_completion.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import os
2-
from clang.cindex import Config
2+
3+
from clang.cindex import Config, TranslationUnit
34

45
if "CLANG_LIBRARY_PATH" in os.environ:
56
Config.set_library_path(os.environ["CLANG_LIBRARY_PATH"])
67

7-
from clang.cindex import TranslationUnit
8-
98
import unittest
109
from pathlib import Path
1110

‎clang/bindings/python/tests/cindex/test_comment.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import os
2-
from clang.cindex import Config
2+
3+
from clang.cindex import Config, TranslationUnit
34

45
if "CLANG_LIBRARY_PATH" in os.environ:
56
Config.set_library_path(os.environ["CLANG_LIBRARY_PATH"])
67

7-
from clang.cindex import TranslationUnit
8-
from tests.cindex.util import get_cursor
9-
108
import unittest
119

10+
from .util import get_cursor
11+
1212

1313
class TestComment(unittest.TestCase):
1414
def test_comment(self):

‎clang/bindings/python/tests/cindex/test_cursor.py

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
11
import os
2-
from clang.cindex import Config
2+
3+
from clang.cindex import (
4+
AvailabilityKind,
5+
BinaryOperator,
6+
Config,
7+
CursorKind,
8+
StorageClass,
9+
TemplateArgumentKind,
10+
TranslationUnit,
11+
TypeKind,
12+
)
313

414
if "CLANG_LIBRARY_PATH" in os.environ:
515
Config.set_library_path(os.environ["CLANG_LIBRARY_PATH"])
616

7-
import ctypes
817
import gc
918
import unittest
1019

11-
from clang.cindex import AvailabilityKind
12-
from clang.cindex import CursorKind
13-
from clang.cindex import TemplateArgumentKind
14-
from clang.cindex import TranslationUnit
15-
from clang.cindex import TypeKind
16-
from clang.cindex import BinaryOperator
17-
from clang.cindex import StorageClass
18-
from .util import get_cursor
19-
from .util import get_cursors
20-
from .util import get_tu
21-
20+
from .util import get_cursor, get_cursors, get_tu
2221

2322
kInput = """\
2423
struct s0 {

‎clang/bindings/python/tests/cindex/test_cursor_kind.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import os
2-
from clang.cindex import Config
2+
3+
from clang.cindex import Config, CursorKind
34

45
if "CLANG_LIBRARY_PATH" in os.environ:
56
Config.set_library_path(os.environ["CLANG_LIBRARY_PATH"])
67

7-
from clang.cindex import CursorKind
8-
98
import unittest
109

1110

‎clang/bindings/python/tests/cindex/test_diagnostics.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
import os
2-
from clang.cindex import Config
2+
3+
from clang.cindex import Config, Diagnostic
34

45
if "CLANG_LIBRARY_PATH" in os.environ:
56
Config.set_library_path(os.environ["CLANG_LIBRARY_PATH"])
67

7-
from clang.cindex import *
8-
from .util import get_tu
9-
108
import unittest
119

10+
from .util import get_tu
1211

1312
# FIXME: We need support for invalid translation units to test better.
1413

‎clang/bindings/python/tests/cindex/test_enums.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
import unittest
22

33
from clang.cindex import (
4-
TokenKind,
4+
AccessSpecifier,
5+
AvailabilityKind,
6+
BinaryOperator,
57
CursorKind,
6-
TemplateArgumentKind,
78
ExceptionSpecificationKind,
8-
AvailabilityKind,
9-
AccessSpecifier,
10-
TypeKind,
11-
RefQualifierKind,
129
LinkageKind,
13-
TLSKind,
10+
RefQualifierKind,
1411
StorageClass,
15-
BinaryOperator,
12+
TemplateArgumentKind,
13+
TLSKind,
14+
TokenKind,
15+
TypeKind,
1616
)
1717

1818

‎clang/bindings/python/tests/cindex/test_exception_specification_kind.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
import os
2-
from clang.cindex import Config
2+
3+
from clang.cindex import Config, CursorKind, ExceptionSpecificationKind
34

45
if "CLANG_LIBRARY_PATH" in os.environ:
56
Config.set_library_path(os.environ["CLANG_LIBRARY_PATH"])
67

7-
import clang.cindex
8-
from clang.cindex import ExceptionSpecificationKind
9-
from .util import get_tu
10-
118
import unittest
129

10+
from .util import get_tu
11+
1312

1413
def find_function_declarations(node, declarations=[]):
15-
if node.kind == clang.cindex.CursorKind.FUNCTION_DECL:
14+
if node.kind == CursorKind.FUNCTION_DECL:
1615
declarations.append(node)
1716
for child in node.get_children():
1817
declarations = find_function_declarations(child, declarations)

‎clang/bindings/python/tests/cindex/test_file.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import os
2-
from clang.cindex import Config
2+
3+
from clang.cindex import Config, File, Index
34

45
if "CLANG_LIBRARY_PATH" in os.environ:
56
Config.set_library_path(os.environ["CLANG_LIBRARY_PATH"])
67

7-
from clang.cindex import Index, File
8-
98
import unittest
109

1110

‎clang/bindings/python/tests/cindex/test_index.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
import os
2-
from clang.cindex import Config
2+
3+
from clang.cindex import Config, Index, TranslationUnit
34

45
if "CLANG_LIBRARY_PATH" in os.environ:
56
Config.set_library_path(os.environ["CLANG_LIBRARY_PATH"])
67

7-
from clang.cindex import *
8-
import os
98
import unittest
109

11-
1210
kInputsDir = os.path.join(os.path.dirname(__file__), "INPUTS")
1311

1412

‎clang/bindings/python/tests/cindex/test_linkage.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
import os
2-
from clang.cindex import Config
2+
3+
from clang.cindex import Config, LinkageKind
34

45
if "CLANG_LIBRARY_PATH" in os.environ:
56
Config.set_library_path(os.environ["CLANG_LIBRARY_PATH"])
67

7-
from clang.cindex import LinkageKind
8-
from clang.cindex import Cursor
9-
from clang.cindex import TranslationUnit
10-
11-
from .util import get_cursor
12-
from .util import get_tu
13-
148
import unittest
159

10+
from .util import get_cursor, get_tu
11+
1612

1713
class TestLinkage(unittest.TestCase):
1814
def test_linkage(self):

‎clang/bindings/python/tests/cindex/test_location.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
import os
2-
from clang.cindex import Config
2+
3+
from clang.cindex import (
4+
Config,
5+
Cursor,
6+
File,
7+
SourceLocation,
8+
SourceRange,
9+
TranslationUnit,
10+
)
311

412
if "CLANG_LIBRARY_PATH" in os.environ:
513
Config.set_library_path(os.environ["CLANG_LIBRARY_PATH"])
614

7-
from clang.cindex import Cursor
8-
from clang.cindex import File
9-
from clang.cindex import SourceLocation
10-
from clang.cindex import SourceRange
11-
from clang.cindex import TranslationUnit
12-
from .util import get_cursor
13-
from .util import get_tu
14-
1515
import unittest
1616

17+
from .util import get_cursor, get_tu
1718

1819
baseInput = "int one;\nint two;\n"
1920

‎clang/bindings/python/tests/cindex/test_rewrite.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
1-
import unittest
21
import tempfile
2+
import unittest
33

4-
from clang.cindex import (
5-
Rewriter,
6-
TranslationUnit,
7-
File,
8-
SourceLocation,
9-
SourceRange,
10-
)
4+
from clang.cindex import File, Rewriter, SourceLocation, SourceRange, TranslationUnit
115

126

137
class TestRewrite(unittest.TestCase):

‎clang/bindings/python/tests/cindex/test_source_range.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import os
2-
from clang.cindex import Config
2+
3+
from clang.cindex import Config, SourceLocation, SourceRange, TranslationUnit
34

45
if "CLANG_LIBRARY_PATH" in os.environ:
56
Config.set_library_path(os.environ["CLANG_LIBRARY_PATH"])
67

78
import unittest
8-
from clang.cindex import SourceLocation, SourceRange, TranslationUnit
99

1010
from .util import get_tu
1111

‎clang/bindings/python/tests/cindex/test_tls_kind.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
import os
2-
from clang.cindex import Config
2+
3+
from clang.cindex import Config, TLSKind
34

45
if "CLANG_LIBRARY_PATH" in os.environ:
56
Config.set_library_path(os.environ["CLANG_LIBRARY_PATH"])
67

7-
from clang.cindex import TLSKind
8-
from clang.cindex import Cursor
9-
from clang.cindex import TranslationUnit
10-
11-
from .util import get_cursor
12-
from .util import get_tu
13-
148
import unittest
159

10+
from .util import get_cursor, get_tu
11+
1612

1713
class TestTLSKind(unittest.TestCase):
1814
def test_tls_kind(self):

‎clang/bindings/python/tests/cindex/test_token_kind.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import os
2-
from clang.cindex import Config
2+
3+
from clang.cindex import Config, TokenKind
34

45
if "CLANG_LIBRARY_PATH" in os.environ:
56
Config.set_library_path(os.environ["CLANG_LIBRARY_PATH"])
67

7-
from clang.cindex import TokenKind
8-
98
import unittest
109

1110

‎clang/bindings/python/tests/cindex/test_tokens.py

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
11
import os
2-
from clang.cindex import Config
2+
3+
from clang.cindex import Config, CursorKind, SourceLocation, SourceRange, TokenKind
34

45
if "CLANG_LIBRARY_PATH" in os.environ:
56
Config.set_library_path(os.environ["CLANG_LIBRARY_PATH"])
67

7-
from clang.cindex import CursorKind
8-
from clang.cindex import Index
9-
from clang.cindex import SourceLocation
10-
from clang.cindex import SourceRange
11-
from clang.cindex import TokenKind
8+
import unittest
129

1310
from .util import get_tu
1411

15-
import unittest
16-
1712

1813
class TestTokens(unittest.TestCase):
1914
def test_token_to_cursor(self):

0 commit comments

Comments
 (0)