Mercurial Repositories > eric / file diff

--- a/E5XML/XMLStreamReaderBase.py	Tue Oct 15 22:03:54 2013 +0200
+++ b/E5XML/XMLStreamReaderBase.py	Fri Oct 18 23:00:41 2013 +0200
@@ -51,11 +51,14 @@
         """
         if self.hasError():
             msg = QCoreApplication.translate("XMLStreamReaderBase",
-                "<p>XML parse error in file <b>{0}</b>, line {1}, column {2}</p>"
-                "<p>Error: {3}</p>").format(self.device().fileName(),
-                    self.lineNumber(), self.columnNumber(), self.errorString())
+                "<p>XML parse error in file <b>{0}</b>, line {1},"
+                " column {2}</p><p>Error: {3}</p>").format(
+                    self.device().fileName(),
+                    self.lineNumber(), self.columnNumber(),
+                    self.errorString())
             E5MessageBox.warning(None,
-                QCoreApplication.translate("XMLStreamReaderBase", "XML parse error"),
+                QCoreApplication.translate(
+                "XMLStreamReaderBase", "XML parse error"),
                 msg)
     
     def raiseUnexpectedStartTag(self, tag):
@@ -97,6 +100,7 @@
         
         @param name name of the attribute (string)
         @param default default value (string)
+        @return value of the requested tag attribute (string)
         """
         att = self.attributes().value(name)
         if att == "":
@@ -132,7 +136,8 @@
                         val = None
                     elif self.name() == "int":
                         val = int(self.readElementText())
-                    elif self.name() == "long":     # backward compatibility to 4.6
+                    elif self.name() == "long":
+                        # backward compatibility to 4.6
                         val = int(self.readElementText())
                     elif self.name() == "bool":
                         b = self.readElementText()
@@ -147,15 +152,16 @@
                         val = float(real) + float(imag) * 1j
                     elif self.name() == "string":
                         val = self.readElementText()
-                    elif self.name() == "unicode":  # backward compatibility to 4.6
+                    elif self.name() == "unicode":
+                        # backward compatibility to 4.6
                         val = self.readElementText()
                     elif self.name() == "bytes":
-                        by = bytes(
-                            [int(b) for b in self.readElementText().split(",")])
+                        by = bytes([int(b) for b in 
+                                    self.readElementText().split(",")])
                         val = by
                     elif self.name() == "bytearray":
-                        by = bytearray(
-                            [int(b) for b in self.readElementText().split(",")])
+                        by = bytearray([int(b) for b in 
+                                        self.readElementText().split(",")])
                         val = by
                     elif self.name() == "tuple":
                         val = self.__readTuple()
@@ -177,8 +183,8 @@
                         if encoding != "base64":
                             self.raiseError(QCoreApplication.translate(
                                 "XMLStreamReaderBase",
-                                "Pickle data encoding '{0}' is not supported.")\
-                                    .format(encoding))
+                                "Pickle data encoding '{0}' is not"
+                                " supported.").format(encoding))
                             continue
                         b64 = self.readElementText()
                         pic = base64.b64decode(b64.encode("ASCII"))
@@ -190,7 +196,8 @@
                     continue
             
             if self.isEndElement():
-                if self.name() in ["tuple", "list", "dict", "set", "frozenset"]:
+                if self.name() in [
+                        "tuple", "list", "dict", "set", "frozenset"]:
                     return None
                 else:
                     return val
@@ -266,7 +273,9 @@
         l = []
         while not self.atEnd():
             val = self._readBasics()
-            if self.isEndElement() and self.name() == "frozenset" and val is None:
+            if self.isEndElement() and \
+                    self.name() == "frozenset" and \
+                    val is None:
                 return frozenset(l)
             else:
                 l.append(val)