From: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Date: Fri, 27 Apr 2012 14:12:04 +0000 (+0100)
Subject: tracetool: avoid str.rpartition() Python 2.5 function
X-Git-Tag: v1.1-rc0~2^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b3ef0ade57ff29e33d3204ca2f48b1e36108116e;p=thirdparty%2Fqemu.git

tracetool: avoid str.rpartition() Python 2.5 function

The str.rpartition() function is related to str.split() and is used for
splitting strings.  It was introduced in Python 2.5 and therefore cannot
be used in tracetool as Python 2.4 compatibility is required.

Replace the code using str.rsplit().

Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Reviewed-by: Lluís Vilanova <vilanova@ac.upc.edu>
---

diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py
index 49858c9e33d..175df080052 100644
--- a/scripts/tracetool/__init__.py
+++ b/scripts/tracetool/__init__.py
@@ -64,14 +64,17 @@ class Arguments:
         res = []
         for arg in arg_str.split(","):
             arg = arg.strip()
-            parts = arg.split()
-            head, sep, tail = parts[-1].rpartition("*")
-            parts = parts[:-1]
-            if tail == "void":
-                assert len(parts) == 0 and sep == ""
+            if arg == 'void':
                 continue
-            arg_type = " ".join(parts + [ " ".join([head, sep]).strip() ]).strip()
-            res.append((arg_type, tail))
+
+            if '*' in arg:
+                arg_type, identifier = arg.rsplit('*', 1)
+                arg_type += '*'
+                identifier = identifier.strip()
+            else:
+                arg_type, identifier = arg.rsplit(None, 1)
+
+            res.append((arg_type, identifier))
         return Arguments(res)
 
     def __iter__(self):