commit 18ce803d1e2a6a1779d38f7bf5279901b02583e0
author Patrick Williams <patrick@stwcx.xyz> Fri Jan 31 18:47:38 2020 -0800
committer Patrick Williams <patrick@stwcx.xyz> Wed Apr 01 13:43:35 2020 +0000
tree 699c1035c609cdf44d7bf909a45e5fac71b7f0ee
parent ddc0eba2bea1f55dff275726903deecd88ac6f3d

sdbus++: switch to python3

Python2 is DEAD!  Long live Python3!

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Ifd46a4aeb41fb0e6db2f4310a603b727a5a2c2ff

configure.ac

diff --git a/configure.ac b/configure.ac
index 11c189b..ec65562 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@
 AC_PROG_MAKE_SET
 
 # setup sdbus++
-AM_PATH_PYTHON([2.7], [AC_SUBST([PYTHON], [echo "$PYTHON"])])
+AM_PATH_PYTHON([3.0], [AC_SUBST([PYTHON], [echo "$PYTHON"])])
 AC_SUBST([PYTHONDIR], ${pythondir})
 AS_IF([test "$PYTHON" != :], [have_python=yes], [have_python=no])
 

tools/sdbus++

diff --git a/tools/sdbus++ b/tools/sdbus++
index 6cfcb9e..fa12677 100755
--- a/tools/sdbus++
+++ b/tools/sdbus++
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import sdbusplus
 import mako.lookup
 import argparse
@@ -35,11 +35,7 @@
 
     args = parser.parse_args()
 
-    if sys.version_info < (3, 0):
-        lookup = mako.lookup.TemplateLookup(directories=[args.templatedir],
-                                            disable_unicode=True)
-    else:
-        lookup = mako.lookup.TemplateLookup(directories=[args.templatedir])
+    lookup = mako.lookup.TemplateLookup(directories=[args.templatedir])
 
     instance = valid_types[args.typeName].load(args.item, args.rootdir)
     function = getattr(instance, valid_processes[args.process])

tools/sdbusplus/namedelement.py

diff --git a/tools/sdbusplus/namedelement.py b/tools/sdbusplus/namedelement.py
index 5048654..1548ef0 100644
--- a/tools/sdbusplus/namedelement.py
+++ b/tools/sdbusplus/namedelement.py
@@ -7,7 +7,7 @@
         self.name = kwargs.pop('name', "unnamed")
         self.description = kwargs.pop('description', "")
 
-    def __getattr__(self, name):
+    def __getattribute__(self, name):
         l = {'CamelCase': lambda: inflection.camelize(self.name),
              'camelCase': lambda: inflection.camelize(self.name, False),
              'snake_case': lambda: inflection.underscore(self.name)}\
@@ -16,7 +16,7 @@
         if l:
             return NamedElement.__fixup_name(l())
         try:
-            return super(NamedElement, self).__getattr__(name)
+            return super(NamedElement, self).__getattribute__(name)
         except:
             raise AttributeError("Attribute '%s' not found in %s.NamedElement"
                                  % (name, self.__module__))