patch maintenance

ferenda/devel.py

@@ -193,7 +193,7 @@ def format_exception():
                             pfp = StringIO(codecs.decode(pfp.read(), "rot13"))
                         try:
                             ps = PatchSet.from_stream(pfp)
-                            lines = text.split("\n"))
+                            lines = text.split("\n")
                             offsets = ps.patches[0].adjust(lines)
                             text = "\n".join(ps.patches[0].merge(lines))
                             if ps.patches[0].hunks[0].comment:

ferenda/pdfreader.py

@@ -579,8 +579,9 @@ def txt(element_text):
                     continue
                 assert element.tag == 'text', "Got <%s>, expected <text>" % element.tag
                 # eliminate "empty" textboxes, including "<text><i> </i></text>\n"
-                if element.text and txt(
-                        element.text).strip() == "" and not element.getchildren():
+                if (((element.text and txt(element.text).strip() == "") or
+                     (element.text is None)) and
+                    not element.getchildren()):
                     # print "Skipping empty box"
                     continue
                 if len(page) > 0:

ferenda/sources/legal/se/swedishlegalsource.py

@@ -621,7 +621,7 @@ def patch_if_needed(self, fp, basefile):
 
         # perform the patching, return the result as a stream, and add
         # an attribute with the description
-        lines = [l.rstrip() for l in fp.readlines()]
+        lines = [l.rstrip("\n") for l in fp.readlines()]
         offsets = ps.patches[0].adjust(lines)
         if any(offsets):
             self.log.warning("Patch source ranges had to be adjusted: %s" % offsets)

lagen/nu/res/patches/sfs/patches/1974/152.patch

@@ -0,0 +1,10 @@
+--- data/sfs/intermediate/1974/152.txt.bz2
++++ 
+@@ -234,6 +234,7 @@ Formattering av rubrik innan 2 kap 12 §
+ En rättegång ska genomföras rättvist och inom skälig tid.
+ Förhandling vid domstol ska vara offentlig. Lag
+ (2010:1408).
++
+ Skydd mot diskriminering
+
+ 12 § Lag eller annan föreskrift får inte innebära att någon