Skip to content

Commit 8b063b9

Browse files
authored
Remove future imports now that we've dropped support for Python 2 (#539)
* Remove future imports now that we've dropped support for Python 2 * Keep future imports for use in MemberVisible * Drop support for Python 3.5 * Remove indications of support for Python <3.7 and bump version number.
1 parent a59f6ba commit 8b063b9

37 files changed

+3
-143
lines changed

.github/scripts/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# Exit when any command fails.
1818
set -e
1919

20-
PYTHON_VERSION=${PYTHON_VERSION:-2.7}
20+
PYTHON_VERSION=${PYTHON_VERSION:-3.7}
2121

2222
pip install -U -r .github/scripts/requirements.txt
2323
python setup.py develop

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-20.04
88
strategy:
99
matrix:
10-
python-version: ["3.5", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
10+
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
1111

1212
steps:
1313
# Checkout the repo.

fire/__init__.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414

1515
"""The Python Fire module."""
1616

17-
from __future__ import absolute_import
18-
from __future__ import division
19-
from __future__ import print_function
20-
2117
from fire.core import Fire
2218

2319
__all__ = ['Fire']

fire/__main__.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
This allows using Fire with third-party libraries without modifying their code.
1919
"""
2020

21-
from __future__ import absolute_import
22-
from __future__ import division
23-
from __future__ import print_function
24-
2521
import importlib
2622
import os
2723
import sys

fire/completion_test.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414

1515
"""Tests for the completion module."""
1616

17-
from __future__ import absolute_import
18-
from __future__ import division
19-
from __future__ import print_function
20-
2117
from fire import completion
2218
from fire import test_components as tc
2319
from fire import testutils

fire/console/console_io.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515

1616
"""General console printing utilities used by the Cloud SDK."""
1717

18-
from __future__ import absolute_import
19-
from __future__ import division
20-
from __future__ import print_function
21-
2218
import os
2319
import signal
2420
import subprocess

fire/core.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@ def main(argv):
4949
--trace: Get the Fire Trace for the command.
5050
"""
5151

52-
from __future__ import absolute_import
53-
from __future__ import division
54-
from __future__ import print_function
55-
5652
import inspect
5753
import json
5854
import os

fire/core_test.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414

1515
"""Tests for the core module."""
1616

17-
from __future__ import absolute_import
18-
from __future__ import division
19-
from __future__ import print_function
20-
2117
from fire import core
2218
from fire import test_components as tc
2319
from fire import testutils

fire/custom_descriptions.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@
3636
descriptions for primitive typed values.
3737
"""
3838

39-
from __future__ import absolute_import
40-
from __future__ import division
41-
from __future__ import print_function
42-
4339
from fire import formatting
4440
import six
4541

fire/custom_descriptions_test.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414

1515
"""Tests for custom description module."""
1616

17-
from __future__ import absolute_import
18-
from __future__ import division
19-
from __future__ import print_function
20-
2117
from fire import custom_descriptions
2218
from fire import testutils
2319

fire/decorators.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
command line arguments to client code.
1919
"""
2020

21-
from __future__ import absolute_import
22-
from __future__ import division
23-
from __future__ import print_function
24-
2521
import inspect
2622

2723
FIRE_METADATA = 'FIRE_METADATA'

fire/decorators_test.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414

1515
"""Tests for the decorators module."""
1616

17-
from __future__ import absolute_import
18-
from __future__ import division
19-
from __future__ import print_function
20-
2117
from fire import core
2218
from fire import decorators
2319
from fire import testutils

fire/docstrings.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@
4949
- "True | False" indicates bool type.
5050
"""
5151

52-
from __future__ import absolute_import
53-
from __future__ import division
54-
from __future__ import print_function
55-
5652
import collections
5753
import enum
5854
import re

fire/docstrings_fuzz_test.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414

1515
"""Fuzz tests for the docstring parser module."""
1616

17-
from __future__ import absolute_import
18-
from __future__ import division
19-
from __future__ import print_function
20-
2117
from fire import docstrings
2218
from fire import testutils
2319

fire/docstrings_test.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414

1515
"""Tests for fire docstrings module."""
1616

17-
from __future__ import absolute_import
18-
from __future__ import division
19-
from __future__ import print_function
20-
2117
from fire import docstrings
2218
from fire import testutils
2319

fire/fire_test.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414

1515
"""Tests for the fire module."""
1616

17-
from __future__ import absolute_import
18-
from __future__ import division
19-
from __future__ import print_function
20-
2117
import os
2218
import sys
2319

fire/formatting.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414

1515
"""Formatting utilities for use in creating help text."""
1616

17-
from __future__ import absolute_import
18-
from __future__ import division
19-
from __future__ import print_function
20-
2117
from fire import formatting_windows # pylint: disable=unused-import
2218
import termcolor
2319

fire/formatting_test.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414

1515
"""Tests for formatting.py."""
1616

17-
from __future__ import absolute_import
18-
from __future__ import division
19-
from __future__ import print_function
20-
2117
from fire import formatting
2218
from fire import testutils
2319

fire/formatting_windows.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414

1515
"""This module is used for enabling formatting on Windows."""
1616

17-
from __future__ import absolute_import
18-
from __future__ import division
19-
from __future__ import print_function
20-
2117
import ctypes
2218
import os
2319
import platform

fire/helptext.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@
2929
information.
3030
"""
3131

32-
from __future__ import absolute_import
33-
from __future__ import division
34-
from __future__ import print_function
35-
3632
import collections
3733
import itertools
3834
import sys

fire/helptext_test.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414

1515
"""Tests for the helptext module."""
1616

17-
from __future__ import absolute_import
18-
from __future__ import division
19-
from __future__ import print_function
20-
2117
import os
2218
import sys
2319
import textwrap

fire/inspectutils.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414

1515
"""Inspection utility functions for Python Fire."""
1616

17-
from __future__ import absolute_import
18-
from __future__ import division
19-
from __future__ import print_function
20-
2117
import inspect
2218
import sys
2319
import types

fire/inspectutils_test.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414

1515
"""Tests for the inspectutils module."""
1616

17-
from __future__ import absolute_import
18-
from __future__ import division
19-
from __future__ import print_function
20-
2117
import os
2218
import unittest
2319

fire/interact.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@
2020
InteractiveConsole class.
2121
"""
2222

23-
from __future__ import absolute_import
24-
from __future__ import division
25-
from __future__ import print_function
26-
2723
import inspect
2824

2925

fire/interact_test.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414

1515
"""Tests for the interact module."""
1616

17-
from __future__ import absolute_import
18-
from __future__ import division
19-
from __future__ import print_function
20-
2117
from fire import interact
2218
from fire import testutils
2319

fire/parser.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414

1515
"""Provides parsing functionality used by Python Fire."""
1616

17-
from __future__ import absolute_import
18-
from __future__ import division
19-
from __future__ import print_function
20-
2117
import argparse
2218
import ast
2319
import sys

fire/parser_fuzz_test.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414

1515
"""Fuzz tests for the parser module."""
1616

17-
from __future__ import absolute_import
18-
from __future__ import division
19-
from __future__ import print_function
20-
2117
from fire import parser
2218
from fire import testutils
2319
from hypothesis import example

fire/parser_test.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414

1515
"""Tests for the parser module."""
1616

17-
from __future__ import absolute_import
18-
from __future__ import division
19-
from __future__ import print_function
20-
2117
from fire import parser
2218
from fire import testutils
2319

fire/test_components.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414

1515
"""This module has components that are used for testing Python Fire."""
1616

17-
from __future__ import absolute_import
18-
from __future__ import division
19-
from __future__ import print_function
20-
2117
import collections
2218
import enum
2319
import functools

fire/test_components_bin.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717
This file is useful for replicating test results manually.
1818
"""
1919

20-
from __future__ import absolute_import
21-
from __future__ import division
22-
from __future__ import print_function
23-
2420
import fire
2521
from fire import test_components
2622

fire/test_components_test.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414

1515
"""Tests for the test_components module."""
1616

17-
from __future__ import absolute_import
18-
from __future__ import division
19-
from __future__ import print_function
20-
2117
from fire import test_components as tc
2218
from fire import testutils
2319

fire/testutils.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414

1515
"""Utilities for Python Fire's tests."""
1616

17-
from __future__ import absolute_import
18-
from __future__ import division
19-
from __future__ import print_function
20-
2117
import contextlib
2218
import os
2319
import re

fire/testutils_test.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414

1515
"""Test the test utilities for Fire's tests."""
1616

17-
from __future__ import absolute_import
18-
from __future__ import division
19-
from __future__ import print_function
20-
2117
import sys
2218

2319
from fire import testutils

fire/trace.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@
2525
component will be None.
2626
"""
2727

28-
from __future__ import absolute_import
29-
from __future__ import division
30-
from __future__ import print_function
31-
3228
import shlex
3329

3430
from fire import inspectutils

fire/trace_test.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414

1515
"""Tests for the trace module."""
1616

17-
from __future__ import absolute_import
18-
from __future__ import division
19-
from __future__ import print_function
20-
2117
from fire import testutils
2218
from fire import trace
2319

fire/value_types.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414

1515
"""Types of values."""
1616

17-
from __future__ import absolute_import
18-
from __future__ import division
19-
from __future__ import print_function
20-
2117
import inspect
2218

2319
from fire import inspectutils

0 commit comments

Comments
 (0)