Merged revisions 60043-60052 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60043 | christian.heimes | 2008-01-18 10:51:43 +0100 (Fri, 18 Jan 2008) | 2 lines
Build _ctypes after the other extensions. Its build process depends
on the _weakref extension (and maybe other modules, too)
........
r60048 | christian.heimes | 2008-01-18 12:58:50 +0100 (Fri, 18 Jan 2008) | 2 lines
Added win_add2path.py to Tools/scripts/
Added builddoc.bat to Doc/
........
r60049 | vinay.sajip | 2008-01-18 16:54:14 +0100 (Fri, 18 Jan 2008) | 1 line
Added section on passing contextual information to logging and documentation for the LoggerAdapter class.
........
r60050 | vinay.sajip | 2008-01-18 16:55:57 +0100 (Fri, 18 Jan 2008) | 1 line
Added LoggerAdapter class, changed copyright dates, made check for extra parameter passed to logging methods explicitly against None rather than a truth value.
........
r60051 | georg.brandl | 2008-01-18 17:42:57 +0100 (Fri, 18 Jan 2008) | 2 lines
Note that genexps are function scopes too and therefore won't see class attributes.
........
r60052 | christian.heimes | 2008-01-18 19:24:07 +0100 (Fri, 18 Jan 2008) | 1 line
Added bytes and b'' as aliases for str and ''
........
diff --git a/Tools/scripts/win_add2path.py b/Tools/scripts/win_add2path.py
new file mode 100644
index 0000000..876bfb2
--- /dev/null
+++ b/Tools/scripts/win_add2path.py
@@ -0,0 +1,57 @@
+"""Add Python to the search path on Windows
+
+This is a simple script to add Python to the Windows search path. It
+modifies the current user (HKCU) tree of the registry.
+
+Copyright (c) 2008 by Christian Heimes <christian@cheimes.de>
+Licensed to PSF under a Contributor Agreement.
+"""
+
+import sys
+import site
+import os
+import _winreg
+
+HKCU = _winreg.HKEY_CURRENT_USER
+ENV = "Environment"
+PATH = "PATH"
+DEFAULT = u"%PATH%"
+
+def modify():
+ pythonpath = os.path.dirname(os.path.normpath(sys.executable))
+ scripts = os.path.join(pythonpath, "Scripts")
+ appdata = os.environ["APPDATA"]
+ if hasattr(site, "USER_SITE"):
+ userpath = site.USER_SITE.replace(appdata, "%APPDATA%")
+ userscripts = os.path.join(userpath, "Scripts")
+ else:
+ userscripts = None
+
+ with _winreg.CreateKey(HKCU, ENV) as key:
+ try:
+ envpath = _winreg.QueryValueEx(key, PATH)[0]
+ except WindowsError:
+ envpath = DEFAULT
+
+ paths = [envpath]
+ for path in (pythonpath, scripts, userscripts):
+ if path and path not in envpath and os.path.isdir(path):
+ paths.append(path)
+
+ envpath = os.pathsep.join(paths)
+ _winreg.SetValueEx(key, PATH, 0, _winreg.REG_EXPAND_SZ, envpath)
+ return paths, envpath
+
+def main():
+ paths, envpath = modify()
+ if len(paths) > 1:
+ print "Path(s) added:"
+ print '\n'.join(paths[1:])
+ else:
+ print "No path was added"
+ print "\nPATH is now:\n%s\n" % envpath
+ print "Expanded:"
+ print _winreg.ExpandEnvironmentStrings(envpath)
+
+if __name__ == '__main__':
+ main()