diff options
| author | Hugo van Kemenade <hugovk@users.noreply.github.com> | 2019-10-20 12:58:52 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-20 12:58:52 +0300 |
| commit | 7879fef65a152f34238a6a415d998e6480e163c4 (patch) | |
| tree | d7795065d14600e927f86fe4fb67edbf592baf73 /src/tablib/packages | |
| parent | 825de0193ba049c6cfd06b32dfa01a4873bfd381 (diff) | |
| parent | b8bff1190e97184f475f7c9834123274599bcca4 (diff) | |
| download | tablib-7879fef65a152f34238a6a415d998e6480e163c4.tar.gz | |
Remove Python 2 code (#410)
Remove Python 2 code
Diffstat (limited to 'src/tablib/packages')
| -rw-r--r-- | src/tablib/packages/dbfpy/dbfnew.py | 2 | ||||
| -rw-r--r-- | src/tablib/packages/dbfpy/fields.py | 8 | ||||
| -rw-r--r-- | src/tablib/packages/dbfpy/utils.py | 3 |
3 files changed, 3 insertions, 10 deletions
diff --git a/src/tablib/packages/dbfpy/dbfnew.py b/src/tablib/packages/dbfpy/dbfnew.py index 29c09a1..1562021 100644 --- a/src/tablib/packages/dbfpy/dbfnew.py +++ b/src/tablib/packages/dbfpy/dbfnew.py @@ -176,7 +176,7 @@ if __name__ == '__main__': for i1 in range(len(dbft)): rec = dbft[i1] for fldName in dbft.fieldNames: - print('%s:\t %s' % (fldName, rec[fldName])) + print('{}:\t {}'.format(fldName, rec[fldName])) print() dbft.close() diff --git a/src/tablib/packages/dbfpy/fields.py b/src/tablib/packages/dbfpy/fields.py index c763e1e..d6ee84e 100644 --- a/src/tablib/packages/dbfpy/fields.py +++ b/src/tablib/packages/dbfpy/fields.py @@ -134,11 +134,7 @@ class DbfFieldDef: definition of this field. """ - if sys.version_info < (2, 4): - # earlier versions did not support padding character - _name = self.name[:11] + "\0" * (11 - len(self.name)) - else: - _name = self.name.ljust(11, '\0') + _name = self.name.ljust(11, '\0') return ( _name + self.typeCode + @@ -311,7 +307,7 @@ class DbfLogicalFieldDef(DbfFieldDef): return False if value in "YyTt": return True - raise ValueError("[%s] Invalid logical value %r" % (self.name, value)) + raise ValueError("[{}] Invalid logical value {!r}".format(self.name, value)) def encodeValue(self, value): """Return a character from the "TF?" set. diff --git a/src/tablib/packages/dbfpy/utils.py b/src/tablib/packages/dbfpy/utils.py index b3388a7..284d3ee 100644 --- a/src/tablib/packages/dbfpy/utils.py +++ b/src/tablib/packages/dbfpy/utils.py @@ -158,9 +158,6 @@ class _InvalidValue: def __str__(self): return "" - def __unicode__(self): - return "" - def __repr__(self): return "<INVALID>" |
