diff options
author | Jelmer Vernooij <jelmer@jelmer.uk> | 2023-01-28 16:55:56 +0000 |
---|---|---|
committer | Jelmer Vernooij <jelmer@jelmer.uk> | 2023-02-10 17:47:03 +0000 |
commit | 496a0a483dd8629deaf7821c739b2b83c8e7d3d6 (patch) | |
tree | fc829e4d55d66082e48c0dcb0389b9f7efe377db /python/subunit/__init__.py | |
parent | e40507dfb292de805fcbd125594579c40e5165a8 (diff) | |
download | subunit-git-external-iso8601.tar.gz |
Rely on external copy of iso8601external-iso8601
Diffstat (limited to 'python/subunit/__init__.py')
-rw-r--r-- | python/subunit/__init__.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/python/subunit/__init__.py b/python/subunit/__init__.py index 5e318c1..4203256 100644 --- a/python/subunit/__init__.py +++ b/python/subunit/__init__.py @@ -123,6 +123,7 @@ import unittest from io import BytesIO, StringIO from io import UnsupportedOperation as _UnsupportedOperation +import iso8601 from testtools import ExtendedToOriginalDecorator, content, content_type from testtools.compat import _b, _u from testtools.content import TracebackContent @@ -135,7 +136,7 @@ except ImportError: "_StringException, check your version.") from testtools import CopyStreamResult, testresult -from subunit import chunked, details, iso8601, test_results +from subunit import chunked, details, test_results from subunit.v2 import ByteStreamToStreamResult, StreamResultToBytes # same format as sys.version_info: "A tuple containing the five components of @@ -551,7 +552,7 @@ class TestProtocolServer(object): def _handleTime(self, offset, line): # Accept it, but do not do anything with it yet. try: - event_time = iso8601.parse_date(line[offset:-1]) + event_time = iso8601.parse_date(line[offset:-1].decode()) except TypeError: raise TypeError(_u("Failed to parse %r, got %r") % (line, sys.exec_info[1])) @@ -794,7 +795,7 @@ class TestProtocolClient(testresult.TestResult): ":param datetime: A datetime.datetime object. """ - time = a_datetime.astimezone(iso8601.Utc()) + time = a_datetime.astimezone(iso8601.UTC) self._stream.write(_b("time: %04d-%02d-%02d %02d:%02d:%02d.%06dZ\n" % ( time.year, time.month, time.day, time.hour, time.minute, time.second, time.microsecond))) |