viewcvs-web r139 - in trunk: . bin/mod_python

[ovitters svn gnome org]

Author: ovitters
Date: Mon Nov  3 11:18:56 2008
New Revision: 139
URL: http://svn.gnome.org/viewvc/viewcvs-web?rev=139&view=rev

Log:
	Rename files renamed upstream.
	* bin/mod_python/query.py (index):
	* bin/mod_python/viewvc.py:
	* bin/mod_python/viewvc.py (added):
	* bin/mod_python/query.py (added):
	* bin/mod_python/viewvc_mp.py (deleted):
	* bin/mod_python/query_mp.py (deleted):



Added:
   trunk/bin/mod_python/query.py   (contents, props changed)
      - copied, changed from r138, /trunk/bin/mod_python/query_mp.py
   trunk/bin/mod_python/viewvc.py   (contents, props changed)
      - copied, changed from r138, /trunk/bin/mod_python/viewvc_mp.py
Removed:
   trunk/bin/mod_python/query_mp.py
   trunk/bin/mod_python/viewvc_mp.py
Modified:
   trunk/ChangeLog

Copied: trunk/bin/mod_python/query.py (from r138, /trunk/bin/mod_python/query_mp.py)
==============================================================================
--- /trunk/bin/mod_python/query_mp.py	(original)
+++ trunk/bin/mod_python/query.py	Mon Nov  3 11:18:56 2008
@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2007 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2006 The ViewCVS Group. All Rights Reserved.
 #
 # By using this file, you agree to the terms and conditions set forth in
 # the LICENSE.html file which can be found at the top level of the ViewVC
@@ -42,15 +42,30 @@
   sys.path.insert(0, LIBRARY_DIR)
 
 import sapi
-import viewvc
-import query
+import imp
+
+# Import real ViewVC module
+fp, pathname, description = imp.find_module('viewvc', [LIBRARY_DIR])
+try:
+  viewvc = imp.load_module('viewvc', fp, pathname, description)
+finally:
+  if fp:
+    fp.close()
+
+# Import real ViewVC Query modules
+fp, pathname, description = imp.find_module('query', [LIBRARY_DIR])
+try:
+  query = imp.load_module('query', fp, pathname, description)
+finally:
+  if fp:
+    fp.close()
 
 cfg = viewvc.load_config(CONF_PATHNAME)
 
 def index(req):
   server = sapi.ModPythonServer(req)
   try:
-    query.main(server, cfg, "viewvc_mp.py")
+    query.main(server, cfg, "viewvc.py")
   finally:
     server.close()
 

Copied: trunk/bin/mod_python/viewvc.py (from r138, /trunk/bin/mod_python/viewvc_mp.py)
==============================================================================
--- /trunk/bin/mod_python/viewvc_mp.py	(original)
+++ trunk/bin/mod_python/viewvc.py	Mon Nov  3 11:18:56 2008
@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2007 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2006 The ViewCVS Group. All Rights Reserved.
 #
 # By using this file, you agree to the terms and conditions set forth in
 # the LICENSE.html file which can be found at the top level of the ViewVC
@@ -42,7 +42,15 @@
   sys.path.insert(0, LIBRARY_DIR)
 
 import sapi
-import viewvc
+import imp
+
+# Import real ViewVC module
+fp, pathname, description = imp.find_module('viewvc', [LIBRARY_DIR])
+try:
+  viewvc = imp.load_module('viewvc', fp, pathname, description)
+finally:
+  if fp:
+    fp.close()
 
 def index(req):
   server = sapi.ModPythonServer(req)