diff options
author | Alexandre Marie <alexandre.marie@synchrotron-soleil.fr> | 2018-12-17 12:28:45 +0100 |
---|---|---|
committer | Alexandre Marie <alexandre.marie@synchrotron-soleil.fr> | 2018-12-17 12:28:45 +0100 |
commit | c49572a2e90b398e90a43f86b490f27ee6c58de6 (patch) | |
tree | d130cf7dfc3cf73157e1bece8173331bb4bc7156 /silx/utils | |
parent | 0bbc8ab933e62c1fa6d548e879ae6d98cbd461f1 (diff) | |
parent | cebdc9244c019224846cb8d2668080fe386a6adc (diff) |
Merge tag 'upstream/0.9.0+dfsg'
Upstream version 0.9.0+dfsg
Diffstat (limited to 'silx/utils')
-rw-r--r-- | silx/utils/launcher.py | 4 | ||||
-rw-r--r-- | silx/utils/number.py | 2 | ||||
-rw-r--r-- | silx/utils/test/test_html.py | 6 | ||||
-rw-r--r-- | silx/utils/test/test_launcher.py | 32 | ||||
-rw-r--r-- | silx/utils/test/test_weakref.py | 82 |
5 files changed, 63 insertions, 63 deletions
diff --git a/silx/utils/launcher.py b/silx/utils/launcher.py index 059e990..c46256a 100644 --- a/silx/utils/launcher.py +++ b/silx/utils/launcher.py @@ -83,12 +83,12 @@ class LauncherCommand(object): else: module = self.get_module() if module is None: - _logger.error("Imposible to load module name '%s'" % self.module_name) + _logger.error("Impossible to load module name '%s'" % self.module_name) return None # reach the 'main' function if not hasattr(module, "main"): - raise TypeError("Module excpect to have a 'main' function") + raise TypeError("Module expect to have a 'main' function") else: main = getattr(module, "main") return main diff --git a/silx/utils/number.py b/silx/utils/number.py index e6a87e7..92e98fe 100644 --- a/silx/utils/number.py +++ b/silx/utils/number.py @@ -53,7 +53,7 @@ if _biggest_float is None: _float_types = (numpy.float64, numpy.float32, numpy.float16) -_parse_numeric_value = re.compile("^\s*[-+]?0*(\d+?)?(?:\.(\d+))?(?:[eE]([-+]?\d+))?\s*$") +_parse_numeric_value = re.compile(r"^\s*[-+]?0*(\d+?)?(?:\.(\d+))?(?:[eE]([-+]?\d+))?\s*$") def is_longdouble_64bits(): diff --git a/silx/utils/test/test_html.py b/silx/utils/test/test_html.py index 2d0387b..4af8560 100644 --- a/silx/utils/test/test_html.py +++ b/silx/utils/test/test_html.py @@ -38,16 +38,16 @@ class TestHtml(unittest.TestCase): def testLtGt(self): result = html.escape("<html>'\"") - self.assertEquals("<html>'"", result) + self.assertEqual("<html>'"", result) def testLtAmpGt(self): # '&' have to be escaped first result = html.escape("<&>") - self.assertEquals("<&>", result) + self.assertEqual("<&>", result) def testNoQuotes(self): result = html.escape("\"m&m's\"", quote=False) - self.assertEquals("\"m&m's\"", result) + self.assertEqual("\"m&m's\"", result) def suite(): diff --git a/silx/utils/test/test_launcher.py b/silx/utils/test/test_launcher.py index 87b7158..c64ac9a 100644 --- a/silx/utils/test/test_launcher.py +++ b/silx/utils/test/test_launcher.py @@ -119,16 +119,16 @@ class TestLauncher(ParametricTestCase): command = launcher.LauncherCommand("foo", function=callback) runner.add_command(command=command) status = runner.execute(["prog", "foo", "param1", "param2"]) - self.assertEquals(status, 42) - self.assertEquals(callback._execute_argv, ["prog foo", "param1", "param2"]) - self.assertEquals(callback._execute_count, 1) + self.assertEqual(status, 42) + self.assertEqual(callback._execute_argv, ["prog foo", "param1", "param2"]) + self.assertEqual(callback._execute_count, 1) def testAddCommand(self): runner = launcher.Launcher(prog="prog") module_name = "silx.utils.test.test_launcher_command" runner.add_command("foo", module_name=module_name) status = runner.execute(["prog", "foo"]) - self.assertEquals(status, 0) + self.assertEqual(status, 0) def testCallHelpOnCommand(self): callback = CallbackMock(result=42) @@ -136,9 +136,9 @@ class TestLauncher(ParametricTestCase): command = launcher.LauncherCommand("foo", function=callback) runner.add_command(command=command) status = runner.execute(["prog", "--help", "foo"]) - self.assertEquals(status, 42) - self.assertEquals(callback._execute_argv, ["prog foo", "--help"]) - self.assertEquals(callback._execute_count, 1) + self.assertEqual(status, 42) + self.assertEqual(callback._execute_argv, ["prog foo", "--help"]) + self.assertEqual(callback._execute_count, 1) def testCallHelpOnCommand2(self): callback = CallbackMock(result=42) @@ -146,9 +146,9 @@ class TestLauncher(ParametricTestCase): command = launcher.LauncherCommand("foo", function=callback) runner.add_command(command=command) status = runner.execute(["prog", "help", "foo"]) - self.assertEquals(status, 42) - self.assertEquals(callback._execute_argv, ["prog foo", "--help"]) - self.assertEquals(callback._execute_count, 1) + self.assertEqual(status, 42) + self.assertEqual(callback._execute_argv, ["prog foo", "--help"]) + self.assertEqual(callback._execute_count, 1) def testCallHelpOnUnknownCommand(self): callback = CallbackMock(result=42) @@ -156,7 +156,7 @@ class TestLauncher(ParametricTestCase): command = launcher.LauncherCommand("foo", function=callback) runner.add_command(command=command) status = runner.execute(["prog", "help", "foo2"]) - self.assertEquals(status, -1) + self.assertEqual(status, -1) def testNotAvailableCommand(self): callback = CallbackMock(result=42) @@ -164,8 +164,8 @@ class TestLauncher(ParametricTestCase): command = launcher.LauncherCommand("foo", function=callback) runner.add_command(command=command) status = runner.execute(["prog", "foo2", "param1", "param2"]) - self.assertEquals(status, -1) - self.assertEquals(callback._execute_count, 0) + self.assertEqual(status, -1) + self.assertEqual(callback._execute_count, 0) def testCallHelp(self): callback = CallbackMock(result=42) @@ -173,8 +173,8 @@ class TestLauncher(ParametricTestCase): command = launcher.LauncherCommand("foo", function=callback) runner.add_command(command=command) status = runner.execute(["prog", "help"]) - self.assertEquals(status, 0) - self.assertEquals(callback._execute_count, 0) + self.assertEqual(status, 0) + self.assertEqual(callback._execute_count, 0) def testCommonCommands(self): runner = launcher.Launcher() @@ -188,7 +188,7 @@ class TestLauncher(ParametricTestCase): for arguments in tests: with self.subTest(args=tests): status = runner.execute(arguments) - self.assertEquals(status, 0) + self.assertEqual(status, 0) def suite(): diff --git a/silx/utils/test/test_weakref.py b/silx/utils/test/test_weakref.py index 7175863..16d3cf5 100644 --- a/silx/utils/test/test_weakref.py +++ b/silx/utils/test/test_weakref.py @@ -53,7 +53,7 @@ class TestWeakMethod(unittest.TestCase): def testMethod(self): dummy = Dummy() callable_ = weakref.WeakMethod(dummy.inc) - self.assertEquals(callable_()(10), 11) + self.assertEqual(callable_()(10), 11) def testMethodWithDeadObject(self): dummy = Dummy() @@ -70,7 +70,7 @@ class TestWeakMethod(unittest.TestCase): def testFunction(self): callable_ = weakref.WeakMethod(dummy_inc) - self.assertEquals(callable_()(10), 11) + self.assertEqual(callable_()(10), 11) def testDeadFunction(self): def inc(a): @@ -82,7 +82,7 @@ class TestWeakMethod(unittest.TestCase): def testLambda(self): store = lambda a: a + 1 # noqa: E731 callable_ = weakref.WeakMethod(store) - self.assertEquals(callable_()(10), 11) + self.assertEqual(callable_()(10), 11) def testDeadLambda(self): callable_ = weakref.WeakMethod(lambda a: a + 1) @@ -97,7 +97,7 @@ class TestWeakMethod(unittest.TestCase): dummy = Dummy() callable_ = weakref.WeakMethod(dummy.inc, callback) dummy = None - self.assertEquals(self.__count, 1) + self.assertEqual(self.__count, 1) def testCallbackOnDeadMethod(self): self.__count = 0 @@ -109,7 +109,7 @@ class TestWeakMethod(unittest.TestCase): dummy.inc2 = lambda self, a: a + 1 callable_ = weakref.WeakMethod(dummy.inc2, callback) dummy.inc2 = None - self.assertEquals(self.__count, 1) + self.assertEqual(self.__count, 1) def testCallbackOnDeadFunction(self): self.__count = 0 @@ -120,13 +120,13 @@ class TestWeakMethod(unittest.TestCase): store = lambda a: a + 1 # noqa: E731 callable_ = weakref.WeakMethod(store, callback) store = None - self.assertEquals(self.__count, 1) + self.assertEqual(self.__count, 1) def testEquals(self): dummy = Dummy() callable1 = weakref.WeakMethod(dummy.inc) callable2 = weakref.WeakMethod(dummy.inc) - self.assertEquals(callable1, callable2) + self.assertEqual(callable1, callable2) def testInSet(self): callable_set = set([]) @@ -140,7 +140,7 @@ class TestWeakMethod(unittest.TestCase): dummy = Dummy() callable_dict[weakref.WeakMethod(dummy.inc)] = 10 callable_ = weakref.WeakMethod(dummy.inc) - self.assertEquals(callable_dict.get(callable_), 10) + self.assertEqual(callable_dict.get(callable_), 10) class TestWeakMethodProxy(unittest.TestCase): @@ -148,7 +148,7 @@ class TestWeakMethodProxy(unittest.TestCase): def testMethod(self): dummy = Dummy() callable_ = weakref.WeakMethodProxy(dummy.inc) - self.assertEquals(callable_(10), 11) + self.assertEqual(callable_(10), 11) def testMethodWithDeadObject(self): dummy = Dummy() @@ -170,60 +170,60 @@ class TestWeakList(unittest.TestCase): def testAppend(self): obj = Dummy() self.list.append(obj) - self.assertEquals(len(self.list), 3) + self.assertEqual(len(self.list), 3) obj = None - self.assertEquals(len(self.list), 2) + self.assertEqual(len(self.list), 2) def testRemove(self): self.list.remove(self.object1) - self.assertEquals(len(self.list), 1) + self.assertEqual(len(self.list), 1) def testPop(self): obj = self.list.pop(0) self.assertIs(obj, self.object1) - self.assertEquals(len(self.list), 1) + self.assertEqual(len(self.list), 1) def testGetItem(self): self.assertIs(self.object1, self.list[0]) def testGetItemSlice(self): objects = self.list[:] - self.assertEquals(len(objects), 2) + self.assertEqual(len(objects), 2) self.assertIs(self.object1, objects[0]) self.assertIs(self.object2, objects[1]) def testIter(self): obj_list = list(self.list) - self.assertEquals(len(obj_list), 2) + self.assertEqual(len(obj_list), 2) self.assertIs(self.object1, obj_list[0]) def testLen(self): - self.assertEquals(len(self.list), 2) + self.assertEqual(len(self.list), 2) def testSetItem(self): obj = Dummy() self.list[0] = obj self.assertIsNot(self.object1, self.list[0]) obj = None - self.assertEquals(len(self.list), 1) + self.assertEqual(len(self.list), 1) def testSetItemSlice(self): obj = Dummy() self.list[:] = [obj, obj] - self.assertEquals(len(self.list), 2) + self.assertEqual(len(self.list), 2) self.assertIs(obj, self.list[0]) self.assertIs(obj, self.list[1]) obj = None - self.assertEquals(len(self.list), 0) + self.assertEqual(len(self.list), 0) def testDelItem(self): del self.list[0] - self.assertEquals(len(self.list), 1) + self.assertEqual(len(self.list), 1) self.assertIs(self.object2, self.list[0]) def testDelItemSlice(self): del self.list[:] - self.assertEquals(len(self.list), 0) + self.assertEqual(len(self.list), 0) def testContains(self): self.assertIn(self.object1, self.list) @@ -232,76 +232,76 @@ class TestWeakList(unittest.TestCase): others = [Dummy()] l = self.list + others self.assertIs(l[0], self.object1) - self.assertEquals(len(l), 3) + self.assertEqual(len(l), 3) others = None - self.assertEquals(len(l), 2) + self.assertEqual(len(l), 2) def testExtend(self): others = [Dummy()] self.list.extend(others) self.assertIs(self.list[0], self.object1) - self.assertEquals(len(self.list), 3) + self.assertEqual(len(self.list), 3) others = None - self.assertEquals(len(self.list), 2) + self.assertEqual(len(self.list), 2) def testIadd(self): others = [Dummy()] self.list += others self.assertIs(self.list[0], self.object1) - self.assertEquals(len(self.list), 3) + self.assertEqual(len(self.list), 3) others = None - self.assertEquals(len(self.list), 2) + self.assertEqual(len(self.list), 2) def testMul(self): l = self.list * 2 self.assertIs(l[0], self.object1) - self.assertEquals(len(l), 4) + self.assertEqual(len(l), 4) self.object1 = None - self.assertEquals(len(l), 2) + self.assertEqual(len(l), 2) self.assertIs(l[0], self.object2) self.assertIs(l[1], self.object2) def testImul(self): self.list *= 2 self.assertIs(self.list[0], self.object1) - self.assertEquals(len(self.list), 4) + self.assertEqual(len(self.list), 4) self.object1 = None - self.assertEquals(len(self.list), 2) + self.assertEqual(len(self.list), 2) self.assertIs(self.list[0], self.object2) self.assertIs(self.list[1], self.object2) def testCount(self): self.list.append(self.object2) - self.assertEquals(self.list.count(self.object1), 1) - self.assertEquals(self.list.count(self.object2), 2) + self.assertEqual(self.list.count(self.object1), 1) + self.assertEqual(self.list.count(self.object2), 2) def testIndex(self): - self.assertEquals(self.list.index(self.object1), 0) - self.assertEquals(self.list.index(self.object2), 1) + self.assertEqual(self.list.index(self.object1), 0) + self.assertEqual(self.list.index(self.object2), 1) def testInsert(self): obj = Dummy() self.list.insert(1, obj) - self.assertEquals(len(self.list), 3) + self.assertEqual(len(self.list), 3) self.assertIs(self.list[1], obj) obj = None - self.assertEquals(len(self.list), 2) + self.assertEqual(len(self.list), 2) def testReverse(self): self.list.reverse() - self.assertEquals(len(self.list), 2) + self.assertEqual(len(self.list), 2) self.assertIs(self.list[0], self.object2) self.assertIs(self.list[1], self.object1) def testReverted(self): new_list = reversed(self.list) - self.assertEquals(len(new_list), 2) + self.assertEqual(len(new_list), 2) self.assertIs(self.list[1], self.object2) self.assertIs(self.list[0], self.object1) self.assertIs(new_list[0], self.object2) self.assertIs(new_list[1], self.object1) self.object1 = None - self.assertEquals(len(new_list), 1) + self.assertEqual(len(new_list), 1) def testStr(self): self.assertNotEquals(self.list.__str__(), "[]") @@ -312,7 +312,7 @@ class TestWeakList(unittest.TestCase): def testSort(self): # only a coverage self.list.sort() - self.assertEquals(len(self.list), 2) + self.assertEqual(len(self.list), 2) def suite(): |