Merge with Ben.

2 files changed, 11 insertions, 27 deletions

diff --git a/pygments/token.py b/pygments/token.py
index 6db41a56..4fc50919 100644
--- a/pygments/token.py
+++ b/pygments/token.py
@@ -201,21 +201,3 @@ STANDARD_TYPES = {
     Generic.Subheading:            'gu',
     Generic.Traceback:             'gt',
 }
-
-
-
-if __name__ == '__main__':
-    import sys
-    # sanity check for token name dict: no duplicate entries!
-    stp = STANDARD_TYPES.copy()
-    stp[Token] = '---' # Token and Text do conflict, that is okay
-    t = {}
-    for k, v in stp.iteritems():
-        t.setdefault(v, []).append(k)
-    if len(t) == len(stp):
-        print 'Okay!'
-        sys.exit()
-
-    for k, v in t.iteritems():
-        if len(v) > 1:
-            print "%r has more than one key: %r" % (k, v)
diff --git a/tests/test_token.py b/tests/test_token.py
index 8cf779f7..4c83b9ea 100644
--- a/tests/test_token.py
+++ b/tests/test_token.py
@@ -36,15 +36,17 @@ class TokenTest(unittest.TestCase):
         self.assert_(token.string_to_tokentype('String') is token.String)
 
     def test_sanity_check(self):
-        try:
-            try:
-                old_stdout = sys.stdout
-                sys.stdout = StringIO.StringIO()
-                execfile(token.__file__.rstrip('c'), {'__name__': '__main__'})
-            finally:
-                sys.stdout = old_stdout
-        except SystemExit:
-            pass
+        stp = token.STANDARD_TYPES.copy()
+        stp[token.Token] = '---' # Token and Text do conflict, that is okay
+        t = {}
+        for k, v in stp.iteritems():
+            t.setdefault(v, []).append(k)
+        if len(t) == len(stp):
+            return # Okay
+
+        for k, v in t.iteritems():
+            if len(v) > 1:
+                self.fail("%r has more than one key: %r" % (k, v))
 
 
 if __name__ == '__main__':