Merge branch 'pep8'

Implement pep8 check.  Excludes `E203 whitespace before ':'` for now.

.gitignore

 *.pyc
 *~
 *.tmp
+/envs/
 /.coverage
 /.travis-solo/
 /htmlcov/

.travis.yml

   - "3.4"
   - "pypy"
 
-before_install:
-  - pip --quiet install docutils
-  - pip --quiet install Pygments==1.6
-  - pip --quiet install "coverage<4"
+install:
+  - pip install -r requirements.txt
   - coverage --version
   - sudo apt-get update
   - sudo apt-get --quiet=2 install patchutils
-
-install:
   - python setup.py --quiet install
 
 script:

Makefile

 TESTPYPI = pypitest
 PYPI = pypi
 
-.PHONY: dogfood doc-check doc-preview clean build dist-test dist \
+.PHONY: dogfood lint doc-check doc-preview clean build dist-test dist \
 	test test3 cov cov3 html reg reg3 profile profile3
 
 dogfood:
 	./cdiff.py
 	git diff | ./cdiff.py -s
 
+lint:
+	pep8 --ignore=E203 *.py tests/*.py
+
 doc-check:
 	./setup.py --long-description | rst2html.py --strict > /dev/null
 
 	sleep 1
 	rm -f output.html
 
-test: doc-check cov reg
+test: lint doc-check cov reg
 
-test3: doc-check cov3 reg3
+test3: lint doc-check cov3 reg3
 
 cov:
 	coverage run tests/test_cdiff.py

cdiff.py

 python (>= 2.5.0) and ``less``.
 """
 
+import sys
+import os
+import re
+import signal
+import subprocess
+import select
+import difflib
+
 META_INFO = {
     'version'     : '0.9.8',
     'license'     : 'BSD-3',
                      'stdin, with side by side and auto pager support')
 }
 
-import sys
-
 if sys.hexversion < 0x02050000:
     raise SystemExit("*** Requires python >= 2.5.0")    # pragma: no cover
 
 try:
     next
 except NameError:
-    def next(obj): return obj.next()
-
-import os
-import re
-import signal
-import subprocess
-import select
-import difflib
-
+    def next(obj):
+        return obj.next()
 
 try:
     unicode
 except NameError:
     unicode = str
 
-
 COLORS = {
     'reset'         : '\x1b[0m',
     'underline'     : '\x1b[4m',
 # Keys for revision control probe, diff and log with diff
 VCS_INFO = {
     'Git': {
-        'probe' : ['git', 'rev-parse'],
-        'diff'  : ['git', 'diff', '--no-ext-diff'],
-        'log'   : ['git', 'log', '--patch'],
+        'probe': ['git', 'rev-parse'],
+        'diff': ['git', 'diff', '--no-ext-diff'],
+        'log': ['git', 'log', '--patch'],
     },
     'Mercurial': {
-        'probe' : ['hg', 'summary'],
-        'diff'  : ['hg', 'diff'],
-        'log'   : ['hg', 'log', '--patch'],
+        'probe': ['hg', 'summary'],
+        'diff': ['hg', 'diff'],
+        'log': ['hg', 'log', '--patch'],
     },
     'Svn': {
-        'probe' : ['svn', 'info'],
-        'diff'  : ['svn', 'diff'],
-        'log'   : ['svn', 'log', '--diff', '--use-merge-history'],
+        'probe': ['svn', 'info'],
+        'diff': ['svn', 'diff'],
+        'log': ['svn', 'log', '--diff', '--use-merge-history'],
     },
 }
 
             return
 
         for n in range(size):
-            if header[n].startswith('--- ') and (n < size - 1) and \
-                    header[n+1].startswith('+++ '):
+            if (header[n].startswith('--- ') and (n < size - 1) and
+                    header[n + 1].startswith('+++ ')):
                 self._type = 'unified'
                 self._stream = stream
                 break
     """
     width, height = None, None
     try:
-        import struct, fcntl, termios
+        import struct
+        import fcntl
+        import termios
         s = struct.pack('HHHH', 0, 0, 0, 0)
         x = fcntl.ioctl(1, termios.TIOCGWINSZ, s)
         height, width = struct.unpack('HHHH', x)[0:2]

requirements.txt

+docutils
+pep8
+Pygments==1.6
+coverage<4

setup.py

 # -*- coding: utf-8 -*-
 
 from __future__ import with_statement
+import sys
 from distutils.core import setup
 from cdiff import META_INFO as _meta
 
-import sys
 if sys.hexversion < 0x02050000:
     raise SystemExit("*** Requires python >= 2.5.0")
 
     long_description += changes.read()
 
 setup(
-    name = 'cdiff',
-    version = _meta['version'],
-    author = _meta['author'],
-    author_email = _meta['email'],
-    license = _meta['license'],
-    description = _meta['description'],
-    long_description = long_description,
-    keywords = _meta['keywords'],
-    url = _meta['url'],
+    name='cdiff',
+    version=_meta['version'],
+    author=_meta['author'],
+    author_email=_meta['email'],
+    license=_meta['license'],
+    description=_meta['description'],
+    long_description=long_description,
+    keywords=_meta['keywords'],
+    url=_meta['url'],
     # See https://pypi.python.org/pypi?%3Aaction=list_classifiers
-    classifiers = [
+    classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Topic :: Utilities',
         'License :: OSI Approved :: BSD License',
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 3',
     ],
-    py_modules = ['cdiff'],
-    scripts = ['cdiff'],
+    py_modules=['cdiff'],
+    scripts=['cdiff'],
 )
 
 # vim:set et sts=4 sw=4 tw=79:

tests/test_cdiff.py

 """Unit test for cdiff"""
 
 import sys
-if sys.hexversion < 0x02050000:
-    raise SystemExit("*** Requires python >= 2.5.0")    # pragma: no cover
-
 import unittest
 import tempfile
 import subprocess
 import os
 
 sys.path.insert(0, '')
-import cdiff
+import cdiff  # nopep8
 
 
 class Sequential(object):
         hunk.append(('-', 'garb\n'))
         hunk.append(('-', 'Again\n'))
         hunk.append(('+', 'again\n'))
-        diff = cdiff.UnifiedDiff(['header\n'], '--- old\n', '+++ new\n', [hunk])
+        diff = cdiff.UnifiedDiff(
+            ['header\n'], '--- old\n', '+++ new\n', [hunk])
         return diff
 
     def test_markup_mix(self):
         self.assertEqual(
             out[5],
             '\x1b[33m1\x1b[0m '
-            '\x1b[31m\x1b[7m\x1b[31mh\x1b[0m\x1b[31mhel\x1b[0m\x1b[1;35m>\x1b[0m '
+            '\x1b[31m\x1b[7m\x1b[31mh\x1b[0m\x1b[31mhel\x1b[0m\x1b[1;35m>\x1b[0m '  # nopep8
             '\x1b[0m\x1b[33m1\x1b[0m '
             '\x1b[32mhell\x1b[0m\x1b[1;35m>\x1b[0m\n')
         self.assertEqual(