Merge branch 'master' into streamoptimum37

1 files changed, 5 insertions, 10 deletions

diff --git a/tests/type/test_namedval.py b/tests/type/test_namedval.py
index 4ac08cf..eae6b4d 100644
--- a/tests/type/test_namedval.py
+++ b/tests/type/test_namedval.py
@@ -5,12 +5,7 @@
 # License: http://snmplabs.com/pyasn1/license.html
 #
 import sys
-
-try:
-    import unittest2 as unittest
-
-except ImportError:
-    import unittest
+import unittest
 
 from tests.base import BaseTestCase
 
@@ -23,10 +18,10 @@ class NamedValuesCaseBase(BaseTestCase):
         self.e = namedval.NamedValues(('off', 0), ('on', 1))
 
     def testDict(self):
-        assert set(self.e.items()) == set([('off', 0), ('on', 1)])
-        assert set(self.e.keys()) == set(['off', 'on'])
-        assert set(self.e) == set(['off', 'on'])
-        assert set(self.e.values()) == set([0, 1])
+        assert set(self.e.items()) == {('off', 0), ('on', 1)}
+        assert set(self.e.keys()) == {'off', 'on'}
+        assert set(self.e) == {'off', 'on'}
+        assert set(self.e.values()) == {0, 1}
         assert 'on' in self.e and 'off' in self.e and 'xxx' not in self.e
         assert 0 in self.e and 1 in self.e and 2 not in self.e