From 546b5afcf91992d26437b47107eb9433cb1656bb Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Wed, 14 Nov 2018 19:03:06 -0800 Subject: python tweaks for date/datetime rust fix --- python/fatcat_tools/importers/crossref.py | 7 ++----- python/fatcat_tools/transforms.py | 6 +----- 2 files changed, 3 insertions(+), 10 deletions(-) (limited to 'python/fatcat_tools') diff --git a/python/fatcat_tools/importers/crossref.py b/python/fatcat_tools/importers/crossref.py index 01143551..c4695c7f 100644 --- a/python/fatcat_tools/importers/crossref.py +++ b/python/fatcat_tools/importers/crossref.py @@ -203,14 +203,11 @@ class FatcatCrossrefImporter(FatcatImporter): # got some NoneType, even though at least year is supposed to be set release_date = None elif len(release_date) == 3: - release_date = datetime.datetime(year=release_date[0], month=release_date[1], day=release_date[2]) + release_date = datetime.date(year=release_date[0], month=release_date[1], day=release_date[2]) else: # only the year is actually required; mangle to first day for date # (TODO: something better?) - release_date = datetime.datetime(year=release_date[0], month=1, day=1) - # convert to string ISO datetime format (if not null) - if release_date: - release_date = release_date.isoformat() + "Z" + release_date = datetime.date(year=release_date[0], month=1, day=1) re = fatcat_client.ReleaseEntity( work_id=None, diff --git a/python/fatcat_tools/transforms.py b/python/fatcat_tools/transforms.py index ecaf3366..e10c6ba5 100644 --- a/python/fatcat_tools/transforms.py +++ b/python/fatcat_tools/transforms.py @@ -42,11 +42,7 @@ def release_elastic_dict(release): ) if release.release_date: - # TODO: resolve why this can be either a string or datetime - if type(release.release_date) == str: - t['release_date'] = release.release_date - else: - t['release_date'] = release.release_date.strftime('%F') + t['release_date'] = release.release_date.strftime('%F') container = release.container container_is_kept = False -- cgit v1.2.3