Merge lp:~alanjds/beautifulsoup/prettify-improved into lp:beautifulsoup/3.2

[alanjds]

Hi.

I added an option to allow one to choose how many spaces to add per level, so I can use .prettify(spacesPerLevel=4), who I like more. Default remains to 1 more space per level.

Tests keep passing, and I tried to make the code easy to merge.

Best, Alan.

Unmerged revisions

45. By Alan Justino <alanjds@lgpill> on 2010-12-29

Version marked with branch owner

44. By Alan Justino <alanjds@lgpill> on 2010-12-29

Option 'spacesPerLevel' added to .prettify()

- It allows one to set number of spaces who indent the tags

=== modified file 'BeautifulSoup.py'
--- BeautifulSoup.py	2010-11-21 13:35:35 +0000
+++ BeautifulSoup.py	2010-12-29 22:58:46 +0000
@@ -79,7 +79,7 @@
 from __future__ import generators
 
 __author__ = "Leonard Richardson ([e-mail])"
-__version__ = "3.2.0"
+__version__ = "3.2.0-ajs"
 __copyright__ = "Copyright (c) 2004-2010 Leonard Richardson"
 __license__ = "New-style BSD"
 
@@ -691,7 +691,7 @@
         return "&" + self.XML_SPECIAL_CHARS_TO_ENTITIES[x.group(0)[0]] + ";"
 
     def __str__(self, encoding=DEFAULT_OUTPUT_ENCODING,
-                prettyPrint=False, indentLevel=0):
+                prettyPrint=False, indentLevel=0, spacesPerLevel=1):
         """Returns a string or Unicode representation of this tag and
         its contents. To get Unicode, pass None for encoding.
 
@@ -751,7 +751,10 @@
             indentTag = indentLevel
             space = (' ' * (indentTag-1))
             indentContents = indentTag + 1
-        contents = self.renderContents(encoding, prettyPrint, indentContents)
+            if indentLevel > 0:
+                indentContents += spacesPerLevel - 1
+            
+        contents = self.renderContents(encoding, prettyPrint, indentContents, spacesPerLevel)
         if self.hidden:
             s = contents
         else:
@@ -792,11 +795,11 @@
             current.nextSibling = None
             current = next
 
-    def prettify(self, encoding=DEFAULT_OUTPUT_ENCODING):
-        return self.__str__(encoding, True)
+    def prettify(self, encoding=DEFAULT_OUTPUT_ENCODING, spacesPerLevel=1):
+        return self.__str__(encoding, True, spacesPerLevel=spacesPerLevel)
 
     def renderContents(self, encoding=DEFAULT_OUTPUT_ENCODING,
-                       prettyPrint=False, indentLevel=0):
+                       prettyPrint=False, indentLevel=0, spacesPerLevel=1):
         """Renders the contents of this tag as a string in the given
         encoding. If encoding is None, returns a Unicode string.."""
         s=[]
@@ -805,7 +808,7 @@
             if isinstance(c, NavigableString):
                 text = c.__str__(encoding)
             elif isinstance(c, Tag):
-                s.append(c.__str__(encoding, prettyPrint, indentLevel))
+                s.append(c.__str__(encoding, prettyPrint, indentLevel, spacesPerLevel))
             if text and prettyPrint:
                 text = text.strip()
             if text: