From: Guido van Rossum <guido@python.org>
Date: Sat, 7 Oct 1995 19:35:07 +0000 (+0000)
Subject: search for keyfile in sys.path as last resort; reword exception
X-Git-Tag: v1.3~61
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=83d6bbf5974adcb3292c4f498651c073db306b8b;p=thirdparty%2FPython%2Fcpython.git

search for keyfile in sys.path as last resort; reword exception
---

diff --git a/Demo/pdist/security.py b/Demo/pdist/security.py
index a11294a91c0c..f9936828a416 100755
--- a/Demo/pdist/security.py
+++ b/Demo/pdist/security.py
@@ -9,10 +9,17 @@ class Security:
 			keyfile = '.python_keyfile'
 			if env.has_key('HOME'):
 				keyfile = os.path.join(env['HOME'], keyfile)
+			if not os.path.exists(keyfile):
+				import sys
+				for dir in sys.path:
+					kf = os.path.join(dir, keyfile)
+					if os.path.exists(kf):
+						keyfile = kf
+						break
 		try:
 			self._key = eval(open(keyfile).readline())
 		except IOError:
-			raise IOError, "python keyfile %s not found" % keyfile
+			raise IOError, "python keyfile %s: cannot open" % keyfile
 
 	def _generate_challenge(self):
 		import whrandom