Python 3. Clean up tests.

Author: cscorley

Makefile

@@ -1,6 +1,13 @@
 all:
 	nosetests
 
+clean:
+	find whatthepatch tests -name '*.pyc' -exec rm {} \;
+
+test:
+	. env2/bin/activate && nosetests || true
+	. env3/bin/activate && nosetests || true
+
 init: init2 init3
 
 init2:

tests/context.py

@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
-# test_basic.py
 
-from context import whatthepatch
+import whatthepatch as wtp
 
-from whatthepatch import apply
 
 import unittest
 from io import StringIO
@@ -28,30 +26,30 @@ def test_diff_default(self):
         with open('tests/casefiles/diff-default.diff') as f:
             diff_text = f.read()
 
-        diff = [x for x in whatthepatch.parse_patch(diff_text)]
+        diff = [x for x in wtp.parse_patch(diff_text)]
         diff = diff[0]
 
-        new_text = apply.apply_diff(diff, self.lao)
+        new_text = wtp.apply.apply_diff(diff, self.lao)
         self.assertEquals(new_text, self.tzu)
 
     def test_diff_context(self):
         with open('tests/casefiles/diff-context.diff') as f:
             diff_text = f.read()
 
-        diff = [x for x in whatthepatch.parse_patch(diff_text)]
+        diff = [x for x in wtp.parse_patch(diff_text)]
         diff = diff[0]
 
-        new_text = apply.apply_diff(diff, self.lao)
+        new_text = wtp.apply.apply_diff(diff, self.lao)
         self.assertEquals(new_text, self.tzu)
 
     def test_diff_unified(self):
         with open('tests/casefiles/diff-unified.diff') as f:
             diff_text = f.read()
 
-        diff = [x for x in whatthepatch.parse_patch(diff_text)]
+        diff = [x for x in wtp.parse_patch(diff_text)]
         diff = diff[0]
 
-        new_text = apply.apply_diff(diff, self.lao)
+        new_text = wtp.apply.apply_diff(diff, self.lao)
         for e in self.tzu:
             print(e)
         print('~~~~')
@@ -64,22 +62,22 @@ def test_diff_unified_patchutil(self):
         with open('tests/casefiles/diff-unified.diff') as f:
             diff_text = f.read()
 
-        diff = [x for x in whatthepatch.parse_patch(diff_text)]
+        diff = [x for x in wtp.parse_patch(diff_text)]
         diff = diff[0]
 
-        new_text = apply.apply_diff(diff, self.lao, use_patch=True)
+        new_text = wtp.apply.apply_diff(diff, self.lao, use_patch=True)
         self.assertEquals(new_text, (self.tzu, None))
 
-        self.assertRaises(AssertionError, apply.apply_diff, diff, [''] + self.lao, use_patch=True)
+        self.assertRaises(AssertionError, wtp.apply.apply_diff, diff, [''] + self.lao, use_patch=True)
 
     def test_diff_rcs(self):
         with open('tests/casefiles/diff-rcs.diff') as f:
             diff_text = f.read()
 
-        diff = [x for x in whatthepatch.parse_patch(diff_text)]
+        diff = [x for x in wtp.parse_patch(diff_text)]
         diff = diff[0]
 
-        new_text = apply.apply_diff(diff, self.lao)
+        new_text = wtp.apply.apply_diff(diff, self.lao)
         self.assertEquals(new_text, self.tzu)
 
     def test_diff_ed(self):
@@ -89,14 +87,14 @@ def test_diff_ed(self):
         print(diff_text)
         print(diff_text.splitlines())
 
-        diff = [x for x in whatthepatch.parse_patch(diff_text)]
+        diff = [x for x in wtp.parse_patch(diff_text)]
         diff = diff[0]
 
         print(diff)
-        new_text = apply.apply_diff(diff, self.lao)
+        new_text = wtp.apply.apply_diff(diff, self.lao)
         self.assertEquals(self.tzu,new_text)
 
-        new_text = apply.apply_diff(diff, self.lao, use_patch=True)
+        new_text = wtp.apply.apply_diff(diff, self.lao, use_patch=True)
         self.assertEquals(new_text, (self.tzu, None))
 
 if __name__ == '__main__':