diff options
author | David Pursehouse <dpursehouse@collab.net> | 2019-07-11 13:07:42 +0900 |
---|---|---|
committer | David Pursehouse <dpursehouse@collab.net> | 2019-07-31 00:55:37 +0000 |
commit | 1126c4ed862e7cb6768deb41629d418d2257d3f5 (patch) | |
tree | c58b1b53cfab6802277eb7efce465763cadf0c6d | |
parent | f7c51606f0eae56f0cf52c54713f7816d8e9f97c (diff) | |
download | git-repo-1126c4ed862e7cb6768deb41629d418d2257d3f5.tar.gz |
wrapper: replace usage of deprecated imp module for Python 3
A warning is emitted
DeprecationWarning: the imp module is deprecated in favour of
importlib; see the module's documentation for alternative uses
Change-Id: I6c5a9e024a9a904e02a24331f615548be3fe5f8e
Signed-off-by: David Pursehouse <dpursehouse@collab.net>
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/230984
Reviewed-by: Jonathan Nieder <jrn@google.com>
-rw-r--r-- | wrapper.py | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -15,7 +15,12 @@ | |||
15 | # limitations under the License. | 15 | # limitations under the License. |
16 | 16 | ||
17 | from __future__ import print_function | 17 | from __future__ import print_function |
18 | import imp | 18 | try: |
19 | from importlib.machinery import SourceFileLoader | ||
20 | _loader = lambda *args: SourceFileLoader(*args).load_module() | ||
21 | except ImportError: | ||
22 | import imp | ||
23 | _loader = lambda *args: imp.load_source(*args) | ||
19 | import os | 24 | import os |
20 | 25 | ||
21 | 26 | ||
@@ -26,5 +31,5 @@ _wrapper_module = None | |||
26 | def Wrapper(): | 31 | def Wrapper(): |
27 | global _wrapper_module | 32 | global _wrapper_module |
28 | if not _wrapper_module: | 33 | if not _wrapper_module: |
29 | _wrapper_module = imp.load_source('wrapper', WrapperPath()) | 34 | _wrapper_module = _loader('wrapper', WrapperPath()) |
30 | return _wrapper_module | 35 | return _wrapper_module |