Make pyflakes pass

Author: tkruse

.travis.yml

@@ -4,12 +4,20 @@ language: python
 sudo: false
 
 python:
-  - "3.4"
-  - "3.3"
-  - "3.2"
-  - "2.7"
-  - "2.6"
+  - 3.5
+  - 3.4
+  - 3.3
+  - 3.2
+  - 2.7
+  - 2.6
+  - pypy
+  - pypy3
+install:
+  - pip install pyflakes
 # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
 # install: "sudo apt-get install"
 # command to run tests, e.g. python setup.py test
-script: python cpplint_unittest.py
+script:
+  - python cpplint_unittest.py
+  - pyflakes cpplint.py
+  - pyflakes cpplint_unittest.py

cpplint.py

@@ -502,20 +502,26 @@
 # This is set by --linelength flag.
 _line_length = 80
 
+try:
+    xrange
+except NameError:
+    xrange = range
+
+try:
+  unicode
+except NameError:
+  basestring = unicode = str
+
 if sys.version_info < (3,):
     def u(x):
         return codecs.unicode_escape_decode(x)[0]
-    TEXT_TYPE = unicode
     # BINARY_TYPE = str
-    range = xrange
     itervalues = dict.itervalues
     iteritems = dict.iteritems
 else:
     def u(x):
         return x
-    TEXT_TYPE = str
     # BINARY_TYPE = bytes
-    xrange = range
     itervalues = dict.values
     iteritems = dict.items
 
@@ -4380,7 +4386,7 @@ def GetLineWidth(line):
     The width of the line in column positions, accounting for Unicode
     combining characters and wide characters.
   """
-  if isinstance(line, TEXT_TYPE):
+  if isinstance(line, unicode):
     width = 0
     for uc in unicodedata.normalize('NFC', line):
       if unicodedata.east_asian_width(uc) in ('W', 'F'):
@@ -4817,9 +4823,6 @@ def CheckLanguage(filename, clean_lines, linenum, file_extension,
   if match:
     include_state.ResetSection(match.group(1))
 
-  # Make Windows paths like Unix.
-  fullname = os.path.abspath(filename).replace('\\', '/')
-
   # Perform other checks now that we are sure that this is not an include line
   CheckCasts(filename, clean_lines, linenum, error)
   CheckGlobalStatic(filename, clean_lines, linenum, error)

cpplint_unittest.py

@@ -44,14 +44,22 @@
 
 import cpplint
 
+try:
+  xrange
+except NameError:
+  xrange = range
+
+try:
+  unicode
+except NameError:
+  basestring = unicode = str
+
 if sys.version_info < (3,):
-    range = xrange
     def u(x):
         return codecs.unicode_escape_decode(x)[0]
     def b(x):
         return x
 else:
-    xrange = range
     def u(x):
         return x
     def b(x):