[Nym3-commit] r414 - trunk/nymbaron/Server

[laurent at conuropsis.org]

Author: laurent
Date: 2005-11-16 23:54:18 +0100 (Wed, 16 Nov 2005)
New Revision: 414

Modified:
   trunk/nymbaron/Server/User.py
Log:
Catch exception in lock creation.


Modified: trunk/nymbaron/Server/User.py
===================================================================
--- trunk/nymbaron/Server/User.py	2005-11-16 22:04:28 UTC (rev 413)
+++ trunk/nymbaron/Server/User.py	2005-11-16 22:54:18 UTC (rev 414)
@@ -121,8 +121,12 @@
 	self.mbox = None
 	self.syn = None
 	self.data = None
+	self.lock = None
         self._abort = False
-	self._lock()
+	try: self._lock()
+	except OSError: # Can happen for invalid usernames.
+			# TODO : validate username against sensible pattern.
+	    raise NoSuchUser()
 	try:
 	    f = open(self.datafile, 'r')
             if (create == 1):
@@ -166,7 +170,7 @@
 
     def _release(self):
 	"""Releases the lock"""
-	self.lock.release()
+	if self.lock: self.lock.release()
 
     def abort(self):
         """permit to destroy a User object without saving its data