Skip to content

Commit e80c8ea

Browse files
committed
Convert to Python3
1 parent e6bc39a commit e80c8ea

File tree

9 files changed

+46
-46
lines changed

9 files changed

+46
-46
lines changed

PyFePA/fepa.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#
1616
###################################################################################################################
1717

18-
from fields import *
18+
from .fields import *
1919
import sys
2020

2121

@@ -24,14 +24,14 @@
2424
'RF11', 'RF12', 'RF13', 'RF14', 'RF15', 'RF16', 'RF17', 'RF18', 'RF19')
2525
SU = ('SU', 'SM')
2626
SL = ('LS', 'LN')
27-
TD = map(lambda td: 'TD{:0=2d}'.format(td), range(1, 6))
27+
TD = ['TD{:0=2d}'.format(td) for td in range(1, 6)]
2828
TR = ['RT01','RT01']
29-
TC = map(lambda tc: 'TC{:0=2d}'.format(tc), range(1,22))
30-
NT = map(lambda nt: 'NT{:0=2d}'.format(nt), range(1,7))
29+
TC = ['TC{:0=2d}'.format(tc) for tc in range(1,22)]
30+
NT = ['NT{:0=2d}'.format(nt) for nt in range(1,7)]
3131
TCP = ('SC', 'PR', 'AB', 'AC')
3232
SM = ('SC', 'MG')
3333
TP = ('TP01', 'TP02', 'TP03')
34-
MP = map(lambda mp: 'MP{:0=2d}'.format(mp), range(1,22))
34+
MP = ['MP{:0=2d}'.format(mp) for mp in range(1,22)]
3535
EI = ('I','D','S')
3636

3737

@@ -63,7 +63,7 @@ def __getattribute__(self, item):
6363

6464
def from_element(self, element):
6565

66-
for k, v in self.__class__.__dict__.items():
66+
for k, v in list(self.__class__.__dict__.items()):
6767
if isinstance(v,FieldType):
6868
tagg = [t for t in list(element) if str.lower(t.tag) == str.lower(k)]
6969
if len(tagg) == 1 or (v.multi and len(tagg) > 1):

PyFePA/fields.py

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ class FieldType(object):
2929
multi = False
3030

3131
def __init__(self, **kwargs):
32-
self.required = kwargs['required'] if kwargs.has_key('required') else False
33-
self.depend = kwargs['depend'] if kwargs.has_key('depend') else None
34-
self.conflict = kwargs['conflict'] if kwargs.has_key('conflict') else None
35-
self.code = kwargs['code'] if kwargs.has_key('code') else None
36-
self.multi = kwargs['multi'] if kwargs.has_key('multi') else False
32+
self.required = kwargs['required'] if 'required' in kwargs else False
33+
self.depend = kwargs['depend'] if 'depend' in kwargs else None
34+
self.conflict = kwargs['conflict'] if 'conflict' in kwargs else None
35+
self.code = kwargs['code'] if 'code' in kwargs else None
36+
self.multi = kwargs['multi'] if 'multi' in kwargs else False
3737

3838
def validate(self, value):
3939
retval = False
@@ -56,27 +56,27 @@ def validate(self, value):
5656
elif not (self.minlen and self.maxlen ):
5757
valid = True
5858
elif self.minlen and not self.maxlen :
59-
valid = self.minlen <= len(unicode(value))
59+
valid = self.minlen <= len(str(value))
6060
elif self.maxlen and not self.minlen:
61-
valid = len(unicode(value)) <= self.maxlen
61+
valid = len(str(value)) <= self.maxlen
6262
else:
63-
valid = self.minlen <= len(unicode(value)) <= self.maxlen
63+
valid = self.minlen <= len(str(value)) <= self.maxlen
6464

6565
if valid:
66-
return value if isinstance(value,(str,unicode)) else unicode(value)
66+
return value if isinstance(value,str) else str(value)
6767
else:
6868
return valid
6969

7070
def __init__(self, **kwargs):
7171

72-
self.minlen = kwargs['minlen'] if kwargs.has_key('minlen') else False
73-
self.maxlen = kwargs['maxlen'] if kwargs.has_key('maxlen') else False
72+
self.minlen = kwargs['minlen'] if 'minlen' in kwargs else False
73+
self.maxlen = kwargs['maxlen'] if 'maxlen' in kwargs else False
7474

7575
super(FieldString,self).__init__(**kwargs)
7676

7777
@classmethod
7878
def tostring(cls,value):
79-
return unicode(value)
79+
return str(value)
8080

8181

8282
class FieldCostant(FieldType):
@@ -87,20 +87,20 @@ class FieldCostant(FieldType):
8787
def validate(self, value):
8888
if super(FieldCostant,self).validate(value):
8989
return value
90-
elif unicode(value) in self.cvalue:
90+
elif str(value) in self.cvalue:
9191
return value
9292
else:
9393
return False
9494

9595
def __init__(self, **kwargs):
9696

97-
self.cvalue = kwargs['cvalue'] if kwargs.has_key('cvalue') else None
97+
self.cvalue = kwargs['cvalue'] if 'cvalue' in kwargs else None
9898

9999
super(FieldCostant,self).__init__(**kwargs)
100100

101101
@classmethod
102102
def tostring(cls,value):
103-
return unicode(value)
103+
return str(value)
104104

105105

106106
class FieldInteger(FieldType):
@@ -120,8 +120,8 @@ def validate(self, value):
120120

121121
def __init__(self, **kwargs):
122122

123-
self.minlen = kwargs['minlen'] if kwargs.has_key('minlen') else None
124-
self.maxlen = kwargs['maxlen'] if kwargs.has_key('maxlen') else None
123+
self.minlen = kwargs['minlen'] if 'minlen' in kwargs else None
124+
self.maxlen = kwargs['maxlen'] if 'maxlen' in kwargs else None
125125

126126
super(FieldInteger,self).__init__(**kwargs)
127127

@@ -143,13 +143,13 @@ def validate(self, value):
143143
elif self.minlen <= len('{:.2f}'.format(float(value))) <= self.maxlen:
144144
return float(value)
145145
except(ValueError, TypeError):
146-
print 'DEBUG- ', value
146+
print('DEBUG- ', value)
147147
return False
148148

149149
def __init__(self, **kwargs):
150150

151-
self.minlen = kwargs['minlen'] if kwargs.has_key('minlen') else None
152-
self.maxlen = kwargs['maxlen'] if kwargs.has_key('maxlen') else None
151+
self.minlen = kwargs['minlen'] if 'minlen' in kwargs else None
152+
self.maxlen = kwargs['maxlen'] if 'maxlen' in kwargs else None
153153

154154
super(FieldDecimal,self).__init__(**kwargs)
155155

@@ -209,7 +209,7 @@ def validate(self, value):
209209

210210
def __init__(self, **kwargs):
211211

212-
self.object_class = kwargs['object_class'] if kwargs.has_key('object_class') else False
212+
self.object_class = kwargs['object_class'] if 'object_class' in kwargs else False
213213
super(FieldObject,self).__init__(**kwargs)
214214

215215
@classmethod

PyFePA/sdi.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
#
1616
###################################################################################################################
1717

18-
from fields import *
19-
from fepa import GenFePA
18+
from .fields import *
19+
from .fepa import GenFePA
2020

2121
lxml = False
2222

@@ -134,4 +134,4 @@ class AttestazioneTrasmissioneFattura(GenFePA):
134134
test.DataOraRicezione = '2015-01-01'
135135
test.IdentificativoSdI = '12334'
136136

137-
print test
137+
print(test)

PyFePA/serializer.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class ValidateException(Exception):
3838
def validate(invoice_part):
3939

4040
taglist = {}
41-
for k, v in invoice_part.__class__.__dict__.items():
41+
for k, v in list(invoice_part.__class__.__dict__.items()):
4242
if isinstance(v, FieldType):
4343
value = invoice_part.__getattribute__(k)
4444
if value:
@@ -49,7 +49,7 @@ def validate(invoice_part):
4949
'conflict': v.conflict, 'required': v.required}
5050

5151
# Risolve Dipendenze e Conflitti
52-
for v in taglist.values():
52+
for v in list(taglist.values()):
5353
if v['value'] is not None and v['depend'] is not None:
5454
for d in v['depend']:
5555
if taglist[d]['value'] is None:
@@ -98,7 +98,7 @@ def globalvalidation(fattura):
9898
raise ValidateException('Denominazione Azienda Mancante')
9999
for feb in fattura.FatturaElettronicaBody:
100100
if feb.DatiGenerali.DatiGeneraliDocumento.Data > datetime.date.today():
101-
print feb.DatiGenerali.DatiGeneraliDocumento.Data, '- TODAY -', datetime.date.today()
101+
print(feb.DatiGenerali.DatiGeneraliDocumento.Data, '- TODAY -', datetime.date.today())
102102
raise ValidateException('00403 - Data Fattura non puo essere nel futuro')
103103
for ln in feb.DatiBeniServizi.DettaglioLinee:
104104
if ln.Ritenuta and not feb.DatiGenerali.DatiGeneraliDocumento.DatiRitenuta:

PyFePA/siamm.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818

1919
import datetime
20-
from utils import piva
20+
from .utils import piva
2121

2222
lxml = False
2323

@@ -120,7 +120,7 @@ def _siam_serialize(value):
120120

121121
intercettazioni = etree.Element('INTERCETTAZIONI')
122122
(etree.SubElement(intercettazioni, 'ID')).text = str(value['id']).upper() if 'id' in value else '1'
123-
(etree.SubElement(intercettazioni, 'BENEFICIARIO')).text = unicode(value['beneficiario'])
123+
(etree.SubElement(intercettazioni, 'BENEFICIARIO')).text = str(value['beneficiario'])
124124
(etree.SubElement(intercettazioni, 'TIPOPAGAMENTO')).text = value['tipopagamento'].upper()
125125
(etree.SubElement(intercettazioni, 'ENTEPAGANTE')).text = value['entepagante'].upper()
126126
(etree.SubElement(intercettazioni, 'DATAINIZIOPRESTAZIONE')).text = \
@@ -141,8 +141,8 @@ def _siam_serialize(value):
141141
(etree.SubElement(intercettazioni, 'NUMEROMODELLO37')).text = \
142142
fillprot(value['numeromodello37']) if 'numeromodello37' in value else None
143143
(etree.SubElement(intercettazioni, 'TIPOINTERCETTAZIONE')).text = value['tipointercettazione'].upper()
144-
(etree.SubElement(intercettazioni, 'NOMEMAGISTRATO')).text = unicode(value['nomemagistrato']).upper()
145-
(etree.SubElement(intercettazioni, 'COGNOMEMAGISTRATO')).text = unicode(value['cognomemagistrato']).upper()
144+
(etree.SubElement(intercettazioni, 'NOMEMAGISTRATO')).text = str(value['nomemagistrato']).upper()
145+
(etree.SubElement(intercettazioni, 'COGNOMEMAGISTRATO')).text = str(value['cognomemagistrato']).upper()
146146
(etree.SubElement(intercettazioni, 'DATAEMISSIONEPROVV')).text = \
147147
"{:%Y-%m-%dT%H:%M:%S}".format(value['dataemissioneprovv']) if 'dataemissioneprovv' in value \
148148
and value['dataemissioneprovv'] != '' else ''

PyFePA/test/build_fatturapa.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,4 +221,4 @@ def allegati(self):
221221
if __name__ == "__main__":
222222
fatturapa = FatturaPA()
223223
fpa = fatturapa.get_fatturapa()
224-
print serializer(fpa,'xml')
224+
print(serializer(fpa,'xml'))

PyFePA/test/test_fields.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ def testFiledString(self):
3838
sf = fields.FieldString(required=True, minlen=1, maxlen=12)
3939
sfb64 = fields.FieldString(required=True, minlen=1)
4040
self.assertEqual(tstr, sf.validate(tstr))
41-
self.assertEqual(unicode(tdate), sf.validate(tdate))
41+
self.assertEqual(str(tdate), sf.validate(tdate))
4242
self.assertEqual(False, sf.validate(tdatetime))
43-
self.assertEqual(unicode(tint), sf.validate(tint))
44-
self.assertEqual(unicode(tdec), sf.validate(tdec))
43+
self.assertEqual(str(tint), sf.validate(tint))
44+
self.assertEqual(str(tdec), sf.validate(tdec))
4545
self.assertEqual(False, sf.validate(tobj))
4646
self.assertEqual(tconst, sf.validate(tconst))
4747
self.assertEqual(False, sf.validate('abcdefghilmnop'))

PyFePA/utils.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ def piva(value):
2525
if (len(value) != 11) or not value.isdigit():
2626
return False
2727

28-
value = map(int, value)
29-
checksum = sum(map(lambda x: value[x], xrange(0, 10, 2)))
30-
checksum += sum(map(lambda x: (2 * value[x]) - 9 if (2 * value[x]) > 9 else (2 * value[x]) , xrange(1, 10, 2)))
28+
value = list(map(int, value))
29+
checksum = sum([value[x] for x in range(0, 10, 2)])
30+
checksum += sum([(2 * value[x]) - 9 if (2 * value[x]) > 9 else (2 * value[x]) for x in range(1, 10, 2)])
3131
checksum = 10 - (checksum % 10) if checksum % 10 != 0 else 0
3232

3333
return value[10] == checksum

runit.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
with open(DPATH+'/PyFePA/test/IT01234567890_11001.xml', 'rt') as f:
3535
tree = ElementTree.parse(f)
3636
fe = serializer.deserialize(element=tree)
37-
print serializer.serializer(fe,'xml')
37+
print(serializer.serializer(fe,'xml'))
3838

3939
testdata_list = [testdata,testdata,testdata]
40-
print siamm.serialize(testdata_list)
40+
print(siamm.serialize(testdata_list))

0 commit comments

Comments
 (0)