Nuke debug and rename some parameters

Signed-off-by: David Zeuthen <davidz@redhat.com>

1 files changed, 18 insertions, 70 deletions

diff --git a/src/dbustypes.py b/src/dbustypes.py
index e523917..b20173f 100644
--- a/src/dbustypes.py
+++ b/src/dbustypes.py
@@ -15,7 +15,7 @@ class Arg:
         self.annotations = []
         self.doc_string = ''
 
-    def post_process(self, strip_prefix, namespace, arg_number):
+    def post_process(self, c_strip_prefix, c_namespace, arg_number):
         if len(self.doc_string) == 0:
             self.doc_string = utils.lookup_docs(self.annotations)
 
@@ -151,8 +151,6 @@ class Arg:
                 self.format_in = '^aay'
                 self.format_out = '^aay'
 
-        #print '  arg: %s (sig=%s, ctype_in=%s, ctype_out=%s, gtype=%s)'%(self.name, self.signature, self.ctype_in, self.ctype_out, self.gtype)
-
 class Method:
     def __init__(self, name):
         self.name = name
@@ -161,7 +159,7 @@ class Method:
         self.annotations = []
         self.doc_string = ''
 
-    def post_process(self, strip_prefix, namespace):
+    def post_process(self, c_strip_prefix, c_namespace):
         if len(self.doc_string) == 0:
             self.doc_string = utils.lookup_docs(self.annotations)
 
@@ -175,25 +173,12 @@ class Method:
 
         arg_count = 0
         for a in self.in_args:
-            a.post_process(strip_prefix, namespace, arg_count)
+            a.post_process(c_strip_prefix, c_namespace, arg_count)
             arg_count += 1
 
         for a in self.out_args:
-            a.post_process(strip_prefix, namespace, arg_count)
+            a.post_process(c_strip_prefix, c_namespace, arg_count)
             arg_count += 1
-        #print ' --- method'
-        #print ' name:        ' + self.name
-        #print ' name_lower:  ' + self.name_lower
-
-        #self.in_args = []
-        #gdbus_in_args = gm.get_in_args()
-        #for a in gdbus_in_args:
-        #    self.in_args.append(Arg(a.name, a.signature, a.get_annotations()))
-
-        #self.out_args = []
-        #gdbus_out_args = gm.get_out_args()
-        #for a in gdbus_out_args:
-        #    self.out_args.append(Arg(a.name, a.signature, a.get_annotations()))
 
 class Signal:
     def __init__(self, name):
@@ -202,7 +187,7 @@ class Signal:
         self.annotations = []
         self.doc_string = ''
 
-    def post_process(self, strip_prefix, namespace):
+    def post_process(self, c_strip_prefix, c_namespace):
         if len(self.doc_string) == 0:
             self.doc_string = utils.lookup_docs(self.annotations)
 
@@ -213,13 +198,10 @@ class Signal:
 
         self.name_lower = utils.camel_case_to_uscore(name).lower().replace('-', '_')
         self.name_hyphen = self.name_lower.replace('_', '-')
-        #print ' --- signal'
-        #print ' name:        ' + self.name
-        #print ' name_lower:  ' + self.name_lower
 
         arg_count = 0
         for a in self.args:
-            a.post_process(strip_prefix, namespace, arg_count)
+            a.post_process(c_strip_prefix, c_namespace, arg_count)
             arg_count += 1
 
 class Property:
@@ -243,7 +225,7 @@ class Property:
             raise RuntimeError('Invalid access type %s'%self.access)
         self.doc_string = ''
 
-    def post_process(self, strip_prefix, namespace):
+    def post_process(self, c_strip_prefix, c_namespace):
         if len(self.doc_string) == 0:
             self.doc_string = utils.lookup_docs(self.annotations)
 
@@ -254,16 +236,10 @@ class Property:
 
         self.name_lower = utils.camel_case_to_uscore(name).lower().replace('-', '_')
         self.name_hyphen = self.name_lower.replace('_', '-')
-        #print ' --- property'
-        #print ' name:        ' + self.name
-        #print ' name_lower:  ' + self.name_lower
-        #print ' name_hyphen: ' + self.name_hyphen
-        #print ' readable:    %d'%self.readable
-        #print ' writable:    %d'%self.writable
 
         # recalculate arg
         self.arg.annotations = self.annotations
-        self.arg.post_process(strip_prefix, namespace, 0)
+        self.arg.post_process(c_strip_prefix, c_namespace, 0)
 
 class Interface:
     def __init__(self, name):
@@ -275,7 +251,7 @@ class Interface:
         self.doc_string = ''
         self.doc_string_brief = ''
 
-    def post_process(self, strip_prefix, namespace):
+    def post_process(self, c_strip_prefix, c_namespace):
         if len(self.doc_string) == 0:
             self.doc_string = utils.lookup_docs(self.annotations)
         if len(self.doc_string_brief) == 0:
@@ -286,53 +262,25 @@ class Interface:
             name = overridden_name
         else:
             name = self.name
-            if name.startswith(strip_prefix):
-                name = name[len(strip_prefix):]
+            if name.startswith(c_strip_prefix):
+                name = name[len(c_strip_prefix):]
         name = utils.strip_dots(name)
-        name_with_ns = utils.strip_dots(namespace + '.' + name)
+        name_with_ns = utils.strip_dots(c_namespace + '.' + name)
 
         self.camel_name = name_with_ns
-        if len(namespace) > 0:
-            self.ns_upper = utils.camel_case_to_uscore(namespace).upper() + '_'
-            self.name_lower = utils.camel_case_to_uscore(namespace) + '_' + utils.camel_case_to_uscore(name)
+        if len(c_namespace) > 0:
+            self.ns_upper = utils.camel_case_to_uscore(c_namespace).upper() + '_'
+            self.name_lower = utils.camel_case_to_uscore(c_namespace) + '_' + utils.camel_case_to_uscore(name)
         else:
             self.ns_upper = ''
             self.name_lower = utils.camel_case_to_uscore(name_with_ns)
         self.name_upper = utils.camel_case_to_uscore(name).upper()
 
         for m in self.methods:
-            m.post_process(strip_prefix, namespace)
+            m.post_process(c_strip_prefix, c_namespace)
 
         for s in self.signals:
-            s.post_process(strip_prefix, namespace)
+            s.post_process(c_strip_prefix, c_namespace)
 
         for p in self.properties:
-            p.post_process(strip_prefix, namespace)
-
-        #print '---'
-        #print 'interface:     ' + self.name
-        #print 'camel_name:    ' + self.camel_name
-        #print 'ns_upper:      ' + self.ns_upper
-        #print 'name_upper:    ' + self.name_upper
-        #print 'name_lower:    ' + self.name_lower
-        #print ' name:         ' + name
-        #print ' namespace:    ' + namespace
-        #print ' name_with_ns: ' + name_with_ns
-        #
-        # interface:  org.project.Bar.Frobnicator
-        # camel_name: FooBarFrobnicator
-        # ns_upper:   FOO_
-        # name_upper: BAR_FROBNICATOR
-        # name_lower: foo_bar_frobnicator
-
-        #gdbus_methods = gi.get_methods()
-        #for gm in gdbus_methods:
-        #    self.methods.append(Method(gm))
-
-        #gdbus_signals = gi.get_signals()
-        #for gs in gdbus_signals:
-        #    self.signals.append(Signal(gs))
-
-        #gdbus_properties = gi.get_properties()
-        #for gp in gdbus_properties:
-        #    self.properties.append(Property(gp))
+            p.post_process(c_strip_prefix, c_namespace)