Merge lp:~gary/lazr.restful/bug691841 into lp:lazr.restful

[Gary Poster]

This branch makes lazr.restful's tests pass in 2.6 and 2.7 (they were breaking in 2.7).

Comments 2 and 3 of bug 691841 describe the rationale for the two changes. Briefly, for one change, 2.7's inspect.is_class now is more discerning and recognizes that interfaces are not actually classes, so we need to accommodate that. For another change, None is no longer allowed as a header value in Python2.7's httplib.HTTPConnection.putheader, so we adjust the tests accordingly.

[Robert Collins (lifeless)]

Looks great to me.

review: Approve

=== modified file 'src/lazr/restful/example/base/tests/entry.txt'
--- src/lazr/restful/example/base/tests/entry.txt	2010-10-25 16:31:09 +0000
+++ src/lazr/restful/example/base/tests/entry.txt	2011-01-14 19:17:10 +0000
@@ -55,7 +55,7 @@
     >>> negotiated_type('application/vnd.sun.wadl+xml')
     'application/vnd.sun.wadl+xml'
 
-    >>> negotiated_type(None)
+    >>> negotiated_type('')
     'application/json'
 
     >>> negotiated_type('text/html')
@@ -85,7 +85,7 @@
     ...     uri = '/cookbooks/Everyday%20Greens?ws.accept=' + query_string
     ...     return negotiated_type(header, uri)
 
-    >>> qs_negotiated_type('application/json', None)
+    >>> qs_negotiated_type('application/json', '')
     'application/json'
 
     >>> qs_negotiated_type('application/json', 'application/xhtml+xml')

=== modified file 'src/lazr/restful/metazcml.py'
--- src/lazr/restful/metazcml.py	2010-08-03 20:16:24 +0000
+++ src/lazr/restful/metazcml.py	2011-01-14 19:17:10 +0000
@@ -146,6 +146,23 @@
     handler('registerAdapter', factory, (interface, marker),
             provides, name, info)
 
+def _is_exported_interface(member):
+    """Helper for find_exported_interfaces; a predicate to inspect.getmembers.
+
+    Returns True if member is a webservice-aware Exception or interface.
+    """
+    if (inspect.isclass(member) and
+        issubclass(member, Exception) and
+        getattr(member, '__lazr_webservice_error__', None) is not None):
+        # This is a webservice-aware Exception.
+        return True
+    if IInterface.providedBy(member):
+        tag = member.queryTaggedValue(LAZR_WEBSERVICE_EXPORTED)
+        if tag is not None and tag['type'] in [ENTRY_TYPE, COLLECTION_TYPE]:
+            # This is a webservice-aware interface.
+            return True
+    return False
+
 def find_exported_interfaces(module):
     """Find all the interfaces in a module marked for export.
 
@@ -153,20 +170,8 @@
 
     :return: iterator of interfaces.
     """
-    for name, interface in inspect.getmembers(module, inspect.isclass):
-        if issubclass(interface, Exception):
-            if getattr(interface, '__lazr_webservice_error__', None) is None:
-                continue
-            yield interface
-
-        if not IInterface.providedBy(interface):
-            continue
-        tag = interface.queryTaggedValue(LAZR_WEBSERVICE_EXPORTED)
-        if tag is None:
-            continue
-        if tag['type'] in [ENTRY_TYPE, COLLECTION_TYPE]:
-            yield interface
-
+    return (interface for name, interface
+            in inspect.getmembers(module, _is_exported_interface))
 
 def find_interfaces_and_contributors(module):
     """Find the interfaces and its contributors marked for export.