diff options
author | Mike Frysinger <vapier@google.com> | 2020-07-15 00:56:41 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@google.com> | 2020-12-01 03:58:34 -0500 |
commit | 6c6f9ee9833457c2a3279f77f74ba5dadc0c0c80 (patch) | |
tree | 569f036f4eebb0f406a74c8340871123843a1e04 | |
parent | fc3ee954f27b6048eded4d2e6f8c8a30c7fb9309 (diff) | |
download | repohooks-6c6f9ee9833457c2a3279f77f74ba5dadc0c0c80.tar.gz |
drop file coding & print_function import
These are only used by Python 2 which we don't support.
Bug: None
Test: unittests pass
Change-Id: If5f26ca655ce58a9968eaa624424cf5186cf9625
-rwxr-xr-x | pre-upload.py | 3 | ||||
-rw-r--r-- | rh/__init__.py | 3 | ||||
-rw-r--r-- | rh/config.py | 3 | ||||
-rwxr-xr-x | rh/config_test.py | 3 | ||||
-rwxr-xr-x | rh/config_unittest.py | 3 | ||||
-rw-r--r-- | rh/git.py | 3 | ||||
-rw-r--r-- | rh/hooks.py | 3 | ||||
-rwxr-xr-x | rh/hooks_unittest.py | 3 | ||||
-rw-r--r-- | rh/results.py | 3 | ||||
-rw-r--r-- | rh/shell.py | 3 | ||||
-rwxr-xr-x | rh/shell_unittest.py | 3 | ||||
-rw-r--r-- | rh/signals.py | 3 | ||||
-rw-r--r-- | rh/terminal.py | 3 | ||||
-rw-r--r-- | rh/utils.py | 3 | ||||
-rwxr-xr-x | rh/utils_unittest.py | 3 | ||||
-rwxr-xr-x | tools/android_test_mapping_format.py | 3 | ||||
-rwxr-xr-x | tools/android_test_mapping_format_unittest.py | 1 | ||||
-rwxr-xr-x | tools/clang-format.py | 3 | ||||
-rwxr-xr-x | tools/google-java-format.py | 3 | ||||
-rwxr-xr-x | tools/pylint.py | 3 |
20 files changed, 0 insertions, 58 deletions
diff --git a/pre-upload.py b/pre-upload.py index eaf611e..d9b1b1e 100755 --- a/pre-upload.py +++ b/pre-upload.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -# -*- coding:utf-8 -*- # Copyright 2016 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -20,8 +19,6 @@ Normally this is loaded indirectly by repo itself, but it can be run directly when developing. """ -from __future__ import print_function - import argparse import datetime import os diff --git a/rh/__init__.py b/rh/__init__.py index c36cb89..9050fb6 100644 --- a/rh/__init__.py +++ b/rh/__init__.py @@ -1,4 +1,3 @@ -# -*- coding:utf-8 -*- # Copyright 2016 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,8 +14,6 @@ """Common repohook objects/constants.""" -from __future__ import print_function - import collections diff --git a/rh/config.py b/rh/config.py index b75e03b..ed75007 100644 --- a/rh/config.py +++ b/rh/config.py @@ -1,4 +1,3 @@ -# -*- coding:utf-8 -*- # Copyright 2016 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,8 +14,6 @@ """Manage various config files.""" -from __future__ import print_function - import configparser import functools import itertools diff --git a/rh/config_test.py b/rh/config_test.py index 794e50f..80fc832 100755 --- a/rh/config_test.py +++ b/rh/config_test.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -# -*- coding:utf-8 -*- # Copyright 2019 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +15,6 @@ """Integration tests for the config module (via PREUPLOAD.cfg).""" -from __future__ import print_function - import argparse import os import re diff --git a/rh/config_unittest.py b/rh/config_unittest.py index 4b27c5a..3e3e470 100755 --- a/rh/config_unittest.py +++ b/rh/config_unittest.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -# -*- coding:utf-8 -*- # Copyright 2016 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +15,6 @@ """Unittests for the config module.""" -from __future__ import print_function - import os import shutil import sys @@ -1,4 +1,3 @@ -# -*- coding:utf-8 -*- # Copyright 2016 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,8 +14,6 @@ """Git helper functions.""" -from __future__ import print_function - import os import re import sys diff --git a/rh/hooks.py b/rh/hooks.py index 66aa030..8cea251 100644 --- a/rh/hooks.py +++ b/rh/hooks.py @@ -1,4 +1,3 @@ -# -*- coding:utf-8 -*- # Copyright 2016 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,8 +14,6 @@ """Functions that implement the actual checks.""" -from __future__ import print_function - import collections import fnmatch import json diff --git a/rh/hooks_unittest.py b/rh/hooks_unittest.py index 87d2820..716e1da 100755 --- a/rh/hooks_unittest.py +++ b/rh/hooks_unittest.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -# -*- coding:utf-8 -*- # Copyright 2016 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +15,6 @@ """Unittests for the hooks module.""" -from __future__ import print_function - import os import sys import unittest diff --git a/rh/results.py b/rh/results.py index bdac83c..bdf7626 100644 --- a/rh/results.py +++ b/rh/results.py @@ -1,4 +1,3 @@ -# -*- coding:utf-8 -*- # Copyright 2016 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,8 +14,6 @@ """Common errors thrown when repo preupload checks fail.""" -from __future__ import print_function - import os import sys diff --git a/rh/shell.py b/rh/shell.py index 4c6c45c..dda3be3 100644 --- a/rh/shell.py +++ b/rh/shell.py @@ -1,4 +1,3 @@ -# -*- coding:utf-8 -*- # Copyright 2016 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,8 +14,6 @@ """Functions for working with shell code.""" -from __future__ import print_function - import os import sys diff --git a/rh/shell_unittest.py b/rh/shell_unittest.py index 47182a5..21478cf 100755 --- a/rh/shell_unittest.py +++ b/rh/shell_unittest.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -# -*- coding:utf-8 -*- # Copyright 2016 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +15,6 @@ """Unittests for the shell module.""" -from __future__ import print_function - import difflib import os import sys diff --git a/rh/signals.py b/rh/signals.py index 45d4e8a..c8a8d81 100644 --- a/rh/signals.py +++ b/rh/signals.py @@ -1,4 +1,3 @@ -# -*- coding:utf-8 -*- # Copyright 2016 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,8 +14,6 @@ """Signal related functionality.""" -from __future__ import print_function - import os import signal import sys diff --git a/rh/terminal.py b/rh/terminal.py index c549f12..39c96ac 100644 --- a/rh/terminal.py +++ b/rh/terminal.py @@ -1,4 +1,3 @@ -# -*- coding:utf-8 -*- # Copyright 2016 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,8 +17,6 @@ This module handles terminal interaction including ANSI color codes. """ -from __future__ import print_function - import os import sys diff --git a/rh/utils.py b/rh/utils.py index 5c3e753..1b36c7a 100644 --- a/rh/utils.py +++ b/rh/utils.py @@ -1,4 +1,3 @@ -# -*- coding:utf-8 -*- # Copyright 2016 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,8 +14,6 @@ """Various utility functions.""" -from __future__ import print_function - import errno import functools import os diff --git a/rh/utils_unittest.py b/rh/utils_unittest.py index bddb0e7..f3098a9 100755 --- a/rh/utils_unittest.py +++ b/rh/utils_unittest.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -# -*- coding:utf-8 -*- # Copyright 2019 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +15,6 @@ """Unittests for the utils module.""" -from __future__ import print_function - import datetime import os import sys diff --git a/tools/android_test_mapping_format.py b/tools/android_test_mapping_format.py index 47e09c5..b87b886 100755 --- a/tools/android_test_mapping_format.py +++ b/tools/android_test_mapping_format.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -# -*- coding:utf-8 -*- # Copyright 2018 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -23,8 +22,6 @@ The goal of this script is to validate the format of TEST_MAPPING files: import TEST_MAPPING files. """ -from __future__ import print_function - import argparse import json import os diff --git a/tools/android_test_mapping_format_unittest.py b/tools/android_test_mapping_format_unittest.py index 9191a25..9bef300 100755 --- a/tools/android_test_mapping_format_unittest.py +++ b/tools/android_test_mapping_format_unittest.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -# -*- coding:utf-8 -*- # Copyright 2018 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tools/clang-format.py b/tools/clang-format.py index 958f543..2533b15 100755 --- a/tools/clang-format.py +++ b/tools/clang-format.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -# -*- coding:utf-8 -*- # Copyright 2016 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +15,6 @@ """Wrapper to run git-clang-format and parse its output.""" -from __future__ import print_function - import argparse import os import sys diff --git a/tools/google-java-format.py b/tools/google-java-format.py index 5a537c0..6659511 100755 --- a/tools/google-java-format.py +++ b/tools/google-java-format.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -# -*- coding:utf-8 -*- # Copyright 2016 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +15,6 @@ """Wrapper to run google-java-format to check for any malformatted changes.""" -from __future__ import print_function - import argparse import os import sys diff --git a/tools/pylint.py b/tools/pylint.py index 8af1adc..60f4b67 100755 --- a/tools/pylint.py +++ b/tools/pylint.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -# -*- coding:utf-8 -*- # Copyright 2016 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,8 +15,6 @@ """Wrapper to run pylint with the right settings.""" -from __future__ import print_function - import argparse import errno import os |