Changeset 5072

Timestamp:

Feb 26, 2008, 9:06:19 AM (16 years ago)

Author:

ole

Message:

Implemented function to obtain path for a python package and refactored two
unit tests to use it when reading in data files. This now works no matter
what the current working directory is.

Location:

anuga_core/source/anuga/utilities

Files:

• system_tools.py (modified) (1 diff)
• test_polygon.py (modified) (2 diffs)
• test_system_tools.py (modified) (1 diff)

anuga_core/source/anuga/utilities/system_tools.py

@@ -203 +203 @@
 
     return crcval
+
+def get_pathname_from_package(package):
+    """Get pathname of given package (provided as string)
+
+    This is useful for reading files residing in the same directory as
+    a particular module. Typically, this is required in unit tests depending
+    on external files.
+
+    The given module must start from a directory on the pythonpath
+    and be importable using the import statement.
+
+    Example
+    path = get_pathname_from_package('anuga.utilities')
+
+    """
+
+    exec('import %s as x' %package)
+
+    path = x.__path__[0]
+    
+    return path
+
+    # Alternative approach that has been used at times
+    #try:
+    #    # When unit test is run from current dir
+    #    p1 = read_polygon('mainland_only.csv')
+    #except: 
+    #    # When unit test is run from ANUGA root dir
+    #    from os.path import join, split
+    #    dir, tail = split(__file__)
+    #    path = join(dir, 'mainland_only.csv')
+    #    p1 = read_polygon(path)
+        
+            
+
+

anuga_core/source/anuga/utilities/test_polygon.py

@@ -6 +6 @@
 from math import sqrt, pi
 from anuga.utilities.numerical_tools import ensure_numeric
+from anuga.utilities.system_tools import get_pathname_from_package
 
 from polygon import *
@@ -60 +61 @@
         from os import sep, getenv
 
-        
-        try:
-            # When unit test is run from current dir
-            p1 = read_polygon('mainland_only.csv')
-        except: 
-            # When unit test is run from ANUGA root dir
-            from os.path import join, split
-            dir, tail = split( __file__)
-            path = join(dir, 'mainland_only.csv')
-            p1 = read_polygon(path)
-        
-            
+
+        # Get path where this test is run
+        path = get_pathname_from_package('anuga.utilities')
+
+        # Form absolute filename and read
+        filename = path + sep +  'mainland_only.csv'
+        p1 = read_polygon(filename)        
+        
         
         f = Polygon_function( [(p1, 10.0)] )

anuga_core/source/anuga/utilities/test_system_tools.py

@@ -109 +109 @@
 
         # Get path where this test is run
-        import anuga.utilities as u
-        path = u.__path__[0]
+        path = get_pathname_from_package('anuga.utilities')
+        
         filename = path + sep +  'crc_test_file.png'