]>
Commit | Line | Data |
---|---|---|
e74d25cf JB |
1 | --- cliff-2.18.0/cliff/tests/test_app.py.orig 2020-01-08 21:36:15.000000000 +0100 |
2 | +++ cliff-2.18.0/cliff/tests/test_app.py 2024-01-16 20:07:52.707414769 +0100 | |
3 | @@ -21,7 +21,10 @@ except ImportError: | |
4 | from io import StringIO | |
5 | import sys | |
6 | ||
7 | -import mock | |
8 | +try: | |
9 | + from unittest import mock | |
10 | +except ImportError: | |
11 | + import mock | |
12 | import six | |
13 | ||
14 | from cliff import app as application | |
15 | --- cliff-2.18.0/cliff/tests/test_command_hooks.py.orig 2020-01-08 21:36:15.000000000 +0100 | |
16 | +++ cliff-2.18.0/cliff/tests/test_command_hooks.py 2024-01-16 20:08:13.197303765 +0100 | |
17 | @@ -18,7 +18,10 @@ from cliff import lister | |
18 | from cliff import show | |
19 | from cliff.tests import base | |
20 | ||
21 | -import mock | |
22 | +try: | |
23 | + from unittest import mock | |
24 | +except ImportError: | |
25 | + import mock | |
26 | from stevedore import extension | |
27 | ||
28 | ||
29 | --- cliff-2.18.0/cliff/tests/test_commandmanager.py.orig 2024-01-16 20:08:35.477183065 +0100 | |
30 | +++ cliff-2.18.0/cliff/tests/test_commandmanager.py 2024-01-16 20:08:38.507166650 +0100 | |
31 | @@ -10,7 +10,10 @@ | |
32 | # License for the specific language governing permissions and limitations | |
33 | # under the License. | |
34 | ||
35 | -import mock | |
36 | +try: | |
37 | + from unittest import mock | |
38 | +except ImportError: | |
39 | + import mock | |
40 | import testscenarios | |
41 | ||
42 | from cliff import command | |
43 | --- cliff-2.18.0/cliff/tests/test_complete.py.orig 2020-01-08 21:36:15.000000000 +0100 | |
44 | +++ cliff-2.18.0/cliff/tests/test_complete.py 2024-01-16 20:09:30.896882831 +0100 | |
45 | @@ -13,7 +13,10 @@ | |
46 | """Bash completion tests | |
47 | """ | |
48 | ||
49 | -import mock | |
50 | +try: | |
51 | + from unittest import mock | |
52 | +except ImportError: | |
53 | + import mock | |
54 | ||
55 | from cliff import app as application | |
56 | from cliff import commandmanager | |
57 | --- cliff-2.18.0/cliff/tests/test_formatters_csv.py.orig 2020-01-08 21:36:15.000000000 +0100 | |
58 | +++ cliff-2.18.0/cliff/tests/test_formatters_csv.py 2024-01-16 20:09:46.763463541 +0100 | |
59 | @@ -16,7 +16,10 @@ | |
60 | import argparse | |
61 | import unittest | |
62 | ||
63 | -import mock | |
64 | +try: | |
65 | + from unittest import mock | |
66 | +except ImportError: | |
67 | + import mock | |
68 | import six | |
69 | ||
70 | from cliff.formatters import commaseparated | |
71 | --- cliff-2.18.0/cliff/tests/test_formatters_json.py.orig 2020-01-08 21:36:15.000000000 +0100 | |
72 | +++ cliff-2.18.0/cliff/tests/test_formatters_json.py 2024-01-16 20:10:12.289991918 +0100 | |
73 | @@ -18,7 +18,10 @@ from cliff.formatters import json_format | |
74 | from cliff.tests import base | |
75 | from cliff.tests import test_columns | |
76 | ||
77 | -import mock | |
78 | +try: | |
79 | + from unittest import mock | |
80 | +except ImportError: | |
81 | + import mock | |
82 | import six | |
83 | ||
84 | ||
85 | --- cliff-2.18.0/cliff/tests/test_formatters_shell.py.orig 2024-01-16 20:10:30.733225336 +0100 | |
86 | +++ cliff-2.18.0/cliff/tests/test_formatters_shell.py 2024-01-16 20:10:36.759859354 +0100 | |
87 | @@ -19,7 +19,10 @@ from cliff.formatters import shell | |
88 | from cliff.tests import base | |
89 | from cliff.tests import test_columns | |
90 | ||
91 | -import mock | |
92 | +try: | |
93 | + from unittest import mock | |
94 | +except ImportError: | |
95 | + import mock | |
96 | ||
97 | ||
98 | class TestShellFormatter(base.TestBase): | |
99 | --- cliff-2.18.0/cliff/tests/test_formatters_table.py.orig 2020-01-08 21:36:15.000000000 +0100 | |
100 | +++ cliff-2.18.0/cliff/tests/test_formatters_table.py 2024-01-16 20:10:55.843089304 +0100 | |
101 | @@ -16,7 +16,10 @@ import argparse | |
102 | import os | |
103 | import textwrap | |
104 | ||
105 | -import mock | |
106 | +try: | |
107 | + from unittest import mock | |
108 | +except ImportError: | |
109 | + import mock | |
110 | from six import StringIO | |
111 | ||
112 | from cliff.formatters import table | |
113 | --- cliff-2.18.0/cliff/tests/test_formatters_yaml.py.orig 2020-01-08 21:36:15.000000000 +0100 | |
114 | +++ cliff-2.18.0/cliff/tests/test_formatters_yaml.py 2024-01-16 20:11:10.639675811 +0100 | |
115 | @@ -19,7 +19,10 @@ from cliff.formatters import yaml_format | |
116 | from cliff.tests import base | |
117 | from cliff.tests import test_columns | |
118 | ||
119 | -import mock | |
120 | +try: | |
121 | + from unittest import mock | |
122 | +except ImportError: | |
123 | + import mock | |
124 | ||
125 | ||
126 | class TestYAMLFormatter(base.TestBase): | |
127 | --- cliff-2.18.0/cliff/tests/test_help.py.orig 2020-01-08 21:36:15.000000000 +0100 | |
128 | +++ cliff-2.18.0/cliff/tests/test_help.py 2024-01-16 20:11:20.262957010 +0100 | |
129 | @@ -17,7 +17,10 @@ except ImportError: | |
130 | import os | |
131 | import sys | |
132 | ||
133 | -import mock | |
134 | +try: | |
135 | + from unittest import mock | |
136 | +except ImportError: | |
137 | + import mock | |
138 | ||
139 | from cliff import app as application | |
140 | from cliff import commandmanager | |
141 | --- cliff-2.18.0/cliff/tests/test_lister.py.orig 2020-01-08 21:36:15.000000000 +0100 | |
142 | +++ cliff-2.18.0/cliff/tests/test_lister.py 2024-01-16 20:11:28.762910962 +0100 | |
143 | @@ -17,7 +17,10 @@ import weakref | |
144 | from cliff import lister | |
145 | from cliff.tests import base | |
146 | ||
147 | -import mock | |
148 | +try: | |
149 | + from unittest import mock | |
150 | +except ImportError: | |
151 | + import mock | |
152 | ||
153 | ||
154 | class FauxFormatter(object): | |
155 | --- cliff-2.18.0/cliff/tests/test_show.py.orig 2020-01-08 21:36:15.000000000 +0100 | |
156 | +++ cliff-2.18.0/cliff/tests/test_show.py 2024-01-16 20:11:54.516104778 +0100 | |
157 | @@ -17,7 +17,10 @@ import weakref | |
158 | from cliff import show | |
159 | from cliff.tests import base | |
160 | ||
161 | -import mock | |
162 | +try: | |
163 | + from unittest import mock | |
164 | +except ImportError: | |
165 | + import mock | |
166 | ||
167 | ||
168 | class FauxFormatter(object): | |
169 | --- cliff-2.18.0/cliff/tests/test_utils.py.orig 2020-01-08 21:36:15.000000000 +0100 | |
170 | +++ cliff-2.18.0/cliff/tests/test_utils.py 2024-01-16 20:12:03.082725036 +0100 | |
171 | @@ -17,7 +17,10 @@ import struct | |
172 | import sys | |
173 | import unittest | |
174 | ||
175 | -import mock | |
176 | +try: | |
177 | + from unittest import mock | |
178 | +except ImportError: | |
179 | + import mock | |
180 | ||
181 | from cliff import utils | |
182 | from cliff.tests import base |