clean up some indent

This commit is contained in:
Mark Riedesel 2019-01-27 10:36:37 -06:00
parent d08f1ca586
commit 7ddcfcc1c3
4 changed files with 331 additions and 340 deletions

View file

@ -300,7 +300,8 @@ countries = (
('EH', 'Western Sahara'), ('EH', 'Western Sahara'),
('YE', 'Yemen'), ('YE', 'Yemen'),
('ZM', 'Zambia'), ('ZM', 'Zambia'),
('ZW', 'Zimbabwe')) ('ZW', 'Zimbabwe'),
)
employer_types = ( employer_types = (

View file

@ -2,6 +2,7 @@ import decimal, datetime
import inspect import inspect
from . import enums from . import enums
class ValidationError(Exception): class ValidationError(Exception):
def __init__(self, msg, field=None): def __init__(self, msg, field=None):
self.msg = msg self.msg = msg
@ -90,14 +91,10 @@ class Field(object):
wrapper = textwrap.TextWrapper(replace_whitespace=False, drop_whitespace=False) wrapper = textwrap.TextWrapper(replace_whitespace=False, drop_whitespace=False)
wrapper.width = 100 wrapper.width = 100
value = wrapper.wrap(value) value = wrapper.wrap(value)
#value = textwrap.wrap(value, 100)
#print value
value = list([(" " * 9) + ('"' + x + '"') for x in value]) value = list([(" " * 9) + ('"' + x + '"') for x in value])
#value[0] = '"' + value[0] + '"'
value.append(" " * 10 + ('_' * 10) * (wrapper.width / 10)) value.append(" " * 10 + ('_' * 10) * (wrapper.width / 10))
value.append(" " * 10 + ('0123456789') * (wrapper.width / 10)) value.append(" " * 10 + ('0123456789') * (wrapper.width / 10))
value.append(" " * 10 + ''.join(([str(x) + (' ' * 9) for x in 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'] start = counter['c']
counter['c'] += len(self._orig_value or self.value) counter['c'] += len(self._orig_value or self.value)
@ -146,7 +143,6 @@ class StateField(TextField):
self.use_numeric = use_numeric self.use_numeric = use_numeric
def get_data(self): def get_data(self):
# value = str(self.value or 'XX').encode('ascii') or b''
value = str(self.value or 'XX') value = str(self.value or 'XX')
if value.strip() and self.use_numeric: if value.strip() and self.use_numeric:
postcode = enums.state_postal_numeric[value.upper()] postcode = enums.state_postal_numeric[value.upper()]
@ -199,6 +195,7 @@ class StaticField(TextField):
def parse(self, s): def parse(self, s):
pass pass
class BlankField(TextField): class BlankField(TextField):
def __init__(self, name=None, max_length=0, required=False): def __init__(self, name=None, max_length=0, required=False):
super(TextField, self).__init__(name=name, max_length=max_length, required=required, uppercase=False) super(TextField, self).__init__(name=name, max_length=max_length, required=required, uppercase=False)
@ -209,10 +206,12 @@ class BlankField(TextField):
def parse(self, s): def parse(self, s):
pass pass
class ZeroField(BlankField): class ZeroField(BlankField):
def get_data(self): def get_data(self):
return b'0' * self.max_length return b'0' * self.max_length
class CRLFField(TextField): class CRLFField(TextField):
def __init__(self, name=None, required=False): def __init__(self, name=None, required=False):
super(TextField, self).__init__(name=name, max_length=2, required=required, uppercase=False) super(TextField, self).__init__(name=name, max_length=2, required=required, uppercase=False)
@ -231,6 +230,7 @@ class CRLFField(TextField):
def parse(self, s): def parse(self, s):
self.value = s self.value = s
class BooleanField(Field): class BooleanField(Field):
def __init__(self, name=None, required=True, value=None): def __init__(self, name=None, required=True, value=None):
super(BooleanField, self).__init__(name=name, required=required, max_length=1) super(BooleanField, self).__init__(name=name, required=required, max_length=1)
@ -299,7 +299,6 @@ class DateField(TextField):
class MonthYearField(TextField): class MonthYearField(TextField):
def __init__(self, name=None, required=True, value=None): def __init__(self, name=None, required=True, value=None):
super(TextField, self).__init__(name=name, required=required, max_length=6) super(TextField, self).__init__(name=name, required=required, max_length=6)
if value: if value:
self.value = value self.value = value
@ -326,4 +325,3 @@ class MonthYearField(TextField):
return self._value return self._value
value = property(__getvalue, __setvalue) value = property(__getvalue, __setvalue)

View file

@ -86,10 +86,5 @@ class Model(object):
target._value = f._value target._value = f._value
#print (self.__dict__[f.name].name == f.name)
#self.__dict__[f.name].name == f.name
#self.__dict__[f.name].max_length == f.max_length
return self return self

View file

@ -1,5 +1,3 @@
#!/usr/bin/python
# coding=UTF-8
""" """
Parser utility to read data from Publication 1220 and Parser utility to read data from Publication 1220 and
convert it into python classes. convert it into python classes.
@ -146,8 +144,7 @@ class RecordBuilder(object):
(re.compile(r'zero\-filled', re.IGNORECASE), +1), (re.compile(r'zero\-filled', re.IGNORECASE), +1),
(re.compile(r'leading zeroes', re.IGNORECASE), +1), (re.compile(r'leading zeroes', re.IGNORECASE), +1),
(re.compile(r'left-\justif', re.IGNORECASE), -1), (re.compile(r'left\-justif', re.IGNORECASE), -1),
], ],
}, },
}), }),