[Zope3-checkins] CVS: Zope3/src/ZConfig - loader.py:1.27 datatypes.py:1.17

[Jeremy Hylton]

Update of /cvs-repository/Zope3/src/ZConfig
In directory cvs.zope.org:/tmp/cvs-serv3403

Modified Files:
	loader.py datatypes.py 
Log Message:
Promote to new-style classes to __slots__ has an effect.

Since __metatype__ is an attractive nuisance, use the more direct
approach of inheriting from object rather than assigning to
__metaclass__.


=== Zope3/src/ZConfig/loader.py 1.26 => 1.27 ===
--- Zope3/src/ZConfig/loader.py:1.26	Tue Oct  7 13:53:43 2003
+++ Zope3/src/ZConfig/loader.py	Tue Nov  4 21:39:34 2003
@@ -234,8 +234,7 @@
         parser.parse(matcher)
 
 
-class CompositeHandler:
-    __metatype__ = type
+class CompositeHandler(object):
     __slots__ = '_handlers', '_convert'
 
     def __init__(self, handlers, schema):


=== Zope3/src/ZConfig/datatypes.py 1.16 => 1.17 ===
--- Zope3/src/ZConfig/datatypes.py:1.16	Fri Oct 31 11:14:51 2003
+++ Zope3/src/ZConfig/datatypes.py	Tue Nov  4 21:39:34 2003
@@ -271,8 +271,7 @@
                                            }),
     }
 
-class Registry:
-    __metatype__ = type
+class Registry(object):
     __slots__ = '_stock', '_other', '_basic_key'
 
     def __init__(self, stock=None):