b90364b34f
PR: 249549 PR: 249550 PR: 249570 PR: 249734 PR: 249735 PR: 249738 Approved by: desktop (tcberner) Obtained from: ArchLinux, see Bugzilla PRs for details
32 lines
1.2 KiB
Python
32 lines
1.2 KiB
Python
--- tools/libglibcodegen.py.orig 2011-07-07 15:24:48 UTC
|
|
+++ tools/libglibcodegen.py
|
|
@@ -191,7 +191,10 @@ class _SignatureIter:
|
|
def __init__(self, string):
|
|
self.remaining = string
|
|
|
|
- def next(self):
|
|
+ def __iter__(self):
|
|
+ self
|
|
+
|
|
+ def __next__(self):
|
|
if self.remaining == '':
|
|
raise StopIteration
|
|
|
|
@@ -297,7 +300,7 @@ def type_to_gtype(s):
|
|
return ("GHashTable *", "DBUS_TYPE_G_STRING_STRING_HASHTABLE", "BOXED", False)
|
|
elif s[:2] == 'a{': #some arbitrary hash tables
|
|
if s[2] not in ('y', 'b', 'n', 'q', 'i', 'u', 's', 'o', 'g'):
|
|
- raise Exception, "can't index a hashtable off non-basic type " + s
|
|
+ raise Exception("can't index a hashtable off non-basic type " + s)
|
|
first = type_to_gtype(s[2])
|
|
second = type_to_gtype(s[3:-1])
|
|
return ("GHashTable *", "(dbus_g_type_get_map (\"GHashTable\", " + first[1] + ", " + second[1] + "))", "BOXED", False)
|
|
@@ -312,7 +315,7 @@ def type_to_gtype(s):
|
|
return ("GValueArray *", gtype, "BOXED", True)
|
|
|
|
# we just don't know ..
|
|
- raise Exception, "don't know the GType for " + s
|
|
+ raise Exception("don't know the GType for " + s)
|
|
|
|
|
|
def xml_escape(s):
|