Changeset 4655

Timestamp:

Nov 10, 2020 11:59:25 AM (3 years ago)

Author:

toby

Message:

minor sphinx-related fixes

File:

• trunk/GSASIIobj.py (modified) (2 diffs)

trunk/GSASIIobj.py

@@ -2718 +2718 @@
 sqrt = sq = lambda x: np.sqrt(x)
 pi = lambda: np.pi
+
+def FindFunction(f):
+    '''Find the object corresponding to function f
+
+    :param str f: a function name such as 'numpy.exp'
+    :returns: (pkgdict,pkgobj) where pkgdict contains a dict
+      that defines the package location(s) and where pkgobj
+      defines the object associated with the function.
+      If the function is not found, pkgobj is None.
+    '''
+    df = f.split('.')
+    pkgdict = {}
+    # no listed module name, try in current namespace
+    if len(df) == 1:
+        try:
+            fxnobj = eval(f)
+            return pkgdict,fxnobj
+        except (AttributeError, NameError):
+            return None,None
+
+    # includes a package, see if package is already imported
+    pkgnam = '.'.join(df[:-1])
+    try:
+        fxnobj = eval(f)
+        pkgdict[pkgnam] = eval(pkgnam)
+        return pkgdict,fxnobj
+    except (AttributeError, NameError):
+        pass
+    # package not yet imported, so let's try
+    if '.' not in sys.path: sys.path.append('.')
+    pkgnam = '.'.join(df[:-1])
+    #for pkg in f.split('.')[:-1]: # if needed, descend down the tree
+    #    if pkgname:
+    #        pkgname += '.' + pkg
+    #    else:
+    #        pkgname = pkg
+    try:
+        exec('import '+pkgnam)
+        pkgdict[pkgnam] = eval(pkgnam)
+        fxnobj = eval(f)
+    except Exception as msg:
+        print('load of '+pkgnam+' failed with error='+str(msg))
+        return {},None
+    # can we access the function? I am not exactly sure what
+    #    I intended this to test originally (BHT)
+    try:
+        fxnobj = eval(f,globals(),pkgdict)
+        return pkgdict,fxnobj
+    except Exception as msg:
+        print('call to',f,' failed with error=',str(msg))
+        return None,None # not found
+                
 class ExpressionObj(object):
     '''Defines an object with a user-defined expression, to be used for
@@ -2873 +2925 @@
         self.lastError = ('','')
         import ast
-        def FindFunction(f):
-            '''Find the object corresponding to function f
-            :param str f: a function name such as 'numpy.exp'
-            :returns: (pkgdict,pkgobj) where pkgdict contains a dict
-              that defines the package location(s) and where pkgobj
-              defines the object associated with the function.
-              If the function is not found, pkgobj is None.
-            '''
-            df = f.split('.')
-            pkgdict = {}
-            # no listed module name, try in current namespace
-            if len(df) == 1:
-                try:
-                    fxnobj = eval(f)
-                    return pkgdict,fxnobj
-                except (AttributeError, NameError):
-                    return None,None
-
-            # includes a package, see if package is already imported
-            pkgnam = '.'.join(df[:-1])
-            try:
-                fxnobj = eval(f)
-                pkgdict[pkgnam] = eval(pkgnam)
-                return pkgdict,fxnobj
-            except (AttributeError, NameError):
-                pass
-            # package not yet imported, so let's try
-            if '.' not in sys.path: sys.path.append('.')
-            pkgnam = '.'.join(df[:-1])
-            #for pkg in f.split('.')[:-1]: # if needed, descend down the tree
-            #    if pkgname:
-            #        pkgname += '.' + pkg
-            #    else:
-            #        pkgname = pkg
-            try:
-                exec('import '+pkgnam)
-                pkgdict[pkgnam] = eval(pkgnam)
-                fxnobj = eval(f)
-            except Exception as msg:
-                print('load of '+pkgnam+' failed with error='+str(msg))
-                return {},None
-            # can we access the function? I am not exactly sure what
-            #    I intended this to test originally (BHT)
-            try:
-                fxnobj = eval(f,globals(),pkgdict)
-                return pkgdict,fxnobj
-            except Exception as msg:
-                print('call to',f,' failed with error=',str(msg))
-                return None,None # not found
         def ASTtransverse(node,fxn=False):
             '''Transverse a AST-parsed expresson, compiling a list of variables