Changeset 71:e85e3e1854c0

Timestamp:

11/07/08 10:00:06 (16 months ago)

Author:

Nicolas ?vrard <nicoe@…>

Branch:

default

Message:

Adapt opendocument.py to avoid name clash with genshi interface

Files:

• relatorio/templates/opendocument.py (modified) (3 diffs)

relatorio/templates/opendocument.py

@@ -89 +89 @@
         It adds genshi directives and finds the inner docs.
         """
-        inzip = zipfile.ZipFile(self.filepath)
-        content = inzip.read('content.xml')
-        styles = inzip.read('styles.xml')
+        zf = zipfile.ZipFile(self.filepath)
+        content = zf.read('content.xml')
+        styles = zf.read('styles.xml')
 
         template = super(Template, self)
-        content = template._parse(self.add_directives(content), encoding)
-        styles = template._parse(self.add_directives(styles), encoding)
+        content = template._parse(self.insert_directives(content), encoding)
+        styles = template._parse(self.insert_directives(styles), encoding)
         content_files = [('content.xml', content)]
         styles_files = [('styles.xml', styles)]
@@ -102 +102 @@
             doc = self.inner_docs.pop()
             c_path, s_path = doc + '/content.xml', doc + '/styles.xml'
-            content = inzip.read(c_path)
-            styles = inzip.read(s_path)
+            content = zf.read(c_path)
+            styles = zf.read(s_path)
             
-            c_parsed = template._parse(self.add_directives(inzip.read(c_path)),
+            c_parsed = template._parse(self.insert_directives(zf.read(c_path)),
                                        encoding)
-            s_parsed = template._parse(self.add_directives(inzip.read(s_path)),
+            s_parsed = template._parse(self.insert_directives(zf.read(s_path)),
                                        encoding)
             content_files.append((c_path, c_parsed))
             styles_files.append((s_path, s_parsed))
 
-        inzip.close()
+        zf.close()
         parsed = []
         for fpath, fparsed in content_files + styles_files:
@@ -120 +120 @@
         return parsed
 
-    def add_directives(self, content):
+    def insert_directives(self, content):
         """adds to genshi directives, handle the images and the innerdocs.
         """