|
 |
aae68a |
--- setup.py.orig 2015-11-12 16:19:17.850638394 +0100
|
|
|
aae68a |
+++ setup.py 2015-11-12 16:19:33.605809230 +0100
|
|
|
aae68a |
@@ -12,8 +12,7 @@
|
|
|
aae68a |
|
|
|
aae68a |
class late_version:
|
|
|
aae68a |
def __str__(self):
|
|
|
aae68a |
- from unittest2 import __version__ as VERSION
|
|
|
aae68a |
- return VERSION
|
|
|
aae68a |
+ return '1.1.0'
|
|
|
aae68a |
def __add__(self, other):
|
|
|
aae68a |
return str(self) + other
|
|
|
aae68a |
def replace(self, old, new):
|
|
|
aae68a |
@@ -57,7 +56,7 @@
|
|
|
aae68a |
# Both install and setup requires - because we read VERSION from within the
|
|
|
aae68a |
# package, and the package also exports all the APIs.
|
|
|
aae68a |
# six for compat helpers
|
|
|
aae68a |
-REQUIRES = ['six>=1.4', 'traceback2'],
|
|
|
aae68a |
+REQUIRES = ['six>=1.4'],
|
|
|
aae68a |
|
|
|
aae68a |
params = dict(
|
|
|
aae68a |
name=NAME,
|
|
|
aae68a |
--- unittest2/case.py 2015-06-30 08:17:28.000000000 +0200
|
|
|
aae68a |
+++ unittest2/case.py 2018-06-19 14:01:41.591254456 +0200
|
|
|
aae68a |
@@ -7,7 +7,10 @@
|
|
|
aae68a |
import logging
|
|
|
aae68a |
import pprint
|
|
|
aae68a |
import re
|
|
|
aae68a |
-import traceback2 as traceback
|
|
|
aae68a |
+if sys.version_info > (3, 5):
|
|
|
aae68a |
+ import traceback
|
|
|
aae68a |
+else:
|
|
|
aae68a |
+ import traceback2 as traceback
|
|
|
aae68a |
import types
|
|
|
aae68a |
import unittest
|
|
|
aae68a |
import warnings
|
|
|
aae68a |
--- unittest2/result.py 2015-03-06 06:17:01.000000000 +0100
|
|
|
aae68a |
+++ unittest2/result.py 2018-06-19 14:02:04.184171011 +0200
|
|
|
aae68a |
@@ -4,7 +4,10 @@
|
|
|
aae68a |
import unittest
|
|
|
aae68a |
|
|
|
aae68a |
from six.moves import StringIO
|
|
|
aae68a |
-import traceback2 as traceback
|
|
|
aae68a |
+if sys.version_info > (3, 5):
|
|
|
aae68a |
+ import traceback
|
|
|
aae68a |
+else:
|
|
|
aae68a |
+ import traceback2 as traceback
|
|
|
aae68a |
|
|
|
aae68a |
from unittest2 import util
|
|
|
aae68a |
from unittest2.compatibility import wraps
|
|
|
aae68a |
--- unittest2/test/test_result.py 2015-03-06 06:20:12.000000000 +0100
|
|
|
aae68a |
+++ unittest2/test/test_result.py 2018-06-19 14:01:57.136197042 +0200
|
|
|
aae68a |
@@ -1,6 +1,9 @@
|
|
|
aae68a |
import sys
|
|
|
aae68a |
import textwrap
|
|
|
aae68a |
-import traceback2 as traceback
|
|
|
aae68a |
+if sys.version_info > (3, 5):
|
|
|
aae68a |
+ import traceback
|
|
|
aae68a |
+else:
|
|
|
aae68a |
+ import traceback2 as traceback
|
|
|
aae68a |
|
|
|
aae68a |
import six
|
|
|
aae68a |
from six.moves import StringIO
|