Changeset 745

Timestamp:

06/07/06 23:17:26 (2 years ago)

Author:

mfenniak

Message:

Begin adding some properties to the PdfFileReader? to make it easier to work with.

Files:

• pypdf/trunk/pyPdf/pdf.py (modified) (4 diffs)
• pypdf/trunk/pyPdf/utils.py (modified) (1 diff)

pypdf/trunk/pyPdf/pdf.py

@@ -45 +45 @@
-import filters
-from generic import *
-
+, ConvertFunctionsToVirtualList
-from sets import ImmutableSet
-
@@ -227 +227 @@
-        return retval
-
+    documentInfo = property(lambda self: self.getDocumentInfo(), None, None,
+            """See PdfFileReader.getDocumentInfo().  This property was added 
+            in pyPdf v1.7, and will exist for all future v1.x releases.""")
+
-    def getNumPages(self):
-        """
@@ -236 +240 @@
-            self._flatten()
-        return len(self.flattenedPages)
+
+    numPages = property(lambda self: self.getNumPages(), None, None,
+            """See PdfFileReader.getNamePages().  This property was added in
+            v1.7, and will exist for all future v1.x releases.""")
-
-    def getPage(self, pageNumber):
@@ -249 +257 @@
-            self._flatten()
-        return self.flattenedPages[pageNumber]
+
+    pages = property(lambda self: ConvertFunctionsToVirtualList(self.getNumPages, self.getPage),
+            None, None, """Returns a sequence of pages.  This property was
+            added in v1.7 and will exist for all future v1.x releases.""")
-
-    def _flatten(self, pages = None, inherit = None):

pypdf/trunk/pyPdf/utils.py

@@ -51 +51 @@
-        tok = stream.read(1)
-    return tok
+
+class ConvertFunctionsToVirtualList(object):
+    def __init__(self, lengthFunction, getFunction):
+        self.lengthFunction = lengthFunction
+        self.getFunction = getFunction
+
+    def __len__(self):
+        return self.lengthFunction()
+
+    def __getitem__(self, index):
+        if not isinstance(index, int):
+            raise TypeError, "sequence indices must be integers"
+        len_self = len(self)
+        if index < 0:
+            # support negative indexes
+            index = len_self + index
+        if index < 0 or index >= len_self:
+            raise IndexError, "sequence index out of range"
+        return self.getFunction(index)
+
+