r20739 - in /branches/relax_disp: ./ lib/float.py -- September 02, 2013 - 11:22

Author: bugman
Date: Mon Sep  2 11:22:26 2013
New Revision: 20739

URL: http://svn.gna.org/viewcvs/relax?rev=20739&view=rev
Log:
Merged revisions 20737 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r20737 | bugman | 2013-09-02 11:15:53 +0200 (Mon, 02 Sep 2013) | 5 lines
  
  The isInf() and isNan() functions of lib.float can now handle values of 
None.
  
  If None is encountered, the functions simply return False.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/lib/float.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Sep  2 11:22:26 2013
@@ -1,1 +1,1 @@
-/trunk:1-20684
+/trunk:1-20684,20737

Modified: branches/relax_disp/lib/float.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/lib/float.py?rev=20739&r1=20738&r2=20739&view=diff
==============================================================================
--- branches/relax_disp/lib/float.py (original)
+++ branches/relax_disp/lib/float.py Mon Sep  2 11:22:26 2013
@@ -568,6 +568,10 @@
     @raise TypeError:   If obj isn't a python float.
     """
 
+    # Catch None.
+    if obj == None:
+        return False
+
     # bad result for code checking
     result = None
 
@@ -603,6 +607,10 @@
     @rtype:             bool
     @raise TypeError:   If obj isn't a python float.
     """
+
+    # Catch None.
+    if obj == None:
+        return False
 
     # bad result for code checking
     result = None