Author: cmpilato
Date: 2007-04-02 05:43:08-0700
New Revision: 1558
Modified:
branches/1.0.x/lib/win32popen.py
branches/1.0.x/windows/README
Log:
On the 1.0.x branch: backport from trunk r1557, which updates the URL
for the Python for Windows Extensions, and appends exception string
information which suggests they might be missing when failing to
import them.
Modified: branches/1.0.x/lib/win32popen.py
Url:
http://viewvc.tigris.org/source/browse/viewvc/branches/1.0.x/lib/win32popen.py?view=diff&rev=1558&p1=branches/1.0.x/lib/win32popen.py&p2=branches/1.0.x/lib/win32popen.py&r1=1557&r2=1558
==============================================================================
--- branches/1.0.x/lib/win32popen.py (original)
+++ branches/1.0.x/lib/win32popen.py 2007-04-02 05:43:08-0700
@@ -15,8 +15,18 @@
# -----------------------------------------------------------------------
import os, sys, traceback, string, thread
+try:
+ import win32api
+except ImportError, e:
+ raise ImportError, str(e) + """
+
+Did you install the Python for Windows Extensions?
+
+ http://sourceforge.net/projects/pywin32/
+"""
+
import win32process, win32pipe, win32con
-import win32event, win32file, win32api, winerror
+import win32event, win32file, winerror
import pywintypes, msvcrt
# Buffer size for spooling
Modified: branches/1.0.x/windows/README
Url:
http://viewvc.tigris.org/source/browse/viewvc/branches/1.0.x/windows/README?view=diff&rev=1558&p1=branches/1.0.x/windows/README&p2=branches/1.0.x/windows/README&r1=1557&r2=1558
==============================================================================
--- branches/1.0.x/windows/README (original)
+++ branches/1.0.x/windows/README 2007-04-02 05:43:08-0700
@@ -14,7 +14,7 @@
and the Python for Windows Extensions which are at
- http://starship.python.net/crew/mhammond/win32/
+ http://sourceforge.net/projects/pywin32/
For CVS support, ViewVC also requires that the CVSNT client (cvs.exe) OR the
RCS tools (rlog.exe, rcsdiff.exe, and co.exe) be installed on your computer.
@@ -404,7 +404,7 @@
page would always return nothing (leaving the screen blank). There were a
number of workarounds for this problem, but the fix is to download and
install the latest python win32 extensions from
- http://starship.python.net/crew/mhammond/win32/Downloads.html
+ http://sourceforge.net/projects/pywin32/
- ViewVC can't convert timestamps on diff pages to local time when it is used
with CVSNT. This is caused by a CVSNT bug, which is described at
|
