Merge branch 'master' into python3

2 files changed, 2 insertions, 4 deletions

diff --git a/bin/screenplain b/bin/screenplain
index ad6a673..e28cb73 100755
--- a/bin/screenplain
+++ b/bin/screenplain
@@ -1,9 +1,6 @@
 #!/usr/bin/env python
 import sys
-from os.path import dirname, join, abspath, pardir
 
 if __name__ == '__main__':
-   p = abspath(join(dirname(__file__), pardir))
-   sys.path.append(p)
    from screenplain.main import main
    main(sys.argv[1:])
diff --git a/bin/test b/bin/test
index da49a7e..0b7ce83 100755
--- a/bin/test
+++ b/bin/test
@@ -1,2 +1,3 @@
 #!/bin/bash
-python test.py && pep8 screenplain tests
+nosetests --nocapture --with-doctest --doctest-tests -I ^test.py $* && \
+  pep8 --ignore=E402 screenplain tests