odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] reports: remove some deprecation warnings 

bzr revid: odo@openerp.com-20100826141421-vdzkd4wv17w36gnr
This commit is contained in:
P. Christeas 2010-08-26 16:14:21 +02:00 committed by Olivier Dony
parent 1dec419270
commit 03dd95c34e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/report/pyPdf/generic.py
View File

@ -214,7 +214,8 @@ class FloatObject(decimal.Decimal, PdfObject):
class NumberObject(int, PdfObject): class NumberObject(int, PdfObject):
def __init__(self, value): def __init__(self, value):
int.__init__(self, value) int.__init__(self)
self = value
def writeToStream(self, stream, encryption_key): def writeToStream(self, stream, encryption_key):
stream.write(repr(self)) stream.write(repr(self))
@ -404,7 +405,8 @@ class NameObject(str, PdfObject):
delimiterCharacters = "(", ")", "<", ">", "[", "]", "{", "}", "/", "%" delimiterCharacters = "(", ")", "<", ">", "[", "]", "{", "}", "/", "%"
def __init__(self, data): def __init__(self, data):
str.__init__(self, data) str.__init__(self)
self = data
def writeToStream(self, stream, encryption_key): def writeToStream(self, stream, encryption_key):
stream.write(self) stream.write(self)

5
bin/report/pyPdf/pdf.py
View File

@ -50,7 +50,6 @@ import utils
import warnings import warnings
from generic import * from generic import *
from utils import readNonWhitespace, readUntilWhitespace, ConvertFunctionsToVirtualList from utils import readNonWhitespace, readUntilWhitespace, ConvertFunctionsToVirtualList
from sets import ImmutableSet
## ##
# This class supports writing PDF files out, given pages produced by another # This class supports writing PDF files out, given pages produced by another
@ -987,8 +986,8 @@ class PageObject(DictionaryObject):
# Combine /ProcSet sets. # Combine /ProcSet sets.
newResources[NameObject("/ProcSet")] = ArrayObject( newResources[NameObject("/ProcSet")] = ArrayObject(
ImmutableSet(originalResources.get("/ProcSet", ArrayObject()).getObject()).union( frozenset(originalResources.get("/ProcSet", ArrayObject()).getObject()).union(
ImmutableSet(page2Resources.get("/ProcSet", ArrayObject()).getObject()) frozenset(page2Resources.get("/ProcSet", ArrayObject()).getObject())
) )
) )