updated information, substance and temperature

ddale · ddale · commit 717c38900c2e · 2009-01-14T10:32:03.000-05:00
diff --git a/quantities/units/information.py b/quantities/units/information.py
@@ -1,18 +1,36 @@
 """
 """
 
-from quantities.units.unitquantity import UnitQuantity, UnitInformation
+from quantities.units.unitquantity import UnitQuantity, UnitInformation, \
+    dimensionless
 from quantities.units.time import s
 
-bit = bits = \
-    UnitInformation('bit')
-count = counts = \
-    UnitInformation('counts')
-Bd = baud = \
-    UnitQuantity('Bd', 1/s)
-bps = \
-    UnitQuantity('bps', bit/s)
-cps = \
-    UnitQuantity('cps', 1/s)
+bit = UnitInformation(
+    'bit',
+    1*dimensionless,
+    aliases=['bits']
+)
+B = byte = o = octet = UnitInformation(
+    'byte',
+    8*bit,
+    symbol='B',
+    aliases=['bytes', 'o', 'octet', 'octets']
+)
+count = counts = UnitInformation(
+    'count',
+    1*dimensionless,
+    symbol='ct',
+    aliases=['cts', 'counts']
+)
 
-del UnitQuantity, s
+Bd = baud = bps = UnitQuantity(
+    'baud',
+    bit/s,
+    symbol='Bd',
+)
+cps = UnitQuantity(
+    'counts_per_second',
+    count/s
+)
+
+del UnitQuantity, s, dimensionless
diff --git a/quantities/units/substance.py b/quantities/units/substance.py
@@ -3,5 +3,7 @@
 
 from quantities.units.unitquantity import UnitSubstance
 
-mol = mole = \
-    UnitSubstance('mol')
+mol = mole = UnitSubstance(
+    'mole',
+    symbol='mol'
+)
diff --git a/quantities/units/temperature.py b/quantities/units/temperature.py
@@ -1,13 +1,31 @@
+# -*- coding: utf-8 -*-
 """
 """
 
 from quantities.units.unitquantity import UnitTemperature
 
-K = degK = kelvin = Kelvin = \
-    UnitTemperature('K')
-degR = rankine = Rankine = \
-    UnitTemperature('Rankine', K/1.8)
-degC = celsius = Celsius = \
-    UnitTemperature('degC', K)
-degF = fahrenheit = Fahrenheit = \
-    UnitTemperature('degF', degR)
+K = degK = kelvin = Kelvin = UnitTemperature(
+    'Kelvin',
+    symbol='K',
+    aliases=['degK', 'kelvin']
+)
+degR = rankine = Rankine = UnitTemperature(
+    'Rankine',
+    K/1.8,
+    symbol='°R',
+    aliases=['degR', 'rankine']
+)
+degC = celsius = Celsius = UnitTemperature(
+    'Celsius',
+    K,
+    symbol='°C',
+    aliases=['degC', 'celsius']
+)
+degF = fahrenheit = Fahrenheit = UnitTemperature(
+    'Fahrenheit',
+    K,
+    symbol='°F',
+    aliases=['degF', 'fahrenheit']
+)
+# Unicode has special compatibility characters for ℃ ℉, but their use is
+# discouraged by the unicode consortium.
