Skip to content

Commit d6e9529

Browse files
committed
Move ALLOW_FIXTURES from mypy.test.config to mypy.defaults to please python 3.5
1 parent ec849de commit d6e9529

File tree

5 files changed

+5
-6
lines changed

5 files changed

+5
-6
lines changed

mypy/build.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
from mypy.stats import dump_type_stats
4343
from mypy.types import Type
4444
from mypy.version import __version__
45-
from mypy.test.config import ALLOW_FIXTURES
45+
from mypy.defaults import ALLOW_FIXTURES
4646

4747

4848
# We need to know the location of this file to load data, but

mypy/defaults.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22
PYTHON3_VERSION = (3, 6)
33
CACHE_DIR = '.mypy_cache'
44
CONFIG_FILE = 'mypy.ini'
5+
# Set this to False (here in the file, not dynamically!) to disable builtins fixtures in tests
6+
ALLOW_FIXTURES = True

mypy/test/config.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,3 @@
1717
# This is *within* the tempfile.TemporaryDirectory that is chroot'ed per testcase.
1818
# It is also hard-coded in numerous places, so don't change it.
1919
test_temp_dir = 'tmp'
20-
21-
# Set this to False (here in the file, not dynamically!) to disable builtins fixtures in tests
22-
ALLOW_FIXTURES = True

mypy/test/data.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
from mypy.myunit import TestCase, SkipTestCaseException
1414

15-
from mypy.test.config import ALLOW_FIXTURES
15+
from mypy.defaults import ALLOW_FIXTURES
1616

1717

1818
def parse_test_cases(

typeshed

Submodule typeshed updated 72 files

0 commit comments

Comments
 (0)