Remove k_ prefix

Author: DeinAlptraum

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

@@ -10,7 +10,7 @@
 import sys
 from pathlib import Path
 
-k_inputs_dir = os.path.join(os.path.dirname(__file__), "INPUTS")
+inputs_dir = os.path.join(os.path.dirname(__file__), "INPUTS")
 
 
 @unittest.skipIf(sys.platform == "win32", "TODO: Fix these tests on Windows")
@@ -34,23 +34,23 @@ def test_create_fail(self):
 
     def test_create(self):
         """Check we can load a compilation database"""
-        CompilationDatabase.fromDirectory(k_inputs_dir)
+        CompilationDatabase.fromDirectory(inputs_dir)
 
     def test_lookup_succeed(self):
         """Check we get some results if the file exists in the db"""
-        cdb = CompilationDatabase.fromDirectory(k_inputs_dir)
+        cdb = CompilationDatabase.fromDirectory(inputs_dir)
         cmds = cdb.getCompileCommands("/home/john.doe/MyProject/project.cpp")
         self.assertNotEqual(len(cmds), 0)
 
     def test_lookup_succeed_pathlike(self):
         """Same as test_lookup_succeed, but with PathLikes"""
-        cdb = CompilationDatabase.fromDirectory(Path(k_inputs_dir))
+        cdb = CompilationDatabase.fromDirectory(Path(inputs_dir))
         cmds = cdb.getCompileCommands(Path("/home/john.doe/MyProject/project.cpp"))
         self.assertNotEqual(len(cmds), 0)
 
     def test_all_compilecommand(self):
         """Check we get all results from the db"""
-        cdb = CompilationDatabase.fromDirectory(k_inputs_dir)
+        cdb = CompilationDatabase.fromDirectory(inputs_dir)
         cmds = cdb.getAllCompileCommands()
         self.assertEqual(len(cmds), 3)
         expected = [
@@ -100,7 +100,7 @@ def test_all_compilecommand(self):
 
     def test_1_compilecommand(self):
         """Check file with single compile command"""
-        cdb = CompilationDatabase.fromDirectory(k_inputs_dir)
+        cdb = CompilationDatabase.fromDirectory(inputs_dir)
         file = "/home/john.doe/MyProject/project.cpp"
         cmds = cdb.getCompileCommands(file)
         self.assertEqual(len(cmds), 1)
@@ -119,7 +119,7 @@ def test_1_compilecommand(self):
 
     def test_2_compilecommand(self):
         """Check file with 2 compile commands"""
-        cdb = CompilationDatabase.fromDirectory(k_inputs_dir)
+        cdb = CompilationDatabase.fromDirectory(inputs_dir)
         cmds = cdb.getCompileCommands("/home/john.doe/MyProject/project2.cpp")
         self.assertEqual(len(cmds), 2)
         expected = [
@@ -154,23 +154,23 @@ def test_2_compilecommand(self):
 
     def test_compilecommand_iterator_stops(self):
         """Check that iterator stops after the correct number of elements"""
-        cdb = CompilationDatabase.fromDirectory(k_inputs_dir)
+        cdb = CompilationDatabase.fromDirectory(inputs_dir)
         count = 0
         for cmd in cdb.getCompileCommands("/home/john.doe/MyProject/project2.cpp"):
             count += 1
             self.assertLessEqual(count, 2)
 
     def test_compilationDB_references(self):
         """Ensure CompilationsCommands are independent of the database"""
-        cdb = CompilationDatabase.fromDirectory(k_inputs_dir)
+        cdb = CompilationDatabase.fromDirectory(inputs_dir)
         cmds = cdb.getCompileCommands("/home/john.doe/MyProject/project.cpp")
         del cdb
         gc.collect()
         cmds[0].directory
 
     def test_compilationCommands_references(self):
         """Ensure CompilationsCommand keeps a reference to CompilationCommands"""
-        cdb = CompilationDatabase.fromDirectory(k_inputs_dir)
+        cdb = CompilationDatabase.fromDirectory(inputs_dir)
         cmds = cdb.getCompileCommands("/home/john.doe/MyProject/project.cpp")
         del cdb
         cmd0 = cmds[0]

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

@@ -21,7 +21,7 @@
 
 from .util import get_cursor, get_cursors, get_tu
 
-k_input = """\
+children_test = """\
 struct s0 {
   int a;
   int b;
@@ -41,23 +41,23 @@
 }
 """
 
-k_parent_test = """\
+parent_test = """\
         class C {
             void f();
         }
 
         void C::f() { }
     """
 
-k_template_arg_test = """\
+template_arg_test = """\
         template <int kInt, typename T, bool kBool>
         void foo();
 
         template<>
         void foo<-7, float, true>();
     """
 
-k_binops = """\
+binops = """\
 struct C {
    int m;
  };
@@ -118,7 +118,7 @@ class C {
 
 class TestCursor(unittest.TestCase):
     def test_get_children(self):
-        tu = get_tu(k_input)
+        tu = get_tu(children_test)
 
         it = tu.cursor.get_children()
         tu_nodes = list(it)
@@ -613,15 +613,15 @@ def test_underlying_type(self):
         self.assertEqual(underlying.kind, TypeKind.INT)
 
     def test_semantic_parent(self):
-        tu = get_tu(k_parent_test, "cpp")
+        tu = get_tu(parent_test, "cpp")
         curs = get_cursors(tu, "f")
         decl = get_cursor(tu, "C")
         self.assertEqual(len(curs), 2)
         self.assertEqual(curs[0].semantic_parent, curs[1].semantic_parent)
         self.assertEqual(curs[0].semantic_parent, decl)
 
     def test_lexical_parent(self):
-        tu = get_tu(k_parent_test, "cpp")
+        tu = get_tu(parent_test, "cpp")
         curs = get_cursors(tu, "f")
         decl = get_cursor(tu, "C")
         self.assertEqual(len(curs), 2)
@@ -865,13 +865,13 @@ def test_get_arguments(self):
         self.assertEqual(arguments[1].spelling, "j")
 
     def test_get_num_template_arguments(self):
-        tu = get_tu(k_template_arg_test, lang="cpp")
+        tu = get_tu(template_arg_test, lang="cpp")
         foos = get_cursors(tu, "foo")
 
         self.assertEqual(foos[1].get_num_template_arguments(), 3)
 
     def test_get_template_argument_kind(self):
-        tu = get_tu(k_template_arg_test, lang="cpp")
+        tu = get_tu(template_arg_test, lang="cpp")
         foos = get_cursors(tu, "foo")
 
         self.assertEqual(
@@ -885,20 +885,20 @@ def test_get_template_argument_kind(self):
         )
 
     def test_get_template_argument_type(self):
-        tu = get_tu(k_template_arg_test, lang="cpp")
+        tu = get_tu(template_arg_test, lang="cpp")
         foos = get_cursors(tu, "foo")
 
         self.assertEqual(foos[1].get_template_argument_type(1).kind, TypeKind.FLOAT)
 
     def test_get_template_argument_value(self):
-        tu = get_tu(k_template_arg_test, lang="cpp")
+        tu = get_tu(template_arg_test, lang="cpp")
         foos = get_cursors(tu, "foo")
 
         self.assertEqual(foos[1].get_template_argument_value(0), -7)
         self.assertEqual(foos[1].get_template_argument_value(2), True)
 
     def test_get_template_argument_unsigned_value(self):
-        tu = get_tu(k_template_arg_test, lang="cpp")
+        tu = get_tu(template_arg_test, lang="cpp")
         foos = get_cursors(tu, "foo")
 
         self.assertEqual(foos[1].get_template_argument_unsigned_value(0), 2**32 - 7)
@@ -930,7 +930,7 @@ def test_mangled_name(self):
         )
 
     def test_binop(self):
-        tu = get_tu(k_binops, lang="cpp")
+        tu = get_tu(binops, lang="cpp")
 
         operators = {
             # not exposed yet

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

@@ -7,7 +7,7 @@
 
 import unittest
 
-k_inputs_dir = os.path.join(os.path.dirname(__file__), "INPUTS")
+inputs_dir = os.path.join(os.path.dirname(__file__), "INPUTS")
 
 
 class TestIndex(unittest.TestCase):
@@ -19,7 +19,7 @@ def test_create(self):
     def test_parse(self):
         index = Index.create()
         self.assertIsInstance(index, Index)
-        tu = index.parse(os.path.join(k_inputs_dir, "hello.cpp"))
+        tu = index.parse(os.path.join(inputs_dir, "hello.cpp"))
         self.assertIsInstance(tu, TranslationUnit)
-        tu = index.parse(None, ["-c", os.path.join(k_inputs_dir, "hello.cpp")])
+        tu = index.parse(None, ["-c", os.path.join(inputs_dir, "hello.cpp")])
         self.assertIsInstance(tu, TranslationUnit)

clang/bindings/python/tests/cindex/test_translation_unit.py

@@ -24,7 +24,7 @@
 
 from .util import get_cursor, get_tu
 
-k_inputs_dir = os.path.join(os.path.dirname(__file__), "INPUTS")
+inputs_dir = os.path.join(os.path.dirname(__file__), "INPUTS")
 
 
 @contextmanager
@@ -51,26 +51,26 @@ def save_tu_pathlike(tu):
 
 class TestTranslationUnit(unittest.TestCase):
     def test_spelling(self):
-        path = os.path.join(k_inputs_dir, "hello.cpp")
+        path = os.path.join(inputs_dir, "hello.cpp")
         tu = TranslationUnit.from_source(path)
         self.assertEqual(tu.spelling, path)
 
     def test_cursor(self):
-        path = os.path.join(k_inputs_dir, "hello.cpp")
+        path = os.path.join(inputs_dir, "hello.cpp")
         tu = get_tu(path)
         c = tu.cursor
         self.assertIsInstance(c, Cursor)
         self.assertIs(c.kind, CursorKind.TRANSLATION_UNIT)
 
     def test_parse_arguments(self):
-        path = os.path.join(k_inputs_dir, "parse_arguments.c")
+        path = os.path.join(inputs_dir, "parse_arguments.c")
         tu = TranslationUnit.from_source(path, ["-DDECL_ONE=hello", "-DDECL_TWO=hi"])
         spellings = [c.spelling for c in tu.cursor.get_children()]
         self.assertEqual(spellings[-2], "hello")
         self.assertEqual(spellings[-1], "hi")
 
     def test_reparse_arguments(self):
-        path = os.path.join(k_inputs_dir, "parse_arguments.c")
+        path = os.path.join(inputs_dir, "parse_arguments.c")
         tu = TranslationUnit.from_source(path, ["-DDECL_ONE=hello", "-DDECL_TWO=hi"])
         tu.reparse()
         spellings = [c.spelling for c in tu.cursor.get_children()]
@@ -150,21 +150,21 @@ def eq(expected, actual):
             else:
                 self.assert_normpaths_equal(expected[1], actual.include.name)
 
-        src = os.path.join(k_inputs_dir, "include.cpp")
-        h1 = os.path.join(k_inputs_dir, "header1.h")
-        h2 = os.path.join(k_inputs_dir, "header2.h")
-        h3 = os.path.join(k_inputs_dir, "header3.h")
+        src = os.path.join(inputs_dir, "include.cpp")
+        h1 = os.path.join(inputs_dir, "header1.h")
+        h2 = os.path.join(inputs_dir, "header2.h")
+        h3 = os.path.join(inputs_dir, "header3.h")
         inc = [(src, h1), (h1, h3), (src, h2), (h2, h3)]
 
         tu = TranslationUnit.from_source(src)
         for i in zip(inc, tu.get_includes()):
             eq(i[0], i[1])
 
     def test_inclusion_directive(self):
-        src = os.path.join(k_inputs_dir, "include.cpp")
-        h1 = os.path.join(k_inputs_dir, "header1.h")
-        h2 = os.path.join(k_inputs_dir, "header2.h")
-        h3 = os.path.join(k_inputs_dir, "header3.h")
+        src = os.path.join(inputs_dir, "include.cpp")
+        h1 = os.path.join(inputs_dir, "header1.h")
+        h2 = os.path.join(inputs_dir, "header2.h")
+        h3 = os.path.join(inputs_dir, "header3.h")
         inc = [h1, h3, h2, h3, h1]
 
         tu = TranslationUnit.from_source(
@@ -244,7 +244,7 @@ def test_load_pathlike(self):
             del tu2
 
     def test_index_parse(self):
-        path = os.path.join(k_inputs_dir, "hello.cpp")
+        path = os.path.join(inputs_dir, "hello.cpp")
         index = Index.create()
         tu = index.parse(path)
         self.assertIsInstance(tu, TranslationUnit)
@@ -341,15 +341,15 @@ def test_get_tokens_gc(self):
         gc.collect()  # Just in case.
 
     def test_fail_from_source(self):
-        path = os.path.join(k_inputs_dir, "non-existent.cpp")
+        path = os.path.join(inputs_dir, "non-existent.cpp")
         try:
             tu = TranslationUnit.from_source(path)
         except TranslationUnitLoadError:
             tu = None
         self.assertEqual(tu, None)
 
     def test_fail_from_ast_file(self):
-        path = os.path.join(k_inputs_dir, "non-existent.ast")
+        path = os.path.join(inputs_dir, "non-existent.ast")
         try:
             tu = TranslationUnit.from_ast_file(path)
         except TranslationUnitLoadError:

clang/bindings/python/tests/cindex/test_type.py

@@ -18,7 +18,7 @@
 
 from .util import get_cursor, get_cursors, get_tu
 
-k_input = """\
+struct_input = """\
 
 typedef int I;
 
@@ -45,7 +45,7 @@
 
 class TestType(unittest.TestCase):
     def test_a_struct(self):
-        tu = get_tu(k_input)
+        tu = get_tu(struct_input)
 
         teststruct = get_cursor(tu, "teststruct")
         self.assertIsNotNone(teststruct, "Could not find teststruct.")