embee/pyaccuwage
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

run through 2to3

Browse source
This commit is contained in:
Mark Riedesel 2017-01-07 13:58:33 -06:00
parent 961aedc0ae
commit 16bf2c41d0
7 changed files with 82 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

22
pyaccuwage/fields.py
View file

@ -1,6 +1,6 @@
import decimal, datetime
import inspect
import enums
from . import enums
class ValidationError(Exception):
def __init__(self, msg, field=None):
@ -76,7 +76,7 @@ class Field(object):
required=o['required'],
)
if isinstance(o['value'], basestring) and re.match('^\d*\.\d*$', o['value']):
if isinstance(o['value'], str) and re.match('^\d*\.\d*$', o['value']):
o['value'] = decimal.Decimal(o['value'])
self.value = o['value']
@ -92,11 +92,11 @@ class Field(object):
value = wrapper.wrap(value)
#value = textwrap.wrap(value, 100)
#print value
value = list(map(lambda x:(" " * 9) + ('"' + x + '"'), value))
value = list([(" " * 9) + ('"' + x + '"') for x in value])
#value[0] = '"' + value[0] + '"'
value.append(" " * 10 + ('_' * 10) * (wrapper.width / 10))
value.append(" " * 10 + ('0123456789') * (wrapper.width / 10))
value.append(" " * 10 + ''.join((map(lambda x:str(x) + (' ' * 9), range(wrapper.width / 10 )))))
value.append(" " * 10 + ''.join(([str(x) + (' ' * 9) for x in range(wrapper.width / 10 )])))
#value.append((" " * 59) + map(lambda x:("%x" % x), range(16))
start = counter['c']
@ -130,7 +130,7 @@ class TextField(Field):
# NO NEWLINES
try:
value = value.replace('\n', '').replace('\r', '')
except AttributeError, e:
except AttributeError as e:
pass
self._value = value
@ -154,12 +154,12 @@ class StateField(TextField):
def validate(self):
super(StateField, self).validate()
if self.value and self.value.upper() not in enums.state_postal_numeric.keys():
if self.value and self.value.upper() not in list(enums.state_postal_numeric.keys()):
raise ValidationError("%s is not a valid state abbreviation" % self.value, field=self)
def parse(self, s):
if s.strip() and self.use_numeric:
states = dict( [(v,k) for (k,v) in enums.state_postal_numeric.items()] )
states = dict( [(v,k) for (k,v) in list(enums.state_postal_numeric.items())] )
self.value = states[int(s)]
else:
self.value = s
@ -269,7 +269,7 @@ class DateField(TextField):
def parse(self, s):
if int(s) > 0:
self.value = datetime.date(*[int(x) for x in s[4:8], s[0:2], s[2:4]])
self.value = datetime.date(*[int(x) for x in (s[4:8], s[0:2], s[2:4])])
else:
self.value = None
@ -277,7 +277,7 @@ class DateField(TextField):
if isinstance(value, datetime.date):
self._value = value
elif value:
self._value = datetime.date(*[int(x) for x in value[4:8], value[0:2], value[2:4]])
self._value = datetime.date(*[int(x) for x in (value[4:8], value[0:2], value[2:4])])
else:
self._value = None
@ -301,7 +301,7 @@ class MonthYearField(TextField):
def parse(self, s):
if int(s) > 0:
self.value = datetime.date(*[int(x) for x in s[2:6], s[0:2], 1])
self.value = datetime.date(*[int(x) for x in (s[2:6], s[0:2], 1)])
else:
self.value = None
@ -309,7 +309,7 @@ class MonthYearField(TextField):
if isinstance(value, datetime.date):
self._value = value
elif value:
self._value = datetime.date(*[int(x) for x in value[2:6], value[0:2], 1])
self._value = datetime.date(*[int(x) for x in (value[2:6], value[0:2], 1)])
else:
self._value = None