test/data/vclamp_jpk/README: Document sample versions

[hooke.git] / hooke / util / si.py

diff --git a/hooke/util/si.py b/hooke/util/si.py
index ddf319bac59402cd87eac41e004552397c2b5a43..67366c135eb094eb51550949aaa2c349b0fb791c 100644 (file)
--- a/hooke/util/si.py
+++ b/hooke/util/si.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2012 W. Trevor King <wking@drexel.edu>
+# Copyright (C) 2010-2012 W. Trevor King <wking@tremily.us>
 #
 # This file is part of Hooke.
 #
@@ -30,11 +30,11 @@ Get the power from the first (or last, or middle, ...) value
 
 >>> p = get_power(xs[0])
 >>> for x in xs:
-...     print ppSI(x, decimals=2, power=p)
+...     print(ppSI(x, decimals=2, power=p))
 985.00 p
 1000.00 p
 112358.00 p
->>> print prefix_from_value(xs[0]) + 'N'
+>>> print(prefix_from_value(xs[0]) + 'N')
 pN
 """
 
@@ -87,13 +87,13 @@ def ppSI(value, unit='', decimals=None, power=None, pad=False):
     Examples
     --------
     >>> x = math.pi * 1e-8
-    >>> print ppSI(x, 'N')
+    >>> print(ppSI(x, 'N'))
     31.415927 nN
-    >>> print ppSI(x, 'N', 3)
+    >>> print(ppSI(x, 'N', 3))
     31.416 nN
-    >>> print ppSI(x, 'N', 4, power=-12)
+    >>> print(ppSI(x, 'N', 4, power=-12))
     31415.9265 pN
-    >>> print ppSI(x, 'N', 5, pad=True)
+    >>> print(ppSI(x, 'N', 5, pad=True))
        31.41593 nN
 
     If you want the decimal indented by six spaces with `decimal=2`,
@@ -103,13 +103,13 @@ def ppSI(value, unit='', decimals=None, power=None, pad=False):
     * 1 (length of the decimal point)
     * 2 (places after the decimal point)
 
-    >>> print ppSI(-x, 'N', 2, pad=(6+1+2))
+    >>> print(ppSI(-x, 'N', 2, pad=(6+1+2)))
        -31.42 nN
     """
     if value == 0:
         return '0'
     if value == None or isnan(value):
-        return 'NaN'
+        return 'nan'
 
     if power == None:  # auto-detect power
         power = get_power(value)