[cassandra] branch trunk updated: Remove unittest2 import

[br...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git


The following commit(s) were added to refs/heads/trunk by this push:
     new fd9250f  Remove unittest2 import
fd9250f is described below

commit fd9250fb401db3b96aa5fe5a20ca12108b26bbb7
Author: Jeff Widman <je...@jeffwidman.com>
AuthorDate: Mon Mar 8 21:39:40 2021 -0800

    Remove unittest2 import
    
    Patch by Jeff Widman; reviewed by brandonwilliams for CASSANDRA-16506
---
 pylib/cqlshlib/test/basecase.py | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pylib/cqlshlib/test/basecase.py b/pylib/cqlshlib/test/basecase.py
index f398511..d04b366 100644
--- a/pylib/cqlshlib/test/basecase.py
+++ b/pylib/cqlshlib/test/basecase.py
@@ -14,22 +14,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import logging
 import os
 import sys
-import logging
+import unittest
 
 from os.path import dirname, join, normpath
 
 cqlshlog = logging.getLogger('test_cqlsh')
 
-try:
-    # a backport of python2.7 unittest features, so we can test against older
-    # pythons as necessary. python2.7 users who don't care about testing older
-    # versions need not install.
-    import unittest2 as unittest
-except ImportError:
-    import unittest
-
 rundir = dirname(__file__)
 cqlshdir = normpath(join(rundir, '..', '..', '..', 'bin'))
 path_to_cqlsh = normpath(join(cqlshdir, 'cqlsh.py'))


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org