From b7d53eed6f95744199f12eb4d5d105ed4663d1a3 Mon Sep 17 00:00:00 2001 From: Kevin Deldycke Date: Fri, 16 Dec 2016 16:02:57 +0100 Subject: [PATCH] Expose is_single_port and is_cidr properties in repr. --- CHANGES.rst | 1 + port_range/__init__.py | 10 ++++++---- port_range/tests/test_port_range.py | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index b69d7b5..7d11feb 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,7 @@ ChangeLog `1.1.0 (unreleased) `_ --------------------------------------------------------------------------------------- +* Expose ``is_single_port`` and ``is_cidr`` properties in ``repr()``. * Add default ``isort`` config. * Run unittests against Python 3.3, 3.5, 3.6-dev, 3.7-dev, PyPy2.7 and PyPy3.3. * Remove popularity badge: PyPI download counters are broken and no longer diff --git a/port_range/__init__.py b/port_range/__init__.py index aa6c66f..f97f6b7 100644 --- a/port_range/__init__.py +++ b/port_range/__init__.py @@ -128,10 +128,12 @@ def parse_range(self, port_range): def __repr__(self): """ Print all components of the range. """ - return '{}(port_from={}, port_to={}, base={}, offset={}, prefix={}, ' \ - 'mask={})'.format(self.__class__.__name__, self.port_from, - self.port_to, self.base, self.offset, - self.prefix, self.mask) + return ( + '{}(port_from={}, port_to={}, base={}, offset={}, prefix={}, ' + 'mask={}, is_single_port={}, is_cidr={})').format( + self.__class__.__name__, self.port_from, self.port_to, + self.base, self.offset, self.prefix, self.mask, + self.is_single_port, self.is_cidr) def __str__(self): """ Return the most appropriate string representation. """ diff --git a/port_range/tests/test_port_range.py b/port_range/tests/test_port_range.py index a9d3b41..699e2af 100644 --- a/port_range/tests/test_port_range.py +++ b/port_range/tests/test_port_range.py @@ -85,7 +85,7 @@ def test_output_string(self): self.assertEqual( repr(PortRange([1027, 1028])), "PortRange(port_from=1027, port_to=1028, base=1027, offset=3, " - "prefix=15, mask=1)") + "prefix=15, mask=1, is_single_port=False, is_cidr=True)") def test_cidr_string_rendering(self): self.assertEqual(PortRange([32768, 65535]).cidr_string, '32768/1')