Mercurial Repositories > eric / changeset

--- a/E5XML/MultiProjectReader.py	Sun Sep 12 19:44:54 2010 +0200
+++ b/E5XML/MultiProjectReader.py	Mon Sep 13 08:32:36 2010 +0200
@@ -45,8 +45,7 @@
                     if self.version not in self.supportedVersions:
                         self.raiseUnsupportedFormatVersion(self.version)
                 elif self.name() == "Description":
-                    self.multiProject.description = self.decodedNewLines(
-                        self.readElementText())
+                    self.multiProject.description = self.readElementText()
                 elif self.name() == "Projects":
                     self.__readProjects()
                 else:
@@ -89,6 +88,6 @@
                 elif self.name() == "ProjectFile":
                     project["file"] = Utilities.toNativeSeparators(self.readElementText())
                 elif self.name() == "ProjectDescription":
-                    project["description"] = self.decodedNewLines(self.readElementText())
+                    project["description"] = self.readElementText()
                 else:
                     self.raiseUnexpectedStartTag(self.name())

--- a/E5XML/MultiProjectWriter.py	Sun Sep 12 19:44:54 2010 +0200
+++ b/E5XML/MultiProjectWriter.py	Mon Sep 13 08:32:36 2010 +0200
@@ -53,8 +53,7 @@
         self.writeAttribute("version", multiProjectFileFormatVersion)
         
         # do description
-        self.writeTextElement("Description", 
-            self.encodedNewLines(self.multiProject.description))
+        self.writeTextElement("Description", self.multiProject.description)
         
         # do the projects
         self.writeStartElement("Projects")
@@ -64,8 +63,7 @@
             self.writeTextElement("ProjectName", project['name'])
             self.writeTextElement("ProjectFile", 
                 Utilities.fromNativeSeparators(project['file']))
-            self.writeTextElement("ProjectDescription", 
-                self.encodedNewLines(project['description']))
+            self.writeTextElement("ProjectDescription", project['description'])
             self.writeEndElement()
         self.writeEndElement()
         

--- a/E5XML/XMLStreamReaderBase.py	Sun Sep 12 19:44:54 2010 +0200
+++ b/E5XML/XMLStreamReaderBase.py	Mon Sep 13 08:32:36 2010 +0200
@@ -25,17 +25,6 @@
         @param device reference to the I/O device to read from (QIODevice)
         """
         QXmlStreamReader.__init__(self, device)
-        
-        self.NEWPARA = chr(0x2029)
-        self.NEWLINE = chr(0x2028)
-    
-    def decodedNewLines(self, text):
-        """
-        Public method to decode newlines and paragraph breaks.
-        
-        @param text text to decode (string)
-        """
-        return text.replace(self.NEWPARA, "\n\n").replace(self.NEWLINE, "\n")
     
     def toBool(self, value):
         """

--- a/E5XML/XMLStreamWriterBase.py	Sun Sep 12 19:44:54 2010 +0200
+++ b/E5XML/XMLStreamWriterBase.py	Mon Sep 13 08:32:36 2010 +0200
@@ -40,9 +40,6 @@
             frozenset  : self._write_frozenset, 
         }
         
-        self.NEWPARA = chr(0x2029)
-        self.NEWLINE = chr(0x2028)
-        
         self.setAutoFormatting(True)
         self.setAutoFormattingIndent(2)
     
@@ -53,14 +50,6 @@
         # write the XML header
         self.writeStartDocument()
     
-    def encodedNewLines(self, text):
-        """
-        Public method to encode newlines and paragraph breaks.
-        
-        @param text text to encode (string)
-        """
-        return text.replace("\n\n", self.NEWPARA).replace("\n", self.NEWLINE)
-    
     def _writeBasics(self, pyobject):
         """
         Protected method to dump an object of a basic Python type.