Skip to content

Commit f145592

Browse files
committed
Version 0.0.3, added line member to Datapoint class
1 parent cd7856d commit f145592

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

khnum/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
'''
44

55
__author__ = '[email protected]'
6-
__version__ = '0.0.2'
6+
__version__ = '0.0.3'
77

88

99
from .datapoint import Datapoint as num

khnum/datapoint.py

+2-5
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,7 @@ def __init__(self, num, units='d'):
1616
'''
1717
returns Datapoint instance
1818
'''
19-
self._num = num
20-
self.cnum = khnum.cnum(num)
21-
self.hnum = khnum.hnum(num, units)
22-
self.type = str(type(num))
23-
self.units = units
19+
self.update(num, units)
2420

2521
def __str__(self):
2622
return khnum.pretty(dict(self.__dict__))
@@ -33,4 +29,5 @@ def update(self, num, units='d'):
3329
self._num = num
3430
self.cnum = khnum.cnum(num)
3531
self.hnum = khnum.hnum(num, units)
32+
self.line = '{} ({})'.format(self.hnum, self.cnum)
3633
self.units = units

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@
1818
packages=find_packages(),
1919
tests_require=['pytest'],
2020
url='https://github.com/siznax/khnum/',
21-
version='0.0.2'
21+
version='0.0.3'
2222
)

tests/test_basic.py

+4
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,7 @@ def test_datapoint_update():
3434

3535
assert num.cnum == '987,654,321'
3636
assert num.hnum == '987.7MB'
37+
38+
def test_datapoint_compact():
39+
num = khnum.num(1234567890, 'b')
40+
assert num.line == '1.2GB (1,234,567,890)'

0 commit comments

Comments
 (0)