Remove conditional unittest2 imports from tests

We require 2.7+ now

Also remove setup_syspath calls

diff --git a/test/run_all_unittests.py b/test/run_all_unittests.py
index 70a57d66f780f0937b193897b60237e6d4bbbaf0..6859b94b6cbdd3dc2db32401b55c91c48ced26ad 100755 (executable)
--- a/test/run_all_unittests.py
+++ b/test/run_all_unittests.py
@@ -10,11 +10,7 @@
 from __future__ import print_function
 
 import os, sys
-
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 
 def main():

diff --git a/test/test_arm_support.py b/test/test_arm_support.py
index d31f2d1392ca56b709597a6ab65e6b9624f09561..87b18054de24608789a07bf012b65cd8bcfbc292 100644 (file)
--- a/test/test_arm_support.py
+++ b/test/test_arm_support.py
@@ -4,13 +4,9 @@
 # Eli Bendersky (eliben@gmail.com)
 # This code is in the public domain
 #-------------------------------------------------------------------------------
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 import os
 
-from utils import setup_syspath; setup_syspath()
 from elftools.elf.elffile import ELFFile
 
 

diff --git a/test/test_callframe.py b/test/test_callframe.py
index 79317d6b50be104757a26037a8d5b7ff919d909f..617f2c8181aa9f0c4e1c5158f22217cda6a243a6 100644 (file)
--- a/test/test_callframe.py
+++ b/test/test_callframe.py
@@ -4,12 +4,8 @@
 # Eli Bendersky (eliben@gmail.com)
 # This code is in the public domain
 #-------------------------------------------------------------------------------
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
-from utils import setup_syspath; setup_syspath()
 from elftools.common.py3compat import BytesIO
 from elftools.dwarf.callframe import (
     CallFrameInfo, CIE, FDE, instruction_name, CallFrameInstruction,

diff --git a/test/test_double_dynstr_section.py b/test/test_double_dynstr_section.py
index 5f0c42ef37a7262e2956dc98d9138eb5a6e1d2df..d6fe8e628c0f6a6e2dc3c7c188c4a0569100da5c 100644 (file)
--- a/test/test_double_dynstr_section.py
+++ b/test/test_double_dynstr_section.py
@@ -4,13 +4,9 @@
 # Yann Rouillard (yann@pleiades.fr.eu.org)
 # This code is in the public domain
 #------------------------------------------------------------------------------
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 import os
 
-from utils import setup_syspath; setup_syspath()
 from elftools.elf.elffile import ELFFile
 from elftools.elf.dynamic import DynamicSection, DynamicTag
 

diff --git a/test/test_dwarf_expr.py b/test/test_dwarf_expr.py
index 22a250fe2b8795abf4a5b566f114a6fa79a42888..747ee388a814bd562f8b197c7a2628c1b0aad0d7 100644 (file)
--- a/test/test_dwarf_expr.py
+++ b/test/test_dwarf_expr.py
@@ -4,12 +4,8 @@
 # Eli Bendersky (eliben@gmail.com)
 # This code is in the public domain
 #-------------------------------------------------------------------------------
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
-from utils import setup_syspath; setup_syspath()
 from elftools.dwarf.descriptions import ExprDumper, set_global_machine_arch
 from elftools.dwarf.structs import DWARFStructs
 

diff --git a/test/test_dwarf_lineprogram.py b/test/test_dwarf_lineprogram.py
index 0466926c1e01905032234cca0d26bb1892d59fe4..5a5c65aa16e342775c1820a00ec01e4317108ad4 100644 (file)
--- a/test/test_dwarf_lineprogram.py
+++ b/test/test_dwarf_lineprogram.py
@@ -4,12 +4,8 @@
 # Eli Bendersky (eliben@gmail.com)
 # This code is in the public domain
 #-------------------------------------------------------------------------------
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
-from utils import setup_syspath; setup_syspath()
 from elftools.common.py3compat import BytesIO, iteritems
 from elftools.dwarf.lineprogram import LineProgram, LineState, LineProgramEntry
 from elftools.dwarf.structs import DWARFStructs

diff --git a/test/test_dwarf_range_lists.py b/test/test_dwarf_range_lists.py
index 81dab9aa0c9d52ade148875ef947232c160e6958..cde2d8b4549a4df86e32e707e4fff47d5c7d8eb9 100644 (file)
--- a/test/test_dwarf_range_lists.py
+++ b/test/test_dwarf_range_lists.py
@@ -4,13 +4,9 @@
 # Eli Bendersky (eliben@gmail.com), Santhosh Kumar Mani (santhoshmani@gmail.com)
 # This code is in the public domain
 #-------------------------------------------------------------------------------
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
 import os
+import unittest
 
-from utils import setup_syspath; setup_syspath()
 from elftools.elf.elffile import ELFFile
 
 class TestRangeLists(unittest.TestCase):

diff --git a/test/test_dwarf_structs.py b/test/test_dwarf_structs.py
index 777ff2c0363fb8f4e89ca0df3afadd0efbde944e..e8d5b4a1a6017d1af0f6b6df7255694082b8201d 100644 (file)
--- a/test/test_dwarf_structs.py
+++ b/test/test_dwarf_structs.py
@@ -4,12 +4,8 @@
 # Eli Bendersky (eliben@gmail.com)
 # This code is in the public domain
 #-------------------------------------------------------------------------------
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
-from utils import setup_syspath; setup_syspath()
 from elftools.dwarf.structs import DWARFStructs
 
 

diff --git a/test/test_dynamic.py b/test/test_dynamic.py
index 8dc6c28362b3cd578da6ec737a61097f077135bc..5284a1cfbbde312e9c6a293348a12048a42711a8 100644 (file)
--- a/test/test_dynamic.py
+++ b/test/test_dynamic.py
@@ -4,14 +4,9 @@
 # Eli Bendersky (eliben@gmail.com)
 # This code is in the public domain
 #-------------------------------------------------------------------------------
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 import os
 
-from utils import setup_syspath
-setup_syspath()
 from elftools.elf.elffile import ELFFile
 from elftools.common.exceptions import ELFError
 from elftools.elf.dynamic import DynamicTag

diff --git a/test/test_elffile.py b/test/test_elffile.py
index d7d9602348e6bb30efe10edea13ab4615ba6f13a..f23abf0a33663bffe5e531052a493c9fc0805ac6 100644 (file)
--- a/test/test_elffile.py
+++ b/test/test_elffile.py
@@ -4,12 +4,8 @@
 # Eli Bendersky (eliben@gmail.com)
 # This code is in the public domain
 #-------------------------------------------------------------------------------
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
-from utils import setup_syspath; setup_syspath()
 from elftools.elf.elffile import ELFFile
 
 

diff --git a/test/test_get_symbol_by_name.py b/test/test_get_symbol_by_name.py
index ce5370ecd42e26f17a4192dc1db357a8cde06c35..780af3fa9947dc5c83466d09d0c303871d50c59f 100644 (file)
--- a/test/test_get_symbol_by_name.py
+++ b/test/test_get_symbol_by_name.py
@@ -1,14 +1,15 @@
-# Tests the functionality of the ELF file function `get_symbol_by_name`.
-
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+#-------------------------------------------------------------------------------
+# Tests the functionality of get_symbol_by_name
+#
+# Eli Bendersky (eliben@gmail.com)
+# This code is in the public domain
+#-------------------------------------------------------------------------------
+import unittest
 import os
 
-from utils import setup_syspath; setup_syspath()
 from elftools.elf.elffile import ELFFile
 
+
 class TestGetSymbolByName(unittest.TestCase):
     def test_existing_symbol(self):
         with open(os.path.join('test', 'testfiles_for_unittests',

diff --git a/test/test_gnuversions.py b/test/test_gnuversions.py
index 546e0c8ec1d85d115104e1b02e7bb4ab66085b79..5b6fc1c7cc9f283dba160938195738aa0682650d 100644 (file)
--- a/test/test_gnuversions.py
+++ b/test/test_gnuversions.py
@@ -4,14 +4,9 @@
 # Yann Rouillard (yann@pleiades.fr.eu.org)
 # This code is in the public domain
 #------------------------------------------------------------------------------
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 import os
 
-from utils import setup_syspath
-setup_syspath()
 from elftools.elf.elffile import ELFFile
 from elftools.elf.constants import VER_FLAGS
 from elftools.elf.gnuversions import (

diff --git a/test/test_mips_support.py b/test/test_mips_support.py
index c0537d02ab00b9b35d5f0a1dcb24131d308e87cb..9430ce4eb15d75739c777af5b83a67d389a92dc9 100644 (file)
--- a/test/test_mips_support.py
+++ b/test/test_mips_support.py
@@ -4,13 +4,9 @@
 # Karl Vogel (karl.vogel@gmail.com)
 # This code is in the public domain
 #-------------------------------------------------------------------------------
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 import os
 
-from utils import setup_syspath; setup_syspath()
 from elftools.elf.elffile import ELFFile
 
 class TestMIPSSupport(unittest.TestCase):
@@ -27,4 +23,3 @@ class TestMIPSSupport(unittest.TestCase):
 
 if __name__ == '__main__':
     unittest.main()
-

diff --git a/test/test_solaris_support.py b/test/test_solaris_support.py
index 12410f04259d85fd045f994061d47e27a9a4f537..5a573b10cc6e47cef79e75af07301ba4976add74 100644 (file)
--- a/test/test_solaris_support.py
+++ b/test/test_solaris_support.py
@@ -4,14 +4,10 @@
 # Yann Rouillard (yann@pleiades.fr.eu.org)
 # This code is in the public domain
 #-------------------------------------------------------------------------------
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 import os
 import copy
 
-from utils import setup_syspath; setup_syspath()
 from elftools.elf.elffile import ELFFile
 from elftools.elf.constants import SUNW_SYMINFO_FLAGS
 

diff --git a/test/test_stab.py b/test/test_stab.py
index 7180b2a006a26412a0fc345eb5aefc5747038341..ba369145ee5a7b2f0095c913d3d466e9719d1d23 100644 (file)
--- a/test/test_stab.py
+++ b/test/test_stab.py
@@ -4,13 +4,9 @@
 # Eli Bendersky (eliben@gmail.com)
 # This code is in the public domain
 #-------------------------------------------------------------------------------
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 import os
 
-from utils import setup_syspath; setup_syspath()
 from elftools.elf.elffile import ELFFile
 from elftools.elf.sections import StabSection
 

diff --git a/test/test_utils.py b/test/test_utils.py
index 5972b7d98b48731d3a12e718ae6df53f01174c9c..86b1da130f066efa307a09162117ed31a7248473 100644 (file)
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -4,13 +4,9 @@
 # Eli Bendersky (eliben@gmail.com)
 # This code is in the public domain
 #-------------------------------------------------------------------------------
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 from random import randint
 
-from utils import setup_syspath; setup_syspath()
 from elftools.common.py3compat import int2byte, BytesIO
 from elftools.common.utils import (parse_cstring_from_stream,
         preserve_stream_pos)