[CalendarServer-changes] [3266] CalendarServer/trunk/twistedcaldav/directory/apache.py

[source_changes at macosforge.org]

Revision: 3266
          http://trac.macosforge.org/projects/calendarserver/changeset/3266
Author:   wsanchez at apple.com
Date:     2008-10-29 16:38:47 -0700 (Wed, 29 Oct 2008)
Log Message:
-----------
Got a little too strict here; FilePath is a valid input type.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/apache.py

Modified: CalendarServer/trunk/twistedcaldav/directory/apache.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/apache.py	2008-10-29 23:37:25 UTC (rev 3265)
+++ CalendarServer/trunk/twistedcaldav/directory/apache.py	2008-10-29 23:38:47 UTC (rev 3266)
@@ -41,15 +41,14 @@
     def __init__(self, realmName="", userFile=None, groupFile=None):
         super(AbstractDirectoryService, self).__init__()
 
+        if not userFile:
+            raise DirectoryConfigurationError("Invalid Apache user file name: %r" % (userFile,))
+
         if userFile and type(userFile) is str:
             userFile = FilePath(userFile)
-        else:
-            raise DirectoryConfigurationError("Invalid Apache user file name: %r" % (userFile,))
 
         if groupFile and type(groupFile) is str:
             groupFile = FilePath(groupFile)
-        else:
-            groupFile = None
 
         self.realmName = realmName
         self.userFile = userFile
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081029/4d910f26/attachment.html>