commit 1126c4ed862e7cb6768deb41629d418d2257d3f5
author David Pursehouse <dpursehouse@collab.net> Thu Jul 11 13:07:42 2019 +0900
committer David Pursehouse <dpursehouse@collab.net> Wed Jul 31 00:55:37 2019 +0000
tree c58b1b53cfab6802277eb7efce465763cadf0c6d
parent f7c51606f0eae56f0cf52c54713f7816d8e9f97c

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>

wrapper.py

diff --git a/wrapper.py b/wrapper.py
index bbb8471..804fa01 100644
--- a/wrapper.py
+++ b/wrapper.py
@@ -15,7 +15,12 @@
 # limitations under the License.
 
 from __future__ import print_function
-import imp
+try:
+   from importlib.machinery import SourceFileLoader
+   _loader = lambda *args: SourceFileLoader(*args).load_module()
+except ImportError:
+   import imp
+   _loader = lambda *args: imp.load_source(*args)
 import os
 
 
@@ -26,5 +31,5 @@
 def Wrapper():
   global _wrapper_module
   if not _wrapper_module:
-    _wrapper_module = imp.load_source('wrapper', WrapperPath())
+    _wrapper_module = _loader('wrapper', WrapperPath())
   return _wrapper_module