From: Paul Vinciguerra <pvinci@vinciconsulting.com>
Date: Tue, 12 Feb 2019 20:21:01 +0000 (-0800)
Subject: Resolve vppapigen DeprecationWarning.
X-Git-Tag: v19.04-rc1~475
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F42%2F17542%2F3;p=vpp.git

Resolve vppapigen DeprecationWarning.

/vpp/src/tools/vppapigen/vppapigen:823: DeprecationWarning:
the imp module is deprecated in favour of importlib;
see the module's documentation for alternative uses

Change-Id: If7729778374e9193f6381c8bd2ed34c875db3f1e
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
---

diff --git a/src/tools/vppapigen/vppapigen.py b/src/tools/vppapigen/vppapigen.py
index 431a9dc7f93..c2f221b9e79 100755
--- a/src/tools/vppapigen/vppapigen.py
+++ b/src/tools/vppapigen/vppapigen.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/python3
 
 from __future__ import print_function
 import ply.lex as lex
@@ -165,10 +165,10 @@ class Using():
         self.name = name
 
         if isinstance(alias, Array):
-            a = { 'type': alias.fieldtype,
-                  'length': alias.length }
+            a = { 'type': alias.fieldtype,  # noqa: E201
+                  'length': alias.length }  # noqa: E202
         else:
-            a = { 'type': alias.fieldtype }
+            a = { 'type': alias.fieldtype }  # noqa: E201,E202
         self.alias = a
         self.crc = binascii.crc32(str(alias).encode()) & 0xffffffff
         global_crc = binascii.crc32(str(alias).encode(), global_crc)
@@ -820,7 +820,7 @@ def main():
     #
     # Generate representation
     #
-    import imp
+    from importlib.machinery import SourceFileLoader
 
     # Default path
     pluginpath = ''
@@ -843,7 +843,8 @@ def main():
                                              args.output_module.lower())
 
     try:
-        plugin = imp.load_source(args.output_module, module_path)
+        plugin = SourceFileLoader(args.output_module,
+                                  module_path).load_module()
     except Exception as err:
         raise Exception('Error importing output plugin: {}, {}'
                         .format(module_path, err))