Changeset 791

Timestamp:

08/19/07 10:59:28 (1 year ago)

Author:

robin

Message:

.pth file support

Files:

• pyrun/trunk/ChangeLog (modified) (1 diff)
• pyrun/trunk/examples/examples-as-tests.txt (modified) (1 diff)
• pyrun/trunk/pyrun.py (modified) (2 diffs)

pyrun/trunk/ChangeLog

@@ -3 +3 @@
-
-0.1.1:
+  * Added support for including .pth files in the discovery phase. This
+    makes it possible to insert paths to directories which do not contain
+    an __init__.py or are the dirname() of an explicitly referenced module
+    file.
-  * bugfix: propagate source file name (or sensibly invented filename) to
-    the __file__ attribute of the code instance that becomes our __main__

pyrun/trunk/examples/examples-as-tests.txt

@@ -6 +6 @@
-  # or
-  cd pyrun-trunk
-S
+C
- 
-

pyrun/trunk/pyrun.py

@@ -6 +6 @@
-
-from os.path import join, dirname, basename, isfile, isdir, exists
+from os.path import splitext
-
-have_runpy=False
@@ -353 +354 @@
-        if not exists(a):
-            doesnotexist.append(a)
+
+        # Support .pth files but *dont* recurse.
+        # - we do not treat the directory containing the .pth file as though
+        #   it was a python site directory.
+        #   (See: http://docs.python.org/inst/search-path.html)
+        # - we ignore any entry in the .pth file that does not identify
+        #   a file or directory (ie, setuptools style import tricks do not
+        #   get eval'd)
+        # Note: that any findpaths which were encountered before the .pth file
+        # will appread in sys.path *before* the paths in the path file.  Also
+        # note that using a .pth file is the only currently supported way to
+        # inject a directory onto the path which is not either an egg or a
+        # module or a toplevel package directory.
+        elif isfile(a) and splitext(a)[1] == '.pth':
+            if findpaths:
+                newpaths = find_package_paths(pth=pthset,
+                    *findpaths
+                    )
+                pthextend.extend(newpaths)
+                findpaths[:] = []
+            pthextend.extend(ln.strip() for ln in file(a)
+                    if exists(ln.strip())
+                    )
+            continue
-
-        minfo = path_pkg_moduleinfo(a)