[Zope-Checkins] CVS: Zope/lib/python/Testing - __init__.py:1.7

Fred L. Drake, Jr. fred@zope.com
Fri, 7 Feb 2003 16:28:18 -0500


Update of /cvs-repository/Zope/lib/python/Testing
In directory cvs.zope.org:/tmp/cvs-serv9250

Modified Files:
	__init__.py 
Log Message:
Simplify slightly.


=== Zope/lib/python/Testing/__init__.py 1.6 => 1.7 ===
--- Zope/lib/python/Testing/__init__.py:1.6	Wed Aug 14 18:01:39 2002
+++ Zope/lib/python/Testing/__init__.py	Fri Feb  7 16:28:13 2003
@@ -17,14 +17,12 @@
 """
 import os
 
-def pdir(path):
-    return os.path.split(path)[0]
-
 # Set the INSTANCE_HOME to the Testing package directory
-os.environ['INSTANCE_HOME'] = INSTANCE_HOME = pdir(__file__)
+os.environ['INSTANCE_HOME'] = INSTANCE_HOME = os.path.dirname(__file__)
 
 # Set the SOFTWARE_HOME to the directory containing the Testing package
-os.environ['SOFTWARE_HOME'] = SOFTWARE_HOME = pdir(INSTANCE_HOME)
+# XXX This isn't a change, so why?
+os.environ['SOFTWARE_HOME'] = SOFTWARE_HOME = os.path.dirname(INSTANCE_HOME)
 
 # Note: we don't set os.environ['ZEO_CLIENT'] anymore because we
 # really do need all the products to be initialized.  Some tests