Move checkeol.py into igor.py, and ignore .tox

3 files changed, 40 insertions, 39 deletions

diff --git a/Makefile b/Makefile
index 2b450338..5cf49310 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ LINTABLE = coverage setup.py test
 lint:
 	-pylint --rcfile=.pylintrc $(LINTABLE)
 	python -m tabnanny $(LINTABLE)
-	python checkeol.py
+	python igor.py check_eol
 
 pep8:
 	pep8 --filename=*.py --ignore=E401,E301 --repeat coverage
diff --git a/checkeol.py b/checkeol.py
deleted file mode 100644
index cc0cab3b..00000000
--- a/checkeol.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# Check files for incorrect newlines and trailing whitespace.
-
-import fnmatch, os
-
-def check_file(fname, crlf=True, trail_white=True):
-    for n, line in enumerate(open(fname, "rb")):
-        if crlf:
-            if "\r" in line:
-                print "%s@%d: CR found" % (fname, n+1)
-                return
-        if trail_white:
-            line = line[:-1]
-            if line.rstrip() != line:
-                print "%s@%d: trailing whitespace found" % (fname, n+1)
-                return
-
-
-def check_files(root, patterns, **kwargs):
-    for root, dirs, files in os.walk(root):
-        for f in files:
-            fname = os.path.join(root, f)
-            for p in patterns:
-                if fnmatch.fnmatch(fname, p):
-                    check_file(fname, **kwargs)
-                    break
-        for pattern in ['.svn', '.hg']:
-            if pattern in dirs:
-                dirs.remove(pattern)
-
-
-check_files("coverage", ["*.py", "*.c"])
-check_files("coverage/htmlfiles", ["*.html", "*.css", "*.js"])
-check_files("test", ["*.py"])
-check_files("test", ["*,cover"], trail_white=False)
-check_files("test/js", ["*.js", "*.html"])
-check_file("setup.py")
-check_files("doc", ["*.rst"])
-check_files(".", ["*.txt"])
diff --git a/igor.py b/igor.py
index 3f1a34ac..1682a3e3 100644
--- a/igor.py
+++ b/igor.py
@@ -5,6 +5,7 @@ of in shell scripts, batch files, or Makefiles.
 
 """
 
+import fnmatch
 import os
 import sys
 import zipfile
@@ -35,6 +36,44 @@ def do_zip_mods(args):
     zf = zipfile.ZipFile("test/zipmods.zip", "w")
     zf.write("test/covmodzip1.py", "covmodzip1.py")
 
+def do_check_eol(args):
+    """Check files for incorrect newlines and trailing whitespace."""
+
+    ignore_dirs = ['.svn', '.hg', '.tox']
+
+    def check_file(fname, crlf=True, trail_white=True):
+        for n, line in enumerate(open(fname, "rb")):
+            if crlf:
+                if "\r" in line:
+                    print "%s@%d: CR found" % (fname, n+1)
+                    return
+            if trail_white:
+                line = line[:-1]
+                if line.rstrip() != line:
+                    print "%s@%d: trailing whitespace found" % (fname, n+1)
+                    return
+
+    def check_files(root, patterns, **kwargs):
+        for root, dirs, files in os.walk(root):
+            for f in files:
+                fname = os.path.join(root, f)
+                for p in patterns:
+                    if fnmatch.fnmatch(fname, p):
+                        check_file(fname, **kwargs)
+                        break
+            for pattern in ignore_dirs:
+                if pattern in dirs:
+                    dirs.remove(pattern)
+
+    check_files("coverage", ["*.py", "*.c"])
+    check_files("coverage/htmlfiles", ["*.html", "*.css", "*.js"])
+    check_files("test", ["*.py"])
+    check_files("test", ["*,cover"], trail_white=False)
+    check_files("test/js", ["*.js", "*.html"])
+    check_file("setup.py")
+    check_files("doc", ["*.rst"])
+    check_files(".", ["*.txt"])
+
 
 def main(args):
     handler = globals().get('do_'+args[0])