summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Ganssle <pganssle@users.noreply.github.com>2019-02-24 09:30:42 -0600
committerGitHub <noreply@github.com>2019-02-24 09:30:42 -0600
commit222795da7f34e5c67a5a5431b8182144dfd4e190 (patch)
tree8b3ec2a36663558827b99ec620ba78b71834fb35
parent18d3f04cdecd273ddaca2442a7d21d4727a596fd (diff)
parent69f788461c8bb250ad84f52d2ab20407e25d73be (diff)
downloaddateutil-git-222795da7f34e5c67a5a5431b8182144dfd4e190.tar.gz
Merge pull request #879 from fhuang5/isoparser_coverage
Improve coverage in test_isoparser
-rw-r--r--AUTHORS.md1
-rw-r--r--changelog.d/879.misc.rst3
-rw-r--r--dateutil/test/test_isoparser.py20
3 files changed, 14 insertions, 10 deletions
diff --git a/AUTHORS.md b/AUTHORS.md
index 9d71a72..fe02288 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -43,6 +43,7 @@ switch, and thus all their contributions are dual-licensed.
- Dominik Kozaczko <dominik@MASKED>
- Elliot Hughes <elliot.hughes@gmail.com> (gh: @ElliotJH) **D**
- Elvis Pranskevichus <el@MASKED>
+- Fan Huang <fanhuang.scb@gmail.com>(gh: @fhuang5) **D**
- Florian Rathgeber (gh: @kynan) **D**
- Gabriel Bianconi <gabriel@MASKED> (gh: @GabrielBianconi) **D**
- Gabriel Poesia <gabriel.poesia@MASKED>
diff --git a/changelog.d/879.misc.rst b/changelog.d/879.misc.rst
new file mode 100644
index 0000000..7696233
--- /dev/null
+++ b/changelog.d/879.misc.rst
@@ -0,0 +1,3 @@
+Fixed a minor bug in ``test_isoparser`` related to ``bytes``/``str`` handling.
+Fixed by @fhuang5 (gh issue #776, gh pr #879)
+
diff --git a/dateutil/test/test_isoparser.py b/dateutil/test/test_isoparser.py
index ecd6e84..c7fa9b1 100644
--- a/dateutil/test/test_isoparser.py
+++ b/dateutil/test/test_isoparser.py
@@ -77,13 +77,13 @@ def _isoparse_date_and_time(dt, date_fmt, time_fmt, tzoffset,
dtstr = dt.strftime(fmt)
if microsecond_precision is not None:
- if not fmt.endswith('%f'):
+ if not fmt.endswith('%f'): # pragma: nocover
raise ValueError('Time format has no microseconds!')
- if microsecond_precision != 6:
+ if microsecond_precision != 6:
dtstr = dtstr[:-(6 - microsecond_precision)]
- elif microsecond_precision > 6:
- raise ValueError('Precision must be 1-6')
+ elif microsecond_precision > 6: # pragma: nocover
+ raise ValueError('Precision must be 1-6')
dtstr += offset_str
@@ -286,8 +286,8 @@ def test_iso_with_sep_raises(sep_act, valid_sep, exception):
parser.isoparse(isostr)
-@pytest.mark.xfail()
-@pytest.mark.parametrize('isostr,exception', [
+@pytest.mark.xfail()
+@pytest.mark.parametrize('isostr,exception', [ # pragma: nocover
('20120425T01:2000', ValueError), # Inconsistent time separators
])
def test_iso_raises_failing(isostr, exception):
@@ -454,9 +454,9 @@ def __make_time_examples():
@pytest.mark.parametrize('as_bytes', [True, False])
def test_isotime(time_val, time_fmt, as_bytes):
tstr = time_val.strftime(time_fmt)
- if isinstance(time_val, six.text_type) and as_bytes:
+ if isinstance(tstr, six.text_type) and as_bytes:
tstr = tstr.encode('ascii')
- elif isinstance(time_val, bytes) and not as_bytes:
+ elif isinstance(tstr, bytes) and not as_bytes:
tstr = tstr.decode('ascii')
iparser = isoparser()
@@ -505,8 +505,8 @@ def test_isotime_raises(isostr, exception):
iparser.parse_isotime(isostr)
-@pytest.mark.xfail()
-@pytest.mark.parametrize('isostr,exception', [
+@pytest.mark.xfail()
+@pytest.mark.parametrize('isostr,exception', [ # pragma: nocover
('14:3015', ValueError), # Inconsistent separator use
('201202', ValueError) # Invalid ISO format
])