Skip to content

Commit

Permalink
Revert "Multiple Fix and enhancement (py-pdf#75)" (py-pdf#77)
Browse files Browse the repository at this point in the history 
This reverts commit f72745e.
  • Loading branch information
@claird
claird authored Jun 21, 2020
1 parent d56af5e commit a3deffb
Show file tree
Hide file tree
Showing 9 changed files with 113 additions and 1,239 deletions.
12 changes: 4 additions & 8 deletions pypdf/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
from .pdf import PdfFileReader, PdfFileWriter
from .generic import *
from .merger import PdfFileMerger
from .pagerange import PageRange
from ._version import __version__
from pypdf.pdf import PdfFileReader, PdfFileWriter
from pypdf.merger import PdfFileMerger
from pypdf.pagerange import PageRange
from pypdf._version import __version__


__all__ = [
# Basic PyPDF elements
"PdfFileReader", "PdfFileWriter", "PdfFileMerger", "PageRange",
# most used elements from generic
"BooleanObject","ArrayObject","IndirectObject","FloatObject","NumberObject","createStringObject",
"TextStringObject","NameObject","DictionaryObject","TreeObject","Destination","PageLabel","Bookmark",
# PyPDF modules
"pdf", "generic", "utils", "filters", "merger", "pagerange", "xmp"
]
2 changes: 1 addition & 1 deletion pypdf/_version.py
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '1.27.0PPzz'
__version__ = '1.27.0'
10 changes: 5 additions & 5 deletions pypdf/filters.py
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# -*- coding: UTF-8 -*-
# vim: sw=4:expandtab:foldmethod=marker
#
# Copyright (c) 2006, Mathieu Fenniak
Expand Down Expand Up @@ -30,14 +31,13 @@
Implementation of stream filters for PDF.
"""

import math
import base64
import struct
from sys import version_info

from . import generic
from .generic import *
from .utils import PdfReadError, pypdfOrd, paethPredictor,PdfStreamError
from pypdf import generic
from pypdf.generic import *
from pypdf.utils import PdfReadError, pypdfOrd, paethPredictor, PdfStreamError

try:
import zlib
Expand Down Expand Up @@ -193,7 +193,7 @@ def decode(data, decodeParms=None):

prev_rowdata = rowdata

for d in rowdata[1:]: ##ppZZ ???? err in latest version
for d in rowdata:
if version_info < (3, 0):
output.write(chr(d))
else:
Expand Down
197 changes: 5 additions & 192 deletions pypdf/generic.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,8 @@
import warnings
from io import BytesIO

#from . import utils
from .utils import *
from .utils import pypdfUnicode as u_, pypdfBytes as b_
from pypdf.utils import *
from pypdf.utils import pypdfBytes as b_, pypdfUnicode as u_

__author__ = "Mathieu Fenniak"
__author_email__ = "[email protected]"
Expand Down Expand Up @@ -99,10 +98,6 @@ def getObject(self):
"""Resolves indirect references."""
return self

def clone(self,pdfD): #PPzz
""" clone object into pdfD """
raise Exception("clone PdfObject")
return self

# TO-DO Add __repr_() implementations to the *Object classes
class NullObject(PdfObject):
Expand All @@ -119,19 +114,10 @@ def readFromStream(stream):
return NullObject()


def clone(self,pdfD): #PPzz
""" clone object into pdfD """
return NullObject()


class BooleanObject(PdfObject):
def __init__(self, value):
self.value = value

def clone(self,pdfD): #PPzz
""" clone object into pdfD """
return BooleanObject(self.value)

def writeToStream(self, stream, encryption_key):
if self.value:
stream.write(b_("true"))
Expand All @@ -153,17 +139,6 @@ def readFromStream(stream):


class ArrayObject(list, PdfObject):

def clone(self,pdfD): #PPzz
""" clone object into pdfD """
arr = ArrayObject()
for data in self:
if 'clone' in dir(data):
arr.append(data.clone(pdfD))
else:
arr.append(data)
return arr

def writeToStream(self, stream, encryption_key):
stream.write(b_("["))

Expand Down Expand Up @@ -221,22 +196,6 @@ def __init__(self, idnum, generation, pdf):
self.generation = generation
self.pdf = pdf

def clone(self,pdfD): #PPzz
""" clone object into pdfD """
try: pdfD._IdTranslated
except:
pdfD._IdTranslated={}
try:
n=pdfD._IdTranslated[self.idnum]
except:
n=len(pdfD._objects)+1
pdfD._IdTranslated[self.idnum]=n
pdfD._objects.append("%d NotInit"%n)
o=self.getObject().clone(pdfD)
pdfD._objects[n-1]=o

return IndirectObject(n,0,pdfD)

def getObject(self):
return self.pdf.getObject(self).getObject()

Expand Down Expand Up @@ -306,10 +265,6 @@ def __new__(cls, value="0", context=None):
except:
return decimal.Decimal.__new__(cls, str(value))

def clone(self,pdfD): #PPzz
""" clone object into pdfD """
return FloatObject(self.asNumeric())

def __repr__(self):
if self == self.to_integral():
return str(self.quantize(decimal.Decimal(1)))
Expand Down Expand Up @@ -339,10 +294,6 @@ def __new__(cls, value):
except OverflowError:
return int.__new__(cls, 0)

def clone(self,pdfD): #PPzz
""" clone object into pdfD """
return NumberObject(self.asNumeric())

def asNumeric(self):
return int(b_(repr(self)))

Expand Down Expand Up @@ -493,10 +444,6 @@ class ByteStringObject(bytes_type, PdfObject):
# returns self.
original_bytes = property(lambda self: self)

def clone(self,pdfD): #PPzz
""" clone object into pdfD """
return ByteStringObject(self)

def writeToStream(self, stream, encryption_key):
bytearr = self

Expand Down Expand Up @@ -524,10 +471,6 @@ class TextStringObject(string_type, PdfObject):
# back-calculate what the original encoded bytes were.
original_bytes = property(lambda self: self.getOriginalBytes())

def clone(self,pdfD): #PPzz
""" clone object into pdfD """
return createStringObject(self)

def getOriginalBytes(self):
# We're a text string object, but the library is trying to get our raw
# bytes. This can happen if we auto-detected this string as text, but
Expand Down Expand Up @@ -570,10 +513,6 @@ class NameObject(str, PdfObject):
delimiterPattern = re.compile(b_(r"\s+|[\(\)<>\[\]{}/%]"))
surfix = b_("/")

def clone(self,pdfD): #PPzz
""" clone object into pdfD """
return NameObject(self)

def writeToStream(self, stream, encryption_key):
stream.write(b_(self))

Expand Down Expand Up @@ -610,15 +549,6 @@ def readFromStream(stream, pdf):


class DictionaryObject(dict, PdfObject):

def clone(self,pdfD): #PPzz
""" clone object into pdfD """
d=DictionaryObject()
for k,v in self.items():
d.update({(k.clone(k) if 'clone' in dir(k) else k):
(v.clone(pdfD) if 'clone' in dir(v) else v) })
return d

def rawGet(self, key):
return dict.__getitem__(self, key)

Expand Down Expand Up @@ -804,15 +734,7 @@ def readFromStream(stream, pdf):

class TreeObject(DictionaryObject):
def __init__(self):
DictionaryObject.__init__(self)

def clone(self,pdfD): #PPzz
""" clone object into pdfD """
raise Exception("clone TreeObject",self)
obj=TreeObject()
for k,v in self.items():
obj.addChild(v.clone(pdfD),pdfD)
return obj
DictionaryObject.__init__()

def hasChildren(self):
return '/First' in self
Expand Down Expand Up @@ -953,14 +875,6 @@ def __init__(self):
self._data = None
self.decodedSelf = None

def clone(self,pdfD): #PPzz
""" clone object into pdfD """
st=self.__class__()
st._data=self._data
st.decodedSelf=self.decodedSelf
st.update(self)
return self

def writeToStream(self, stream, encryption_key):
self[NameObject("/Length")] = NumberObject(len(self._data))
DictionaryObject.writeToStream(self, stream, encryption_key)
Expand Down Expand Up @@ -992,7 +906,7 @@ def initializeFromDictionary(data):
return retval

def flateEncode(self):
from .filters import FlateCodec
from pypdf.filters import FlateCodec

if "/Filter" in self:
f = self["/Filter"]
Expand Down Expand Up @@ -1020,7 +934,7 @@ def __init__(self):
self.decodedSelf = None

def getData(self):
from .filters import decodeStreamData
from pypdf.filters import decodeStreamData

if self.decodedSelf:
# Cached version of decoded object
Expand Down Expand Up @@ -2184,7 +2098,6 @@ def __init__(self, title, page, typ, *args):
self[NameObject("/Title")] = title
self[NameObject("/Page")] = page
self[NameObject("/Type")] = typ
self.parent=None #PPzz

# from table 8.2 of the PDF 1.7 reference.
if typ == "/XYZ":
Expand Down Expand Up @@ -2282,106 +2195,6 @@ def writeToStream(self, stream, encryption_key):
:rtype: ``int``, or ``None`` if not available.
"""

class PageLabel():
def __init__(self,pn=0,defObject=None):
"""
:param
integer pn: 1st Page of the group
defObject: tuple (1stPage,prefix,increment) or DictionnaryObject from the file
"""

if defObject is None:
defObject = DictionaryObject()

try:
if type(defObject) != tuple:
self.prefix=defObject['/P']
else:
self.prefix=defObject[1]+""#None will induce and error and reach default value
except:
self.prefix=''

try:
if type(defObject) != tuple:
self.numbering=defObject['/S']
else:
self.numbering=defObject[2]+""#None will induce and error and reach default value
except:
self.numbering='/D' if self.prefix == "" else ""

self.pn=pn #1st page of the range
try:
if type(defObject) != tuple:
self.first=int(defObject['/St'])-pn
else:
self.first=max(1,int(defObject[0]))-pn #None will induce and error and reach default value
except:
self.first=1-pn

def __repr__(self):
return "PageLabel Obj(@%r :%s-%s)" % (self.first, self.prefix, self.numbering)

def buildDefinition(self,pn=None):
"""
build the DictionnaryObjecgt to inject into the PDF
"""
o=DictionaryObject()
if self.numbering!='/D' or self.prefix!='':
o.update({ NameObject("/S"):NameObject(self.numbering) })
if self.prefix!='':
o.update({ NameObject("/P"):NameObject(self.prefix) })
if pn==None:
o.update({ NameObject("/St"):NumberObject(self.first+self.pn) })
elif pn==0:
pass; #No start value
else:
o.update({ NameObject("/St"):NumberObject(pn) })
return o

def getLabel(self,pn):
def int_to_Roman(num):
val = [
1000, 900, 500, 400,
100, 90, 50, 40,
10, 9, 5, 4,
1
]
syb = [
"M", "CM", "D", "CD",
"C", "XC", "L", "XL",
"X", "IX", "V", "IV",
"I"
]
roman_num = ''
i = 0
while num > 0:
for _ in range(num // val[i]):
roman_num += syb[i]
num -= val[i]
i += 1
return roman_num

def int_to_Alpha(num):
t=""
while(num>0):
num=num-1
t=chr(num%26+65)+t
num=num//26
return t
if self.numbering=='/D':
st=str(pn+self.first)
elif self.numbering=='/R':
st=int_to_Roman(pn+self.first)
elif self.numbering=='/r':
st=int_to_Roman(pn+self.first).lower()
elif self.numbering=='/A':
st=int_to_Alpha(pn+self.first)
elif self.numbering=='/a':
st=int_to_Alpha(pn+self.first).lower()
else:
st=''
return self.prefix+st


class Bookmark(Destination):
def writeToStream(self, stream, encryption_key):
Expand Down
7 changes: 2 additions & 5 deletions pypdf/merger.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,12 +207,9 @@ def append(self, fileobj, bookmark=None, pages=None, importBookmarks=True):
"""
self.merge(len(self._pages), fileobj, bookmark, pages, importBookmarks)

def write(self, fileobj=None):
def write(self):
"""
Writes all data that has been merged to the given output file.
:param fileobj: Output file. Can be a filename or any kind of
file-like object.
"""
for page in self._pages:
self._writer.addPage(page.pagedata)
Expand All @@ -225,7 +222,7 @@ def write(self, fileobj=None):
self._writeBookmarks()

# Write the output to the file
self._writer.write(fileobj)
self._writer.write()

def close(self):
"""
Expand Down
Loading

0 comments on commit a3deffb

Please sign in to comment.