Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Define xrange() for Python 3 #332

Merged
merged 3 commits into from
Mar 12, 2018
Merged

Define xrange() for Python 3 #332

merged 3 commits into from
Mar 12, 2018

Conversation

cclauss
Copy link
Contributor

@cclauss cclauss commented Mar 12, 2018

flake8 testing of https://github.com/google/styleguide on Python 3.6.3

$ flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics

./cpplint/cpplint.py:1526:12: F821 undefined name 'xrange'
  for i in xrange(startpos, len(line)):
           ^
./cpplint/cpplint.py:1755:15: F821 undefined name 'xrange'
  for line in xrange(1, min(len(lines), 11)):
              ^
./cpplint/cpplint.py:1957:12: F821 undefined name 'xrange'
  for i in xrange(1, len(raw_lines) - 1):
           ^
./cpplint/cpplint.py:2298:14: F821 undefined name 'xrange'
    for i in xrange(linenum - 1, self.starting_linenum, -1):
             ^
./cpplint/cpplint.py:3080:26: F821 undefined name 'xrange'
    for start_linenum in xrange(linenum, clean_lines.NumLines()):
                         ^
./cpplint/cpplint.py:3537:14: F821 undefined name 'xrange'
    for i in xrange(first_line, last_line + 1, 1):
             ^
./cpplint/cpplint.py:3601:19: F821 undefined name 'xrange'
    for offset in xrange(endlinenum + 1,
                  ^
./cpplint/cpplint.py:4155:14: F821 undefined name 'xrange'
    for i in xrange(linenum + 1, end_line):
             ^
./cpplint/cpplint.py:4928:12: F821 undefined name 'xrange'
  for i in xrange(linenum, max(-1, linenum - 10), -1):
           ^
./cpplint/cpplint.py:4949:12: F821 undefined name 'xrange'
  for i in xrange(linenum, max(-1, linenum - 10), -1):
           ^
./cpplint/cpplint.py:4965:12: F821 undefined name 'xrange'
  for i in xrange(linenum, 1, -1):
           ^
./cpplint/cpplint.py:5066:20: F821 undefined name 'xrange'
          for i in xrange(startline, linenum + 1):
                   ^
./cpplint/cpplint.py:5090:14: F821 undefined name 'xrange'
    for i in xrange(linenum - 1, max(0, linenum - 10), -1):
             ^
./cpplint/cpplint.py:5121:14: F821 undefined name 'xrange'
    for i in xrange(2):
             ^
./cpplint/cpplint.py:5284:14: F821 undefined name 'xrange'
    for i in xrange(linenum - 1, max(0, linenum - 5), -1):
             ^
./cpplint/cpplint.py:5503:18: F821 undefined name 'xrange'
  for linenum in xrange(clean_lines.NumLines()):
                 ^
./cpplint/cpplint.py:5639:21: F821 undefined name 'xrange'
  for start_line in xrange(linenum, min(linenum + 3, clean_lines.NumLines())):
                    ^
./cpplint/cpplint.py:5654:12: F821 undefined name 'xrange'
  for i in xrange(end_line, min(end_line + 3, clean_lines.NumLines())):
           ^
./cpplint/cpplint.py:5911:15: F821 undefined name 'xrange'
  for line in xrange(clean_lines.NumLines()):
              ^

cclauss added 2 commits March 12, 2018 18:13
flake8 testing of https://github.com/google/styleguide on Python 3.6.3

$ __flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics__
```
./cpplint/cpplint.py:1526:12: F821 undefined name 'xrange'
  for i in xrange(startpos, len(line)):
           ^
./cpplint/cpplint.py:1755:15: F821 undefined name 'xrange'
  for line in xrange(1, min(len(lines), 11)):
              ^
./cpplint/cpplint.py:1957:12: F821 undefined name 'xrange'
  for i in xrange(1, len(raw_lines) - 1):
           ^
./cpplint/cpplint.py:2298:14: F821 undefined name 'xrange'
    for i in xrange(linenum - 1, self.starting_linenum, -1):
             ^
./cpplint/cpplint.py:3080:26: F821 undefined name 'xrange'
    for start_linenum in xrange(linenum, clean_lines.NumLines()):
                         ^
./cpplint/cpplint.py:3537:14: F821 undefined name 'xrange'
    for i in xrange(first_line, last_line + 1, 1):
             ^
./cpplint/cpplint.py:3601:19: F821 undefined name 'xrange'
    for offset in xrange(endlinenum + 1,
                  ^
./cpplint/cpplint.py:4155:14: F821 undefined name 'xrange'
    for i in xrange(linenum + 1, end_line):
             ^
./cpplint/cpplint.py:4283:23: F821 undefined name 'unicode'
  if isinstance(line, unicode):
                      ^
./cpplint/cpplint.py:4928:12: F821 undefined name 'xrange'
  for i in xrange(linenum, max(-1, linenum - 10), -1):
           ^
./cpplint/cpplint.py:4949:12: F821 undefined name 'xrange'
  for i in xrange(linenum, max(-1, linenum - 10), -1):
           ^
./cpplint/cpplint.py:4965:12: F821 undefined name 'xrange'
  for i in xrange(linenum, 1, -1):
           ^
./cpplint/cpplint.py:5066:20: F821 undefined name 'xrange'
          for i in xrange(startline, linenum + 1):
                   ^
./cpplint/cpplint.py:5090:14: F821 undefined name 'xrange'
    for i in xrange(linenum - 1, max(0, linenum - 10), -1):
             ^
./cpplint/cpplint.py:5121:14: F821 undefined name 'xrange'
    for i in xrange(2):
             ^
./cpplint/cpplint.py:5284:14: F821 undefined name 'xrange'
    for i in xrange(linenum - 1, max(0, linenum - 5), -1):
             ^
./cpplint/cpplint.py:5503:18: F821 undefined name 'xrange'
  for linenum in xrange(clean_lines.NumLines()):
                 ^
./cpplint/cpplint.py:5639:21: F821 undefined name 'xrange'
  for start_line in xrange(linenum, min(linenum + 3, clean_lines.NumLines())):
                    ^
./cpplint/cpplint.py:5654:12: F821 undefined name 'xrange'
  for i in xrange(end_line, min(end_line + 3, clean_lines.NumLines())):
           ^
./cpplint/cpplint.py:5911:15: F821 undefined name 'xrange'
  for line in xrange(clean_lines.NumLines()):
              ^
```
@@ -52,6 +52,11 @@
import sys
import unicodedata

try:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

prefer an explicit version check rather than an exception, something like this:

if sys.version_info >= (3,):
  xrange = range  # xrange is only used on for loops so this is fine.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Python porting best practice is Use feature detection instead of version detection.

@gpshead
Copy link
Contributor

gpshead commented Mar 12, 2018

I won't be picky about this, both work. :) accepting.

@gpshead gpshead merged commit 89be4df into google:gh-pages Mar 12, 2018
@cclauss cclauss deleted the patch-1 branch March 12, 2018 17:26
@cclauss
Copy link
Contributor Author

cclauss commented Mar 12, 2018

@mikepurvis

@mikepurvis
Copy link

Cool, thanks. The eventual option would be to just switch the source to use range. This will incur a modest perf/memory penalty in the Python 2 case due to unnecessary list construction, but make the Python 3 interpretation idiomatic.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants