Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove usage of six

Browse Source 
Remove six-library Replace the following items with Python 3 style code.
- six.string_types
- six.moves
- six.iteritems

Change-Id: I30358b3b08cc076ac59bd325d0e11a3e2deabde3
This commit is contained in:
root
2020-10-12 05:39:56 +00:00
parent f488636fb8
commit 09f6e3bde5
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
watcher/hacking/checks.py
View File

@@ -128,22 +128,20 @@ def check_assert_called_once_with(logical_line, filename):
@flake8ext @flake8ext
def check_python3_xrange(logical_line): def check_python3_xrange(logical_line):
if re.search(r"\bxrange\s*\(", logical_line): if re.search(r"\bxrange\s*\(", logical_line):
yield(0, "N325: Do not use xrange. Use range, or six.moves.range for " yield(0, "N325: Do not use xrange. Use range for large loops.")
"large loops.")
@flake8ext @flake8ext
def check_no_basestring(logical_line): def check_no_basestring(logical_line):
if re.search(r"\bbasestring\b", logical_line): if re.search(r"\bbasestring\b", logical_line):
msg = ("N326: basestring is not Python3-compatible, use " msg = ("N326: basestring is not Python3-compatible, use str instead.")
"six.string_types instead.")
yield(0, msg) yield(0, msg)
@flake8ext @flake8ext
def check_python3_no_iteritems(logical_line): def check_python3_no_iteritems(logical_line):
if re.search(r".*\.iteritems\(\)", logical_line): if re.search(r".*\.iteritems\(\)", logical_line):
msg = ("N327: Use six.iteritems() instead of dict.iteritems().") msg = ("N327: Use dict.items() instead of dict.iteritems().")
yield(0, msg) yield(0, msg)