aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2019-05-27 13:52:20 +0200
committerTrygve Laugstøl <trygvis@inamo.no>2019-05-27 13:52:20 +0200
commit94e8537430ab7496e4b8e697581d65b06cf8b979 (patch)
tree400ddf6deac24ce3b21a0678bfe9afb5f7f8a1e9 /src
parent0259c6f907875b54e5d1df4bc89efa1c293d2812 (diff)
downloadee-python-94e8537430ab7496e4b8e697581d65b06cf8b979.tar.gz
ee-python-94e8537430ab7496e4b8e697581d65b06cf8b979.tar.bz2
ee-python-94e8537430ab7496e4b8e697581d65b06cf8b979.tar.xz
ee-python-94e8537430ab7496e4b8e697581d65b06cf8b979.zip
EeVal: Supporting omega symbol in addition to ohm symbol (which are
usually graphically equal).
Diffstat (limited to 'src')
-rw-r--r--src/ee/__init__.py4
-rw-r--r--src/ee/formatting/__init__.py2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ee/__init__.py b/src/ee/__init__.py
index 06c5aab..ea887b1 100644
--- a/src/ee/__init__.py
+++ b/src/ee/__init__.py
@@ -36,7 +36,9 @@ power_type = EeValType("W", [])
@total_ordering
class EeVal(object):
units = ['F',
- 'Ohm', '\u2126', # Ohm symbol
+ 'Ohm',
+ '\u03a9', # Ohm, the greek (upper case) letter
+ '\u2126', # Ohm symbol, deprecated from unicode
'H']
exponents = {
'f': -15,
diff --git a/src/ee/formatting/__init__.py b/src/ee/formatting/__init__.py
index d32f7f9..073d533 100644
--- a/src/ee/formatting/__init__.py
+++ b/src/ee/formatting/__init__.py
@@ -14,7 +14,7 @@ class ESeries(object):
def __init__(self, series):
self.series = series
- def closest(self, value, round_direction = ROUND_CLOSEST):
+ def closest(self, value, round_direction=ROUND_CLOSEST):
if round_direction != ESeries.ROUND_CLOSEST:
raise NotImplementedError("Only closest rounding is implemented for now")
e = math.floor(math.log10(value))