Merge pull request #96 from thanatos/remove-unittest2

Remove unittest2 in Python 2.7.

Author: Yamil Asusta

setup.py

@@ -8,9 +8,9 @@
 
 def getRequires():
     deps = ['smtpapi==0.1.3']
-    if sys.version_info < (3, 0):
+    if sys.version_info < (2, 7):
         deps.append('unittest2')
-    else:
+    elif (3, 0) <= sys.version_info < (3, 2):
         deps.append('unittest2py3k')
     return deps
 

test/__init__.py

@@ -1,5 +1,8 @@
 import os
-import unittest2 as unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 import json
 import sys
 try: