More cleanup, removal of unused variables.

Chris Glass · Chris Glass · commit 4cde2adf7dc6 · 2011-05-19T11:56:27.000+02:00
diff --git a/sx/pisa3/pisa_context.py b/sx/pisa3/pisa_context.py
@@ -400,7 +400,6 @@ def parseExternal(self, cssResourceName):
         # print "@import", self.rootPath, cssResourceName
         oldRootPath = self.rootPath
         cssFile = self.c.getFile(cssResourceName, relative=self.rootPath)
-        result = []
         if not cssFile:
             return None
         if self.rootPath and urlparse.urlparse(self.rootPath).scheme:
diff --git a/sx/pisa3/pisa_document.py b/sx/pisa3/pisa_document.py
@@ -33,12 +33,12 @@
 def pisaErrorDocument(dest, c):
     out = pisaTempFile(capacity=c.capacity)
     out.write("<p style='background-color:red;'><strong>%d error(s) occured:</strong><p>" % c.err)
-    for mode, line, msg, code in c.log:
+    for mode, line, msg, _ in c.log:
         if mode=="error":
             out.write("<pre>%s in line %d: %s</pre>" % (mode, line, cgi.escape(msg)))
 
     out.write("<p><strong>%d warning(s) occured:</strong><p>" % c.warn)
-    for mode, line, msg, code in c.log:
+    for mode, line, msg, _ in c.log:
         if mode=="warning":
             out.write("<p>%s in line %d: %s</p>" % (mode, line, cgi.escape(msg)))
 
diff --git a/sx/pisa3/pisa_paragraph.py b/sx/pisa3/pisa_paragraph.py
@@ -350,7 +350,6 @@ def splitIntoLines(self, maxWidth, maxHeight, splitted=False):
 
             # Reset values for new line
             posBegin = pos
-            posSpace = pos
             line = Line(style)
 
             # Update boxes for next line
@@ -375,14 +374,12 @@ def splitIntoLines(self, maxWidth, maxHeight, splitted=False):
                 # If space or linebreak handle special way
                 if frag.isSoft:
                     if frag.isLF:
-                        posSpace = pos
                         line.append(frag)
                         break
                     # First element of line should not be a space
                     if x == 0:
                         continue
                     # Keep in mind last possible line break
-                    posSpace = pos - 1
 
                 # The elements exceed the current line
                 elif (fragWidth + x > maxWidth):
@@ -481,8 +478,6 @@ def wrap(self, availWidth, availHeight):
                 print "*** wrap (%f, %f) needed" % (0, 0)
             return 0, 0
 
-        style = self.style
-
         # Split lines
         width = availWidth # - style.leftIndent - style.rightIndent
         self.splitIndex = self.text.splitIntoLines(width, availHeight)
diff --git a/sx/pisa3/pisa_paragraph2.py b/sx/pisa3/pisa_paragraph2.py
@@ -467,7 +467,7 @@ def splitIntoLines(self, maxWidth, maxHeight, splitted=False):
                     x += frag["width"]
                     line.append(frag)
 
-                   # Keep in mind boxes for next lines
+                    # Keep in mind boxes for next lines
                     if isinstance(frag, BoxBegin):
                         boxStack.append(frag)
                     elif isinstance(frag, BoxEnd):
@@ -563,8 +563,6 @@ def wrap(self, availWidth, availHeight):
                 print "*** wrap (%f, %f) needed" % (0, 0)
             return 0, 0
 
-        style = self.style
-
         # Split lines
         width = availWidth # - style.leftIndent - style.rightIndent
         self.splitIndex = self.text.splitIntoLines(width, availHeight)
