[Pyphant-devel] SF.net SVN: pyphant:[694] trunk/src/pyphant/pyphant/quantities/ ParseQuantities.py

[<zk...@us...>]

Revision: 694
          http://pyphant.svn.sourceforge.net/pyphant/?rev=694&view=rev
Author:   zklaus
Date:     2010-07-08 13:13:29 +0000 (Thu, 08 Jul 2010)

Log Message:
-----------
Merge branch 'master' into svn-trunk

* master:
  Fix: Fixes problem in ParseQuantities.

Modified Paths:
--------------
    trunk/src/pyphant/pyphant/quantities/ParseQuantities.py

Modified: trunk/src/pyphant/pyphant/quantities/ParseQuantities.py
===================================================================
--- trunk/src/pyphant/pyphant/quantities/ParseQuantities.py	2010-07-07 10:24:27 UTC (rev 693)
+++ trunk/src/pyphant/pyphant/quantities/ParseQuantities.py	2010-07-08 13:13:29 UTC (rev 694)
@@ -66,7 +66,6 @@
     if FMFversion not in ['1.0','1.1']:
         raise ValueError, 'FMFversion %s not supported.' % FMFversion
     else:
-        unit = unit.replace('^', '**')
         try:
             unit = unit.replace('^', '**')
             if FMFversion=='1.1':


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.