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.


git-svn-id: http://viewvc.tigris.org/svn/viewvc/branches/1.0.x@1558 8cb11bc2-c004-0410-86c3-e597b4017df7

lib/win32popen.py

@@ -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

windows/README

@@ -14,7 +14,7 @@ ViewVC requires the Python interpreter which you can download from
 
 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 @@ KNOWN ISSUES
   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