[Checkins] SVN: zope.interface/branches/tseaver-no_2to3/src/zope/interface/ further simplify some attribute lookups

[Fred Drake]

Log message for revision 125007:
  further simplify some attribute lookups

Changed:
  U   zope.interface/branches/tseaver-no_2to3/src/zope/interface/interface.py
  U   zope.interface/branches/tseaver-no_2to3/src/zope/interface/tests/test_registry.py
  U   zope.interface/branches/tseaver-no_2to3/src/zope/interface/verify.py

-=-
Modified: zope.interface/branches/tseaver-no_2to3/src/zope/interface/interface.py
===================================================================
--- zope.interface/branches/tseaver-no_2to3/src/zope/interface/interface.py	2012-04-06 15:21:37 UTC (rev 125006)
+++ zope.interface/branches/tseaver-no_2to3/src/zope/interface/interface.py	2012-04-06 15:29:14 UTC (rev 125007)
@@ -640,7 +640,7 @@
     name = name or func.__name__
     method = Method(name, func.__doc__)
     defaults = getattr(func, '__defaults__', None) or ()
-    code = getattr(func, '__code__')
+    code = func.__code__
     # Number of positional arguments
     na = code.co_argcount-imlevel
     names = code.co_varnames[imlevel:]
@@ -683,7 +683,7 @@
 
 def fromMethod(meth, interface=None, name=None):
     if isinstance(meth, MethodType):
-        func = getattr(meth, '__func__')
+        func = meth.__func__
     else:
         func = meth
     return fromFunction(func, interface, imlevel=1, name=name)

Modified: zope.interface/branches/tseaver-no_2to3/src/zope/interface/tests/test_registry.py
===================================================================
--- zope.interface/branches/tseaver-no_2to3/src/zope/interface/tests/test_registry.py	2012-04-06 15:21:37 UTC (rev 125006)
+++ zope.interface/branches/tseaver-no_2to3/src/zope/interface/tests/test_registry.py	2012-04-06 15:29:14 UTC (rev 125007)
@@ -1769,7 +1769,7 @@
         comp.registerHandler(_factory1, (ifoo,))
         comp.registerHandler(_factory2, (ifoo,))
         def _factory_name(x):
-            return getattr(x.factory, '__code__').co_name
+            return x.factory.__code__.co_name
         subscribers = sorted(comp.registeredHandlers(), key=_factory_name)
         self.assertEqual(len(subscribers), 2)
         self.failUnless(isinstance(subscribers[0], HandlerRegistration))

Modified: zope.interface/branches/tseaver-no_2to3/src/zope/interface/verify.py
===================================================================
--- zope.interface/branches/tseaver-no_2to3/src/zope/interface/verify.py	2012-04-06 15:21:37 UTC (rev 125006)
+++ zope.interface/branches/tseaver-no_2to3/src/zope/interface/verify.py	2012-04-06 15:29:14 UTC (rev 125007)
@@ -74,7 +74,7 @@
                 # Nope, just a normal function
                 meth = fromFunction(attr, iface, name=name)
         elif (isinstance(attr, MethodTypes)
-              and type(getattr(attr, '__func__')) is FunctionType):
+              and type(attr.__func__) is FunctionType):
             meth = fromMethod(attr, iface, name)
         else:
             if not callable(attr):