[Zope3-checkins] CVS: ZODB3/ZConfig - datatypes.py:1.1.2.24

[Barry Warsaw]

Update of /cvs-repository/ZODB3/ZConfig
In directory cvs.zope.org:/tmp/cvs-serv27123

Modified Files:
      Tag: zconfig-schema-devel-branch
	datatypes.py 
Log Message:
Bump copyright years.  Whitespace formattng.  Get rid of extraneous
__call__'s.


=== ZODB3/ZConfig/datatypes.py 1.1.2.23 => 1.1.2.24 ===
--- ZODB3/ZConfig/datatypes.py:1.1.2.23	Fri Jan  3 13:54:47 2003
+++ ZODB3/ZConfig/datatypes.py	Fri Jan  3 13:57:16 2003
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors.
+# Copyright (c) 2002, 2003 Zope Corporation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
@@ -300,19 +300,19 @@
         return int(v) * self._default
 
 stock_datatypes = {
-    "boolean":       asBoolean,
-    "identifier":    IdentifierConversion().__call__,
-    "integer":       integer,
-    "float":         float_conversion,
-    "string":        str,
-    "null":          null_conversion,
-    "locale":        MemoizedConversion(check_locale).__call__,
-    "port-number":   port_number,
-    "basic-key":     BasicKeyConversion().__call__,
-    "logging-level": LogLevelConversion().__call__,
-    "inet-address":  inet_address,
-    "socket-address":socket_address,
-    "ipaddr-or-hostname":IpaddrOrHostname().__call__,
+    "boolean":           asBoolean,
+    "identifier":        IdentifierConversion(),
+    "integer":           integer,
+    "float":             float_conversion,
+    "string":            str,
+    "null":              null_conversion,
+    "locale":            MemoizedConversion(check_locale),
+    "port-number":       port_number,
+    "basic-key":         BasicKeyConversion(),
+    "logging-level":     LogLevelConversion(),
+    "inet-address":      inet_address,
+    "socket-address":    socket_address,
+    "ipaddr-or-hostname":IpaddrOrHostname(),
     "existing-directory":existing_directory,
     "existing-path":     existing_path,
     "existing-file":     existing_file,
@@ -322,12 +322,12 @@
     "byte-size":         SuffixMultiplier({'kb': 1024,
                                            'mb': 1024*1024,
                                            'gb': 1024*1024*1024,
-                                           }).__call__,
+                                           }),
     "time-interval":     SuffixMultiplier({'s': 1,
                                            'm': 60,
                                            'h': 60*60,
                                            'd': 60*60*24,
-                                           }).__call__,
+                                           }),
     }
 
 class Registry: