Mode 'dedent' into new test/utils folder

Cito · Cito · commit ae93e75d062a · 2020-07-02T19:24:01.000+02:00
Replicates graphql/graphql-js@8be49f6
diff --git a/docs/modules/pyutils.rst b/docs/modules/pyutils.rst
@@ -8,7 +8,6 @@ PyUtils
 .. autofunction:: camel_to_snake
 .. autofunction:: snake_to_camel
 .. autofunction:: cached_property
-.. autofunction:: dedent
 .. autofunction:: did_you_mean
 .. autofunction:: register_description
 .. autofunction:: unregister_description
diff --git a/src/graphql/pyutils/__init__.py b/src/graphql/pyutils/__init__.py
@@ -10,7 +10,6 @@
 
 from .convert_case import camel_to_snake, snake_to_camel
 from .cached_property import cached_property
-from .dedent import dedent
 from .description import (
     Description,
     is_description,
@@ -38,7 +37,6 @@
     "camel_to_snake",
     "snake_to_camel",
     "cached_property",
-    "dedent",
     "did_you_mean",
     "Description",
     "is_description",
diff --git a/tests/benchmarks/test_build_ast_schema.py b/tests/benchmarks/test_build_ast_schema.py
@@ -1,6 +1,5 @@
 from graphql import parse, build_ast_schema, GraphQLSchema
 
-# noinspection PyUnresolvedReferences
 from ..fixtures import big_schema_sdl  # noqa: F401
 
 
diff --git a/tests/benchmarks/test_build_client_schema.py b/tests/benchmarks/test_build_client_schema.py
@@ -1,6 +1,5 @@
 from graphql import build_client_schema, GraphQLSchema
 
-# noinspection PyUnresolvedReferences
 from ..fixtures import big_schema_introspection_result  # noqa: F401
 
 
diff --git a/tests/benchmarks/test_introspection_from_schema.py b/tests/benchmarks/test_introspection_from_schema.py
@@ -1,7 +1,6 @@
 from graphql import build_schema, parse, execute
 from graphql.utilities import get_introspection_query
 
-# noinspection PyUnresolvedReferences
 from ..fixtures import big_schema_sdl  # noqa: F401
 
 
diff --git a/tests/benchmarks/test_parser.py b/tests/benchmarks/test_parser.py
@@ -1,6 +1,5 @@
 from graphql import parse, DocumentNode
 
-# noinspection PyUnresolvedReferences
 from ..fixtures import kitchen_sink_query  # noqa: F401
 
 
diff --git a/tests/benchmarks/test_validate_gql.py b/tests/benchmarks/test_validate_gql.py
@@ -1,7 +1,6 @@
 from graphql import build_schema, parse, validate
 from graphql.utilities import get_introspection_query
 
-# noinspection PyUnresolvedReferences
 from ..fixtures import big_schema_sdl  # noqa: F401
 
 
diff --git a/tests/benchmarks/test_validate_invalid_gql.py b/tests/benchmarks/test_validate_invalid_gql.py
@@ -1,6 +1,5 @@
 from graphql import build_schema, parse, validate
 
-# noinspection PyUnresolvedReferences
 from ..fixtures import big_schema_sdl  # noqa: F401
 
 
diff --git a/tests/benchmarks/test_validate_sdl.py b/tests/benchmarks/test_validate_sdl.py
@@ -1,7 +1,6 @@
 from graphql import parse
 from graphql.validation.validate import validate_sdl
 
-# noinspection PyUnresolvedReferences
 from ..fixtures import big_schema_sdl  # noqa: F401
 
 
diff --git a/tests/error/test_graphql_error.py b/tests/error/test_graphql_error.py
@@ -7,7 +7,8 @@
     ObjectTypeDefinitionNode,
     Source,
 )
-from graphql.pyutils import dedent
+
+from ..utils import dedent
 
 
 source = Source(
diff --git a/tests/error/test_print_location.py b/tests/error/test_print_location.py
@@ -1,5 +1,6 @@
 from graphql.language import print_source_location, Source, SourceLocation
-from graphql.pyutils import dedent
+
+from ..utils import dedent
 
 
 def describe_print_location():
diff --git a/tests/language/test_lexer.py b/tests/language/test_lexer.py
@@ -5,7 +5,9 @@
 from graphql.error import GraphQLSyntaxError
 from graphql.language import Lexer, Source, SourceLocation, Token, TokenKind
 from graphql.language.lexer import is_punctuator_token_kind
-from graphql.pyutils import dedent, inspect
+from graphql.pyutils import inspect
+
+from ..utils import dedent
 
 
 def lex_one(s: str) -> Token:
diff --git a/tests/language/test_parser.py b/tests/language/test_parser.py
@@ -2,7 +2,6 @@
 
 from pytest import raises  # type: ignore
 
-from graphql.pyutils import dedent, inspect
 from graphql.error import GraphQLSyntaxError
 from graphql.language import (
     ArgumentNode,
@@ -28,9 +27,10 @@
     parse_value,
     Source,
 )
+from graphql.pyutils import inspect
 
-# noinspection PyUnresolvedReferences
 from ..fixtures import kitchen_sink_query  # noqa: F401
+from ..utils import dedent
 
 
 def assert_syntax_error(text, message, location):
diff --git a/tests/language/test_printer.py b/tests/language/test_printer.py
@@ -2,11 +2,10 @@
 
 from pytest import raises  # type: ignore
 
-from graphql.pyutils import dedent
 from graphql.language import FieldNode, NameNode, parse, print_ast
 
-# noinspection PyUnresolvedReferences
 from ..fixtures import kitchen_sink_query  # noqa: F401
+from ..utils import dedent
 
 
 def describe_printer_query_document():
diff --git a/tests/language/test_schema_parser.py b/tests/language/test_schema_parser.py
@@ -31,7 +31,6 @@
     parse,
 )
 
-# noinspection PyUnresolvedReferences
 from ..fixtures import kitchen_sink_sdl  # noqa: F401
 
 
diff --git a/tests/language/test_schema_printer.py b/tests/language/test_schema_printer.py
@@ -3,10 +3,9 @@
 from pytest import raises  # type: ignore
 
 from graphql.language import ScalarTypeDefinitionNode, NameNode, print_ast, parse
-from graphql.pyutils import dedent
 
-# noinspection PyUnresolvedReferences
 from ..fixtures import kitchen_sink_sdl  # noqa: F401
+from ..utils import dedent
 
 
 def describe_printer_sdl_document():
diff --git a/tests/language/test_source.py b/tests/language/test_source.py
@@ -3,7 +3,8 @@
 from pytest import raises  # type: ignore
 
 from graphql.language import Source, SourceLocation
-from graphql.pyutils import dedent
+
+from ..utils import dedent
 
 
 def describe_source():
diff --git a/tests/language/test_visitor.py b/tests/language/test_visitor.py
@@ -21,7 +21,6 @@
 from graphql.language.visitor import QUERY_DOCUMENT_KEYS
 from graphql.pyutils import FrozenList
 
-# noinspection PyUnresolvedReferences
 from ..fixtures import kitchen_sink_query  # noqa: F401
 
 
diff --git a/tests/test_docs.py b/tests/test_docs.py
@@ -3,7 +3,7 @@
 from pathlib import Path
 from typing import Any, Dict, List
 
-from graphql.pyutils import dedent
+from .utils import dedent
 
 Scope = Dict[str, Any]
 
diff --git a/tests/type/test_schema.py b/tests/type/test_schema.py
@@ -7,7 +7,7 @@
     TypeDefinitionNode,
     TypeExtensionNode,
 )
-from graphql.pyutils import dedent, FrozenList
+from graphql.pyutils import FrozenList
 from graphql.type import (
     GraphQLArgument,
     GraphQLBoolean,
@@ -28,6 +28,8 @@
 )
 from graphql.utilities import print_schema
 
+from ..utils import dedent
+
 
 def describe_type_system_schema():
     def define_sample_schema():
diff --git a/tests/type/test_validation.py b/tests/type/test_validation.py
@@ -4,7 +4,7 @@
 from pytest import mark, raises  # type: ignore
 
 from graphql.language import parse, DirectiveLocation
-from graphql.pyutils import dedent, inspect
+from graphql.pyutils import inspect
 from graphql.type import (
     assert_directive,
     assert_enum_type,
@@ -38,6 +38,7 @@
 )
 from graphql.utilities import build_schema, extend_schema
 
+from ..utils import dedent
 
 SomeSchema = build_schema(
     """
diff --git a/tests/utilities/test_build_ast_schema.py b/tests/utilities/test_build_ast_schema.py
@@ -29,9 +29,10 @@
     assert_union_type,
     validate_schema,
 )
-from graphql.pyutils import dedent
 from graphql.utilities import build_ast_schema, build_schema, print_schema, print_type
 
+from ..utils import dedent
+
 
 def cycle_sdl(sdl: str) -> str:
     """Full cycle test.
diff --git a/tests/utilities/test_build_client_schema.py b/tests/utilities/test_build_client_schema.py
@@ -1,7 +1,6 @@
 from pytest import raises  # type: ignore
 
 from graphql import graphql_sync
-from graphql.pyutils import dedent
 from graphql.type import (
     GraphQLArgument,
     GraphQLBoolean,
@@ -23,6 +22,8 @@
     print_schema,
 )
 
+from ..utils import dedent
+
 
 def cycle_introspection(sdl_string):
     """Test that the client side introspection gives the same result.
diff --git a/tests/utilities/test_concat_ast.py b/tests/utilities/test_concat_ast.py
@@ -1,7 +1,8 @@
 from graphql.language import parse, print_ast, Source
-from graphql.pyutils import dedent
 from graphql.utilities import concat_ast
 
+from ..utils import dedent
+
 
 def describe_concat_ast():
     def concatenates_two_asts_together():
diff --git a/tests/utilities/test_extend_schema.py b/tests/utilities/test_extend_schema.py
@@ -10,7 +10,7 @@
     StringValueNode,
     TypeDefinitionNode,
 )
-from graphql.pyutils import dedent, FrozenList
+from graphql.pyutils import FrozenList
 from graphql.type import (
     GraphQLArgument,
     GraphQLBoolean,
@@ -40,6 +40,8 @@
     print_schema,
 )
 
+from ..utils import dedent
+
 TypeWithAstNode = Union[
     GraphQLArgument,
     GraphQLEnumValue,
diff --git a/tests/utilities/test_introspection_from_schema.py b/tests/utilities/test_introspection_from_schema.py
@@ -1,11 +1,12 @@
-from graphql.pyutils import dedent
 from graphql.type import GraphQLSchema, GraphQLObjectType, GraphQLField, GraphQLString
 from graphql.utilities import (
     build_client_schema,
     print_schema,
     introspection_from_schema,
 )
 
+from ..utils import dedent
+
 
 def introspection_to_sdl(introspection):
     return print_schema(build_client_schema(introspection))
diff --git a/tests/utilities/test_lexicographic_sort_schema.py b/tests/utilities/test_lexicographic_sort_schema.py
@@ -1,6 +1,7 @@
-from graphql.pyutils import dedent
 from graphql.utilities import build_schema, print_schema, lexicographic_sort_schema
 
+from ..utils import dedent
+
 
 def sort_sdl(sdl):
     schema = build_schema(sdl)
diff --git a/tests/utilities/test_print_schema.py b/tests/utilities/test_print_schema.py
@@ -1,7 +1,6 @@
 from typing import cast, Any, Dict
 
 from graphql.language import DirectiveLocation
-from graphql.pyutils import dedent
 from graphql.type import (
     GraphQLArgument,
     GraphQLBoolean,
@@ -28,6 +27,8 @@
     print_value,
 )
 
+from ..utils import dedent
+
 
 def expect_printed_schema(schema: GraphQLSchema) -> str:
     schema_text = print_schema(schema)
diff --git a/tests/utilities/test_separate_operations.py b/tests/utilities/test_separate_operations.py
@@ -1,7 +1,8 @@
 from graphql.language import parse, print_ast
-from graphql.pyutils import dedent
 from graphql.utilities import separate_operations
 
+from ..utils import dedent
+
 
 def describe_separate_operations():
     def separates_one_ast_into_multiple_maintaining_document_order():
diff --git a/tests/utilities/test_strip_ignored_characters.py b/tests/utilities/test_strip_ignored_characters.py
@@ -5,12 +5,10 @@
 
 from graphql.error import GraphQLSyntaxError
 from graphql.language import Lexer, Source, TokenKind, parse
-from graphql.pyutils import dedent
 from graphql.utilities import strip_ignored_characters
 
-# noinspection PyUnresolvedReferences
 from ..fixtures import kitchen_sink_query, kitchen_sink_sdl  # noqa: F401
-
+from ..utils import dedent
 
 ignored_tokens = [
     # UnicodeBOM
diff --git a/tests/utilities/test_type_info.py b/tests/utilities/test_type_info.py
@@ -15,7 +15,6 @@
 
 from ..validation.harness import test_schema
 
-# noinspection PyUnresolvedReferences
 from ..fixtures import kitchen_sink_query  # noqa: F401
 
 
diff --git a/tests/utils/__init__.py b/tests/utils/__init__.py
@@ -0,0 +1,5 @@
+"""Test utilities"""
+
+from .dedent import dedent
+
+__all__ = ["dedent"]
diff --git a/tests/utils/dedent.py b/tests/utils/dedent.py
diff --git a/tests/utils/test_dedent.py b/tests/utils/test_dedent.py
@@ -1,4 +1,4 @@
-from graphql.pyutils import dedent
+from ..utils import dedent
 
 
 def describe_dedent():

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`from graphql import parse, build_ast_schema, GraphQLSchema`
`2`	`2`
`3`		`-# noinspection PyUnresolvedReferences`
`4`	`3`	`from ..fixtures import big_schema_sdl # noqa: F401`
`5`	`4`
`6`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`from graphql import build_client_schema, GraphQLSchema`
`2`	`2`
`3`		`-# noinspection PyUnresolvedReferences`
`4`	`3`	`from ..fixtures import big_schema_introspection_result # noqa: F401`
`5`	`4`
`6`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`from graphql import parse, DocumentNode`
`2`	`2`
`3`		`-# noinspection PyUnresolvedReferences`
`4`	`3`	`from ..fixtures import kitchen_sink_query # noqa: F401`
`5`	`4`
`6`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`from graphql import build_schema, parse, validate`
`2`	`2`
`3`		`-# noinspection PyUnresolvedReferences`
`4`	`3`	`from ..fixtures import big_schema_sdl # noqa: F401`
`5`	`4`
`6`	`5`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,8 @@`
`7`	`7`	`ObjectTypeDefinitionNode,`
`8`	`8`	`Source,`
`9`	`9`	`)`
`10`		`-from graphql.pyutils import dedent`
	`10`	`+`
	`11`	`+from ..utils import dedent`
`11`	`12`
`12`	`13`
`13`	`14`	`source = Source(`