From 907442e62dc16139e02fff849981b10c11fac57a Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Thu, 22 Aug 2019 15:10:43 +0200 Subject: [PATCH] Fix postgresql metadata setting on python 3 --- lib/galaxy/datatypes/binary.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/galaxy/datatypes/binary.py b/lib/galaxy/datatypes/binary.py index ad93dbc658f..83d203c2f6c 100644 --- a/lib/galaxy/datatypes/binary.py +++ b/lib/galaxy/datatypes/binary.py @@ -1953,17 +1953,14 @@ class PostgresqlArchive(CompressedArchive): if dataset and tarfile.is_tarfile(dataset.file_name): with tarfile.open(dataset.file_name, 'r') as temptar: pg_version_file = temptar.extractfile('postgresql/db/PG_VERSION') - dataset.metadata.version = pg_version_file.read().strip() + dataset.metadata.version = util.unicodify(pg_version_file.read()).strip() except Exception as e: - log.warning('%s, set_meta Exception: %s', self, e) + log.warning('%s, set_meta Exception: %s', self, util.unicodify(e)) def sniff(self, filename): if filename and tarfile.is_tarfile(filename): - try: - with tarfile.open(filename, 'r') as temptar: - return 'postgresql/db/PG_VERSION' in temptar.getnames() - except Exception as e: - log.warning('%s, sniff Exception: %s', self, e) + with tarfile.open(filename, 'r') as temptar: + return 'postgresql/db/PG_VERSION' in temptar.getnames() return False def set_peek(self, dataset, is_multi_byte=False):