Merge lp:~cjwatson/lazr.restful/py3-declarations into lp:lazr.restful

[Colin Watson]

Deprecate class advice APIs and provide replacements.

lazr.restful.declarations.export_as_webservice_entry and lazr.restful.declarations.export_as_webservice_collection can't work on Python 3, because the whole "class advice" strategy relies on metaclass hacking that is no longer possible. Deprecate these and provide equivalent class decorators (@exported_as_webservice_entry and @exported_as_webservice_collection) instead.

I've run the Launchpad test suite on a branch converted to use the new decorators, and everything looks fine.

[lp:~cjwatson/lazr.restful/py3-declarations]

237. By Colin Watson on 2020-02-05

Add exported_as_webservice_{collection,entry} to __all__.

238. By Colin Watson on 2020-02-13

Fix skipping of test classes with testtools.

testtools doesn't currently support skipping test classes the normal
unittest way; see https://github.com/testing-cabal/testtools/issues/205.
However, we can avoid having to apply @unittest.skipIf to every test case in
the class by calling skipTest in setUp instead.

239. By Colin Watson on 2020-02-19

Merge trunk.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'NEWS.rst'
--- NEWS.rst	2020-02-19 15:03:01 +0000
+++ NEWS.rst	2020-02-19 16:09:23 +0000
@@ -2,6 +2,16 @@
 NEWS for lazr.restful
 =====================
 
+0.22.0
+======
+
+Deprecate the "class advice" APIs from ``lazr.restful.declarations``:
+``export_as_webservice_entry`` and ``export_as_webservice_collection``.  In
+their place, prefer the equivalent class decorators:
+``@exported_as_webservice_entry`` and
+``@exported_as_webservice_collection``.  The functions based on class advice
+will not work on Python 3.
+
 0.21.1 (2020-02-19)
 ===================
 

=== modified file 'src/lazr/restful/declarations.py'
--- src/lazr/restful/declarations.py	2020-02-04 11:52:59 +0000
+++ src/lazr/restful/declarations.py	2020-02-19 16:09:23 +0000
@@ -19,7 +19,6 @@
     'call_with',
     'collection_default_content',
     'error_status',
-    'exported',
     'export_as_webservice_collection',
     'export_as_webservice_entry',
     'export_destructor_operation',
@@ -27,6 +26,9 @@
     'export_operation_as',
     'export_read_operation',
     'export_write_operation',
+    'exported',
+    'exported_as_webservice_collection',
+    'exported_as_webservice_entry',
     'generate_collection_adapter',
     'generate_entry_adapters',
     'generate_entry_interfaces',
@@ -159,6 +161,84 @@
     return f_locals.setdefault(TAGGED_DATA, {})
 
 
+def _export_as_webservice_entry(interface,
+                                singular_name=None, plural_name=None,
+                                contributes_to=None, publish_web_link=True,
+                                as_of=None, versioned_annotations=None):
+    """Tag an interface as exported on the web service as an entry.
+
+    This is the core of export_as_webservice_entry and
+    exported_as_webservice_entry.
+    """
+    annotation_stack = VersionedDict()
+
+    if singular_name is None:
+        # By convention, interfaces are called IWord1[Word2...]. The default
+        # behavior assumes this convention and yields a singular name of
+        # "word1_word2".
+        my_singular_name = camelcase_to_underscore_separated(
+            interface.__name__[1:])
+    else:
+        my_singular_name = singular_name
+
+    # Turn the named arguments into a dictionary for the first exported
+    # version.
+    initial_version = dict(
+        type=ENTRY_TYPE, singular_name=my_singular_name,
+        plural_name=plural_name, contributes_to=contributes_to,
+        publish_web_link=publish_web_link, exported=True,
+        _as_of_was_used=(as_of is not None))
+
+    afterwards = versioned_annotations or []
+    for version, annotations in itertools.chain(
+            [(as_of, initial_version)], afterwards):
+        annotation_stack.push(version)
+
+        for key, value in annotations.items():
+            if annotations != initial_version:
+                # Make sure that the 'annotations' dict contains only
+                # recognized annotations.
+                if key not in ENTRY_ANNOTATION_KEYS:
+                    raise ValueError(
+                        'Unrecognized annotation for version "%s": '
+                        '"%s"' % (version, key))
+            annotation_stack[key] = value
+        # If this version provides a singular name but not a plural name,
+        # apply the default pluralization rule.
+        if (annotations.get('singular_name') is not None
+                and annotations.get('plural_name') is None):
+            annotation_stack['plural_name'] = (
+                annotations['singular_name'] + 's')
+
+    # When called from the @exported_as_webservice_entry decorator, this
+    # would overwrite any interface annotations made by method decorators;
+    # but there are currently no such annotations that are valid for methods
+    # of entry interfaces anyway.
+    interface.setTaggedValue(LAZR_WEBSERVICE_EXPORTED, annotation_stack)
+
+    # Set the name of the fields that didn't specify it using the
+    # 'export_as' parameter in exported(). This must be done here, because
+    # the field's __name__ attribute is only set when the interface is
+    # created.
+    for name, field in getFields(interface).items():
+        tag_stack = field.queryTaggedValue(LAZR_WEBSERVICE_EXPORTED)
+        if tag_stack is None or tag_stack.is_empty:
+            continue
+        if tag_stack['type'] != FIELD_TYPE:
+            continue
+        for version, tags in tag_stack.stack:
+            # Set 'as' for every version in which the field is published but
+            # no 'as' is specified. Also set 'original_name' for every
+            # version in which the field is published--this will help with
+            # performance optimizations around permission checks.
+            if tags.get('exported') != False:
+                tags['original_name'] = name
+                if tags.get('as') is None:
+                    tags['as'] = name
+
+    annotate_exported_methods(interface)
+
+
 def export_as_webservice_entry(singular_name=None, plural_name=None,
                                contributes_to=None, publish_web_link=True,
                                as_of=None, versioned_annotations=None):
@@ -168,6 +248,10 @@
     actually not be exported on its own but instead will contribute its
     attributes/methods to other exported entries.
 
+    This function does not work with Python 3.  Rather than calling this
+    within the class definition, decorate the class with
+    @exported_as_webservice_entry instead.
+
     :param singular_name: The human-readable singular name of the entry,
         eg. "paintbrush".
     :param plural_name: The human-readable plural name of the entry,
@@ -192,78 +276,71 @@
         work just like the corresponding arguments to this method.
     """
     _check_called_from_interface_def('export_as_webservice_entry()')
+
     def mark_entry(interface):
         """Class advisor that tags the interface once it is created."""
         _check_interface('export_as_webservice_entry()', interface)
-
-        annotation_stack = VersionedDict()
-
-        if singular_name is None:
-            # By convention, interfaces are called IWord1[Word2...]. The
-            # default behavior assumes this convention and yields a
-            # singular name of "word1_word2".
-            my_singular_name = camelcase_to_underscore_separated(
-                interface.__name__[1:])
-        else:
-            my_singular_name = singular_name
-
-        # Turn the named arguments into a dictionary for the first
-        # exported version.
-        initial_version = dict(
-            type=ENTRY_TYPE, singular_name=my_singular_name,
-            plural_name=plural_name, contributes_to=contributes_to,
-            publish_web_link=publish_web_link, exported=True,
-            _as_of_was_used=(not as_of is None))
-
-        afterwards = versioned_annotations or []
-        for version, annotations in itertools.chain(
-            [(as_of, initial_version)], afterwards):
-            annotation_stack.push(version)
-
-            for key, value in annotations.items():
-                if annotations != initial_version:
-                    # Make sure that the 'annotations' dict
-                    # contains only recognized annotations.
-                    if key not in ENTRY_ANNOTATION_KEYS:
-                        raise ValueError(
-                            'Unrecognized annotation for version "%s": '
-                            '"%s"' % (version, key))
-                annotation_stack[key] = value
-            # If this version provides a singular name but not a
-            # plural name, apply the default pluralization rule.
-            if (annotations.get('singular_name') is not None
-                and annotations.get('plural_name') is None):
-                annotation_stack['plural_name'] = (
-                    annotations['singular_name'] + 's')
-
-        interface.setTaggedValue(LAZR_WEBSERVICE_EXPORTED, annotation_stack)
-
-        # Set the name of the fields that didn't specify it using the
-        # 'export_as' parameter in exported(). This must be done here,
-        # because the field's __name__ attribute is only set when the
-        # interface is created.
-        for name, field in getFields(interface).items():
-            tag_stack = field.queryTaggedValue(LAZR_WEBSERVICE_EXPORTED)
-            if tag_stack is None or tag_stack.is_empty:
-                continue
-            if tag_stack['type'] != FIELD_TYPE:
-                continue
-            for version, tags in tag_stack.stack:
-                # Set 'as' for every version in which the field is
-                # published but no 'as' is specified. Also set
-                # 'original_name' for every version in which the field
-                # is published--this will help with performance
-                # optimizations around permission checks.
-                if tags.get('exported') != False:
-                    tags['original_name'] = name
-                    if tags.get('as') is None:
-                        tags['as'] = name
-
-        annotate_exported_methods(interface)
+        _export_as_webservice_entry(
+            interface, singular_name=singular_name, plural_name=plural_name,
+            contributes_to=contributes_to, publish_web_link=publish_web_link,
+            as_of=as_of, versioned_annotations=versioned_annotations)
         return interface
+
     addClassAdvisor(mark_entry)
 
 
+class exported_as_webservice_entry:
+    """Mark the content interface as exported on the web service as an entry.
+
+    If contributes_to is a non-empty sequence of Interfaces, this entry will
+    actually not be exported on its own but instead will contribute its
+    attributes/methods to other exported entries.
+
+    :param singular_name: The human-readable singular name of the entry,
+        eg. "paintbrush".
+    :param plural_name: The human-readable plural name of the entry,
+        eg. "paintbrushes"
+    :param contributes_to: An optional list of exported interfaces to which
+        this interface contributes.
+    :param publish_web_link: This parameter is ignored unless there is
+        a correspondence between this web service's entries and the
+        pages on some website. If that is so, and if this parameter is
+        set to True, the representation of this entry will include a
+        web_link pointing to the corresponding page on the website. If
+        False, web_link will be omitted.
+    :param as_of: The first version of the web service to feature this entry.
+    :param versioned_annotations: A list of 2-tuples (version,
+        {params}), with more recent web service versions earlier in
+        the list and older versions later in the list.
+
+        A 'params' dictionary may contain the key 'exported', which
+        controls whether or not to publish the entry at all in the
+        given version. It may also contain the keys 'singular_name',
+        'plural_name', 'contributes_to', or 'publish_web_link', which
+        work just like the corresponding arguments to this method.
+    """
+
+    def __init__(self, singular_name=None, plural_name=None,
+                 contributes_to=None, publish_web_link=True,
+                 as_of=None, versioned_annotations=None):
+        self.singular_name = singular_name
+        self.plural_name = plural_name
+        self.contributes_to = contributes_to
+        self.publish_web_link = publish_web_link
+        self.as_of = as_of
+        self.versioned_annotations = versioned_annotations
+
+    def __call__(self, interface):
+        _check_interface('exported_as_webservice_entry()', interface)
+        _export_as_webservice_entry(
+            interface,
+            singular_name=self.singular_name, plural_name=self.plural_name,
+            contributes_to=self.contributes_to,
+            publish_web_link=self.publish_web_link,
+            as_of=self.as_of, versioned_annotations=self.versioned_annotations)
+        return interface
+
+
 def exported(field, *versioned_annotations, **kwparams):
     """Mark the field as part of the entry data model.
 
@@ -356,9 +433,22 @@
     return field
 
 
+def _check_collection_default_content(name, interface):
+    """Check that the interface has a method providing the default content."""
+    tag = interface.queryTaggedValue(LAZR_WEBSERVICE_EXPORTED, {})
+    if 'collection_default_content' not in tag:
+        raise TypeError(
+            "%s is missing a method tagged with @collection_default_content." %
+            name)
+
+
 def export_as_webservice_collection(entry_schema):
     """Mark the interface as exported on the web service as a collection.
 
+    This function does not work with Python 3.  Rather than calling this
+    within the class definition, decorate the class with
+    @exported_as_webservice_collection instead.
+
     :raises TypeError: if the interface doesn't have a method decorated with
         @collection_default_content.
     """
@@ -376,24 +466,46 @@
     def mark_collection(interface):
         """Class advisor that tags the interface once it is created."""
         _check_interface('export_as_webservice_collection()', interface)
-
-        tag = interface.getTaggedValue(LAZR_WEBSERVICE_EXPORTED)
-        if 'collection_default_content' not in tag:
-            raise TypeError(
-                "export_as_webservice_collection() is missing a method "
-                "tagged with @collection_default_content.")
-
+        _check_collection_default_content(
+            'export_as_webservice_collection()', interface)
         annotate_exported_methods(interface)
         return interface
 
     addClassAdvisor(mark_collection)
 
 
+class exported_as_webservice_collection:
+    """Mark the interface as exported on the web service as a collection.
+
+    :raises TypeError: if the interface doesn't have a method decorated with
+        @collection_default_content.
+    """
+
+    def __init__(self, entry_schema):
+        if not IInterface.providedBy(entry_schema):
+            raise TypeError("entry_schema must be an interface.")
+        self.entry_schema = entry_schema
+
+    def __call__(self, interface):
+        _check_interface('exported_as_webservice_collection()', interface)
+        _check_collection_default_content(
+            'exported_as_webservice_collection()', interface)
+        tag = interface.queryTaggedValue(LAZR_WEBSERVICE_EXPORTED)
+        if tag is None:
+            tag = {}
+            interface.setTaggedValue(LAZR_WEBSERVICE_EXPORTED, tag)
+        tag['type'] = COLLECTION_TYPE
+        tag['collection_entry_schema'] = self.entry_schema
+        annotate_exported_methods(interface)
+        return interface
+
+
 class collection_default_content:
     """Decorates the method that provides the default values of a collection.
 
-    :raises TypeError: if not called from within an interface exported as a
-        collection, or if used more than once in the same interface.
+    :raises TypeError: if called from within an interface exported as
+        something other than a collection, or if used more than once for the
+        same version in the same interface.
     """
 
     def __init__(self, version=None, **params):
@@ -407,9 +519,20 @@
         """
         _check_called_from_interface_def('@collection_default_content')
 
+        # We used to check that this decorator is being used from within an
+        # interface exported as a collection.  However, it isn't possible to
+        # do this when using the @exported_as_webservice_collection
+        # decorator rather than the export_as_webservice_collection function
+        # (which is based on class advice, and so cannot work in Python 3):
+        # that decorator isn't called until the rest of the interface has
+        # been defined, so it hasn't had a chance to set any tags on the
+        # interface by the time decorators of methods in that interface are
+        # called.  The best we can do is to check that we don't already
+        # positively know that the interface is exported as an entry
+        # instead.
         tags = _get_interface_tags()
-        tag = tags.get(LAZR_WEBSERVICE_EXPORTED)
-        if tag is None or tag['type'] != COLLECTION_TYPE:
+        tag = tags.setdefault(LAZR_WEBSERVICE_EXPORTED, {})
+        if 'type' in tag and tag['type'] != COLLECTION_TYPE:
             raise TypeError(
                 "@collection_default_content can only be used from within an "
                 "interface exported as a collection.")
@@ -494,8 +617,11 @@
 
     The actual method will be wrapped in an IMethod specification once the
     Interface is complete. So we save the annotations in an attribute of the
-    method, and the class advisor invoked by export_as_webservice_entry() and
-    export_as_webservice_collection() will do the final tagging.
+    method, and either the class advisor invoked by
+    export_as_webservice_entry() and export_as_webservice_collection() or
+    the @exported_as_webservice_entry() and
+    @exported_as_webservice_collection() decorators will do the final
+    tagging.
     """
 
     def __call__(self, method):

=== modified file 'src/lazr/restful/docs/webservice-declarations.rst'
--- src/lazr/restful/docs/webservice-declarations.rst	2020-02-04 13:17:32 +0000
+++ src/lazr/restful/docs/webservice-declarations.rst	2020-02-19 16:09:23 +0000
@@ -20,7 +20,7 @@
 
 Only entries are exported as data. You can mark that one of your content
 interface is exported on the web service as an entry, by using the
-export_as_webservice_entry() declaration.
+exported_as_webservice_entry() declaration.
 
 You can mark the fields that should be part of the entry data model by
 using the exported() wrapper. It takes an optional 'exported_as' parameter
@@ -34,10 +34,12 @@
     >>> from zope.interface import Interface
     >>> from zope.schema import Text, TextLine, Float, List
     >>> from lazr.restful.declarations import (
-    ...     export_as_webservice_entry, exported)
-    >>> class IBook(Interface):
+    ...     exported,
+    ...     exported_as_webservice_entry,
+    ...     )
+    >>> @exported_as_webservice_entry()
+    ... class IBook(Interface):
     ...     """A simple book data model."""
-    ...     export_as_webservice_entry()
     ...
     ...     title = exported(TextLine(title=u'The book title'))
     ...
@@ -94,8 +96,8 @@
 Only IField can be exported as entry fields.
 
     >>> from zope.interface import Attribute
-    >>> class Foo(Interface):
-    ...     export_as_webservice_entry()
+    >>> @exported_as_webservice_entry()
+    ... class Foo(Interface):
     ...     not_a_field = exported(Attribute('A standard attribute'))
     Traceback (most recent call last):
       ...
@@ -104,8 +106,8 @@
 Object fields cannot be exported because they cause validation problems.
 
     >>> from zope.schema import Object
-    >>> class UsesIObject(Interface):
-    ...     export_as_webservice_entry()
+    >>> @exported_as_webservice_entry()
+    ... class UsesIObject(Interface):
     ...     object = exported(Object(schema=Interface))
     Traceback (most recent call last):
     TypeError: Object exported; use Reference instead.
@@ -114,28 +116,21 @@
 avoid the validation problems.
 
     >>> from lazr.restful.fields import Reference
-    >>> class UsesIReference(Interface):
-    ...     export_as_webservice_entry()
+    >>> @exported_as_webservice_entry()
+    ... class UsesIReference(Interface):
     ...     object = exported(Reference(schema=Interface))
 
-In the same vein, export_as_webservice_entry() can only be used on
+In the same vein, exported_as_webservice_entry() can only be used on
 Interface.
 
-    >>> class NotAnInterface(object):
-    ...     export_as_webservice_entry()
+    >>> @exported_as_webservice_entry()
+    ... class NotAnInterface(object):
+    ...     pass
     Traceback (most recent call last):
       ...
-    TypeError: export_as_webservice_entry() can only be used on an
+    TypeError: exported_as_webservice_entry() can only be used on an
     interface.
 
-And from within a class declaration.
-
-    >>> export_as_webservice_entry()
-    Traceback (most recent call last):
-      ...
-    TypeError: export_as_webservice_entry() can only be used from within
-    an interface definition.
-
 publish_web_link
 ----------------
 
@@ -143,11 +138,11 @@
 lazr.restful will publish a web_link for each entry, pointing to the
 corresponding website page. For a given entry type, you can suppress
 this by passing in False for the `publish_web_link` argument to
-`export_as_webservice_entry`.
+`exported_as_webservice_entry`.
 
     >>> from zope.interface import Attribute
-    >>> class INotOnTheWebsite(Interface):
-    ...     export_as_webservice_entry(publish_web_link=False)
+    >>> @exported_as_webservice_entry(publish_web_link=False)
+    ... class INotOnTheWebsite(Interface):
     ...     field = exported(TextLine(title=u"A field."))
     >>> print_export_tag(INotOnTheWebsite)
     _as_of_was_used: False
@@ -169,24 +164,24 @@
 
     >>> from zope.schema import Object
     >>> from lazr.restful.fields import CollectionField
-    >>> class IBookWithComments(IBook):
+    >>> @exported_as_webservice_entry()
+    ... class IBookWithComments(IBook):
     ...     """A book with some comments."""
-    ...     export_as_webservice_entry()
     ...
     ...     comments = exported(CollectionField(
     ...         value_type=Object(schema=ISimpleComment)))
 
 Top-level collections are different though, they are exported by using the
-export_as_webservice_collection() in the ``Set`` class. The method that returns
-all of the collection items must be tagged with @collection_default_content
-decorator.
+exported_as_webservice_collection() in the ``Set`` class. The method that
+returns all of the collection items must be tagged with
+@collection_default_content decorator.
 
     >>> from lazr.restful.declarations import (
-    ...     export_as_webservice_collection, collection_default_content,
+    ...     exported_as_webservice_collection, collection_default_content,
     ...     REQUEST_USER)
-    >>> class IBookSet(Interface):
+    >>> @exported_as_webservice_collection(IBook)
+    ... class IBookSet(Interface):
     ...     """Set of all the books in the system."""
-    ...     export_as_webservice_collection(IBook)
     ...
     ...     @collection_default_content()
     ...     def getAllBooks():
@@ -197,9 +192,9 @@
 special REQUEST_USER marker that can be used to specify that this
 parameter should contain the logged in user.
 
-    >>> class ICheckedOutBookSet(Interface):
+    >>> @exported_as_webservice_collection(IBook)
+    ... class ICheckedOutBookSet(Interface):
     ...     """Give access to the checked out books."""
-    ...     export_as_webservice_collection(IBook)
     ...
     ...     @collection_default_content(user=REQUEST_USER, title='')
     ...     def getByTitle(title, user):
@@ -227,15 +222,16 @@
 The entry schema for a collection must be provided and must be an
 interface:
 
-    >>> class MissingEntrySchema(Interface):
-    ...     export_as_webservice_collection()
+    >>> @exported_as_webservice_collection()
+    ... class MissingEntrySchema(Interface):
+    ...     pass
     Traceback (most recent call last):
       ...
-    TypeError: export_as_webservice_collection() takes exactly 1
-    argument (0 given)
+    TypeError: __init__() takes exactly 2 arguments (1 given)
 
-    >>> class InvalidEntrySchema(Interface):
-    ...     export_as_webservice_collection("not an interface")
+    >>> @exported_as_webservice_collection("not an interface")
+    ... class InvalidEntrySchema(Interface):
+    ...     pass
     Traceback (most recent call last):
       ...
     TypeError: entry_schema must be an interface.
@@ -246,17 +242,18 @@
     >>> class IDummyInterface(Interface):
     ...     pass
 
-    >>> class MissingDefaultContent(Interface):
-    ...     export_as_webservice_collection(IDummyInterface)
+    >>> @exported_as_webservice_collection(IDummyInterface)
+    ... class MissingDefaultContent(Interface):
+    ...     pass
     Traceback (most recent call last):
       ...
-    TypeError: export_as_webservice_collection() is missing a method
+    TypeError: exported_as_webservice_collection() is missing a method
     tagged with @collection_default_content.
 
 As it is an error, to mark more than one method:
 
-    >>> class TwoDefaultContent(Interface):
-    ...     export_as_webservice_collection(IDummyInterface)
+    >>> @exported_as_webservice_collection(IDummyInterface)
+    ... class TwoDefaultContent(Interface):
     ...     @collection_default_content()
     ...     def getAll1():
     ...         """A first getAll()."""
@@ -268,23 +265,16 @@
     TypeError: Only one method can be marked with
     @collection_default_content for version '(earliest version)'.
 
-export_as_webservice_collection() can only be used on Interface.
+exported_as_webservice_collection() can only be used on Interface.
 
-    >>> class NotAnInterface(object):
-    ...     export_as_webservice_collection(IDummyInterface)
+    >>> @exported_as_webservice_collection(IDummyInterface)
+    ... class NotAnInterface(object):
+    ...     pass
     Traceback (most recent call last):
       ...
-    TypeError: export_as_webservice_collection() can only be used on an
+    TypeError: exported_as_webservice_collection() can only be used on an
     interface.
 
-And from within a class declaration.
-
-    >>> export_as_webservice_collection(IDummyInterface)
-    Traceback (most recent call last):
-      ...
-    TypeError: export_as_webservice_collection() can only be used from
-    within an interface definition.
-
 collection_default_content() can only be used from within an Interface
 declaration:
 
@@ -295,17 +285,6 @@
     TypeError: @collection_default_content can only be used from within
     an interface definition.
 
-And the interface must have been exported as a collection:
-
-    >>> class NotExported(Interface):
-    ...     export_as_webservice_entry()
-    ...     @collection_default_content()
-    ...     def a_function(): pass
-    Traceback (most recent call last):
-      ...
-    TypeError: @collection_default_content can only be used from within an
-    interface exported as a collection.
-
 Exporting methods
 =================
 
@@ -361,9 +340,9 @@
     ...     operation_returns_entry, operation_returns_collection_of,
     ...     rename_parameters_as)
     >>> from lazr.restful.interface import copy_field
-    >>> class IBookSetOnSteroids(IBookSet):
+    >>> @exported_as_webservice_collection(IBook)
+    ... class IBookSetOnSteroids(IBookSet):
     ...     """IBookSet supporting some methods."""
-    ...     export_as_webservice_collection(IBook)
     ...
     ...     @collection_default_content()
     ...     @operation_parameters(
@@ -405,9 +384,9 @@
     >>> from lazr.restful.declarations import (
     ...     call_with, export_destructor_operation, export_write_operation,
     ...     REQUEST_USER)
-    >>> class IBookOnSteroids(IBook):
+    >>> @exported_as_webservice_entry()
+    ... class IBookOnSteroids(IBook):
     ...     """IBook with some methods."""
-    ...     export_as_webservice_entry()
     ...
     ...     @call_with(who=REQUEST_USER, kind='normal')
     ...     @export_write_operation()
@@ -474,9 +453,8 @@
 @export_factory_operation to specify parameters that are not part of the
 schema.
 
-    >>> class ComplexBookFactory(Interface):
-    ...     export_as_webservice_entry()
-    ...
+    >>> @exported_as_webservice_entry()
+    ... class ComplexBookFactory(Interface):
     ...     @operation_parameters(collection=TextLine())
     ...     @export_factory_operation(IBook, ['author', 'title'])
     ...     def create_book(author, title, collection):
@@ -498,9 +476,8 @@
 Parameters default and required attributes are set automatically based
 on the method signature.
 
-    >>> class ComplexParameterDefinition(Interface):
-    ...     export_as_webservice_entry()
-    ...
+    >>> @exported_as_webservice_entry()
+    ... class ComplexParameterDefinition(Interface):
     ...     @operation_parameters(
     ...         required1=TextLine(),
     ...         required2=TextLine(default=u'Not required'),
@@ -568,8 +545,8 @@
 An error is also reported if not enough parameters are defined as
 exported:
 
-    >>> class MissingParameter(Interface):
-    ...     export_as_webservice_entry()
+    >>> @exported_as_webservice_entry()
+    ... class MissingParameter(Interface):
     ...     @call_with(param1=1)
     ...     @operation_parameters(
     ...         param2=TextLine())
@@ -583,8 +560,8 @@
 Defining a parameter not available on the method also results in an
 error:
 
-    >>> class BadParameter(Interface):
-    ...     export_as_webservice_entry()
+    >>> @exported_as_webservice_entry()
+    ... class BadParameter(Interface):
     ...     @operation_parameters(
     ...         no_such_param=TextLine())
     ...     @export_read_operation()
@@ -597,8 +574,8 @@
 But that's not a problem if the exported method actually takes arbitrary
 keyword parameters:
 
-    >>> class AnyParameter(Interface):
-    ...     export_as_webservice_entry()
+    >>> @exported_as_webservice_entry()
+    ... class AnyParameter(Interface):
     ...     @operation_parameters(
     ...         param1=TextLine())
     ...     @export_read_operation()
@@ -607,8 +584,8 @@
 When using @export_factory_operation, TypeError will also be raised if
 one of the field doesn't exists in the schema:
 
-    >>> class MissingParameter(Interface):
-    ...     export_as_webservice_entry()
+    >>> @exported_as_webservice_entry()
+    ... class MissingParameter(Interface):
     ...     @export_factory_operation(IBook, ['no_such_field'])
     ...     def a_method(): pass
     Traceback (most recent call last):
@@ -617,8 +594,8 @@
 
 Or if the field name doesn't represent a field:
 
-    >>> class NotAField(Interface):
-    ...     export_as_webservice_entry()
+    >>> @exported_as_webservice_entry()
+    ... class NotAField(Interface):
     ...     @export_factory_operation(IBookOnSteroids, ['checkout'])
     ...     def a_method(): pass
     Traceback (most recent call last):
@@ -627,8 +604,8 @@
 
 Or if @operation_parameters redefine a field specified in the factory:
 
-    >>> class Redefinition(Interface):
-    ...     export_as_webservice_entry()
+    >>> @exported_as_webservice_entry()
+    ... class Redefinition(Interface):
     ...     @operation_parameters(title=TextLine())
     ...     @export_factory_operation(IBookOnSteroids, ['title'])
     ...     def create_book(title): pass
@@ -638,8 +615,8 @@
 
 All parameters definitions must be schema fields:
 
-    >>> class BadParameterDefinition(Interface):
-    ...     export_as_webservice_entry()
+    >>> @exported_as_webservice_entry()
+    ... class BadParameterDefinition(Interface):
     ...     @operation_parameters(a_param=object())
     ...     @export_read_operation()
     ...     def a_method(): pass
@@ -673,8 +650,8 @@
 @operation_returns_collection_of will only accept an IInterface as
 argument.
 
-    >>> class ReturnOtherThanInterface(Interface):
-    ...     export_as_webservice_entry()
+    >>> @exported_as_webservice_entry()
+    ... class ReturnOtherThanInterface(Interface):
     ...     @operation_returns_entry("not-an-interface")
     ...     @export_read_operation()
     ...     def a_method(**kwargs): pass
@@ -682,8 +659,8 @@
     ...
     TypeError: Entry type not-an-interface does not provide IInterface.
 
-    >>> class ReturnOtherThanInterface(Interface):
-    ...     export_as_webservice_entry()
+    >>> @exported_as_webservice_entry()
+    ... class ReturnOtherThanInterface(Interface):
     ...     @operation_returns_collection_of("not-an-interface")
     ...     @export_read_operation()
     ...     def a_method(**kwargs): pass
@@ -780,9 +757,8 @@
     ...     def rename(new_name):
     ...         """Rename the object."""
 
-    >>> class IUser(IHasName):
-    ...     export_as_webservice_entry()
-    ...
+    >>> @exported_as_webservice_entry()
+    ... class IUser(IHasName):
     ...     nickname = exported(TextLine())
     ...
     ...     @operation_parameters(to=Object(IHasName), msg=TextLine())
@@ -824,9 +800,8 @@
 adapters for your entry's class instead of to the class itself. For example,
 we can have an IDeveloper interface contributing to IUser.
 
-    >>> class IDeveloper(Interface):
-    ...     export_as_webservice_entry(contributes_to=[IUser])
-    ...
+    >>> @exported_as_webservice_entry(contributes_to=[IUser])
+    ... class IDeveloper(Interface):
     ...     programming_languages = exported(List(
     ...         title=u'Programming Languages spoken by this developer'))
 
@@ -1359,8 +1334,8 @@
 A method can be designated as a destructor for the entry. Here, the
 destroy() method is designated as the destructor for IHasText.
 
-    >>> class IHasText(Interface):
-    ...     export_as_webservice_entry()
+    >>> @exported_as_webservice_entry()
+    ... class IHasText(Interface):
     ...     text = exported(TextLine(readonly=True))
     ...
     ...     @export_destructor_operation()
@@ -1370,8 +1345,8 @@
 
 A destructor method cannot take any free arguments.
 
-    >>> class IHasText(Interface):
-    ...     export_as_webservice_entry()
+    >>> @exported_as_webservice_entry()
+    ... class IHasText(Interface):
     ...     text = exported(TextLine(readonly=True))
     ...
     ...     @export_destructor_operation()
@@ -1384,8 +1359,8 @@
     In version (earliest version), the "destroy" method takes 1:
     "argument".
 
-    >>> class IHasText(Interface):
-    ...     export_as_webservice_entry()
+    >>> @exported_as_webservice_entry()
+    ... class IHasText(Interface):
     ...     text = exported(TextLine(readonly=True))
     ...
     ...     @export_destructor_operation()
@@ -1397,8 +1372,8 @@
 An entry cannot have more than one destructor.
 
     >>> from lazr.restful.declarations import export_destructor_operation
-    >>> class IHasText(Interface):
-    ...     export_as_webservice_entry()
+    >>> @exported_as_webservice_entry()
+    ... class IHasText(Interface):
     ...     text = exported(TextLine(readonly=True))
     ...
     ...     @export_destructor_operation()
@@ -1421,8 +1396,8 @@
 set_text() method is designated as the mutator for the 'text' field.
 
     >>> from lazr.restful.declarations import mutator_for
-    >>> class IHasText(Interface):
-    ...     export_as_webservice_entry()
+    >>> @exported_as_webservice_entry()
+    ... class IHasText(Interface):
     ...     text = exported(TextLine(readonly=True))
     ...
     ...     @mutator_for(text)
@@ -1473,8 +1448,8 @@
 
 It's not necessary to expose the mutator method as a write operation.
 
-    >>> class IHasText(Interface):
-    ...     export_as_webservice_entry()
+    >>> @exported_as_webservice_entry()
+    ... class IHasText(Interface):
     ...     text = exported(TextLine(readonly=True))
     ...
     ...     @mutator_for(text)
@@ -1485,8 +1460,8 @@
 A mutator method must take only one argument: the new value for the
 field. Taking no arguments is obviously an error.
 
-    >>> class ZeroArgumentMutator(Interface):
-    ...     export_as_webservice_entry()
+    >>> @exported_as_webservice_entry()
+    ... class ZeroArgumentMutator(Interface):
     ...     value = exported(TextLine(readonly=True))
     ...
     ...     @mutator_for(value)
@@ -1499,8 +1474,8 @@
 
 Taking more than one argument is also an error...
 
-    >>> class TwoArgumentMutator(Interface):
-    ...     export_as_webservice_entry()
+    >>> @exported_as_webservice_entry()
+    ... class TwoArgumentMutator(Interface):
     ...     value = exported(TextLine(readonly=True))
     ...
     ...     @mutator_for(value)
@@ -1514,8 +1489,8 @@
 ...unless all but one of the arguments are spoken for by a call_with()
 annotation. This definition does not result in a TypeError.
 
-    >>> class OneFixedArgumentMutator(Interface):
-    ...     export_as_webservice_entry()
+    >>> @exported_as_webservice_entry()
+    ... class OneFixedArgumentMutator(Interface):
     ...     value = exported(TextLine(readonly=True))
     ...
     ...     @mutator_for(value)
@@ -1528,8 +1503,8 @@
 A field can only have a mutator if it's read-only (not settable
 directly).
 
-    >>> class WritableMutator(Interface):
-    ...     export_as_webservice_entry()
+    >>> @exported_as_webservice_entry()
+    ... class WritableMutator(Interface):
     ...     value = exported(TextLine(readonly=False))
     ...
     ...     @mutator_for(value)
@@ -1542,8 +1517,8 @@
 
 A field can only have one mutator.
 
-    >>> class FieldWithTwoMutators(Interface):
-    ...     export_as_webservice_entry()
+    >>> @exported_as_webservice_entry()
+    ... class FieldWithTwoMutators(Interface):
     ...     value = exported(TextLine(readonly=True))
     ...
     ...     @mutator_for(value)
@@ -1567,8 +1542,8 @@
 
 A read-write field can be published as read-only in the web service.
 
-    >>> class ExternallyReadOnlyField(Interface):
-    ...     export_as_webservice_entry()
+    >>> @exported_as_webservice_entry()
+    ... class ExternallyReadOnlyField(Interface):
     ...     value = exported(TextLine(readonly=False), readonly=True)
 
     >>> interfaces = generate_entry_interfaces(
@@ -1584,8 +1559,8 @@
 just by declaring it read-write. You have to provide a
 mutator.
 
-    >>> class InternallyReadOnlyField(Interface):
-    ...     export_as_webservice_entry()
+    >>> @exported_as_webservice_entry()
+    ... class InternallyReadOnlyField(Interface):
     ...     value = exported(TextLine(readonly=True), readonly=False)
 
     >>> generate_entry_interfaces(InternallyReadOnlyField, [], 'beta')
@@ -1602,10 +1577,9 @@
 the @cache_for decorator:
 
     >>> from lazr.restful.declarations import cache_for
-    >>>
-    >>> class ICachedBookSet(IBookSet):
+    >>> @exported_as_webservice_collection(IBook)
+    ... class ICachedBookSet(IBookSet):
     ...     """IBookSet supporting caching."""
-    ...     export_as_webservice_collection(IBook)
     ...
     ...     @collection_default_content()
     ...     @export_read_operation()
@@ -1667,9 +1641,8 @@
 
     >>> from lazr.restful.declarations import generate_operation_adapter
 
-    >>> class IMultiVersionCollection(Interface):
-    ...     export_as_webservice_collection(Interface)
-    ...
+    >>> @exported_as_webservice_collection(Interface)
+    ... class IMultiVersionCollection(Interface):
     ...     @collection_default_content('2.0')
     ...     def content_20():
     ...         """The content method for version 2.0."""
@@ -1768,9 +1741,8 @@
    'new_in_10' in '1.0', and renamed to 'renamed_in_30' in '3.0'.
 
     >>> from zope.schema import Text, Float
-    >>> class IMultiVersionEntry(Interface):
-    ...     export_as_webservice_entry()
-    ...
+    >>> @exported_as_webservice_entry()
+    ... class IMultiVersionEntry(Interface):
     ...     field = exported(TextLine())
     ...
     ...     field2 = exported(Text(), exported_as='unchanging_name')
@@ -1943,9 +1915,8 @@
 Why does generate_entry_interfaces need a list of version strings?
 This example should make it clear.
 
-    >>> class IAmbiguousMultiVersion(Interface):
-    ...     export_as_webservice_entry()
-    ...
+    >>> @exported_as_webservice_entry()
+    ... class IAmbiguousMultiVersion(Interface):
     ...     field1 = exported(TextLine(),
     ...         ('foo', dict(exported_as='foo_name')))
     ...     field2 = exported(TextLine(),
@@ -1975,9 +1946,8 @@
 generate_entry_interfaces() modified the class to reflect the original
 list of versions.)
 
-    >>> class IAmbiguousMultiVersion(Interface):
-    ...     export_as_webservice_entry()
-    ...
+    >>> @exported_as_webservice_entry()
+    ... class IAmbiguousMultiVersion(Interface):
     ...     field1 = exported(TextLine(),
     ...         ('foo', dict(exported_as='foo_name')))
     ...     field2 = exported(TextLine(),
@@ -2009,9 +1979,8 @@
 You'll get an error if you annotate a field with a version that turns
 out not to be included in the version list.
 
-    >>> class INonexistentVersionEntry(Interface):
-    ...     export_as_webservice_entry()
-    ...
+    >>> @exported_as_webservice_entry()
+    ... class INonexistentVersionEntry(Interface):
     ...     field = exported(TextLine(),
     ...         ('2.0', dict(exported_as='foo')),
     ...         ('1.0', dict(exported_as='bar')))
@@ -2026,9 +1995,8 @@
 You'll get an error if you put an earlier version's annotations on top
 of a later version.
 
-    >>> class IWrongOrderEntry(Interface):
-    ...     export_as_webservice_entry()
-    ...
+    >>> @exported_as_webservice_entry()
+    ... class IWrongOrderEntry(Interface):
     ...     field = exported(TextLine(),
     ...         ('1.0', dict(exported_as='bar')),
     ...         ('2.0', dict(exported_as='foo')))
@@ -2042,9 +2010,8 @@
 You'll get an error if you define annotations twice for the same
 version. This can happen because you repeated the version annotations:
 
-    >>> class IDuplicateEntry(Interface):
-    ...     export_as_webservice_entry()
-    ...
+    >>> @exported_as_webservice_entry()
+    ... class IDuplicateEntry(Interface):
     ...     field = exported(TextLine(),
     ...         ('beta', dict(exported_as='another_beta_name')),
     ...         ('beta', dict(exported_as='beta_name')))
@@ -2059,9 +2026,8 @@
 using keyword arguments, and then explicitly defined conflicting
 values.
 
-    >>> class IDuplicateEntry(Interface):
-    ...     export_as_webservice_entry()
-    ...
+    >>> @exported_as_webservice_entry()
+    ... class IDuplicateEntry(Interface):
     ...     field = exported(TextLine(),
     ...         ('beta', dict(exported_as='beta_name')),
     ...         exported_as='earliest_name')
@@ -2077,18 +2043,16 @@
 You'll get an error if you include an unrecognized key in a field's
 version definition.
 
-    >>> class InvalidMultiVersionEntry(Interface):
-    ...     export_as_webservice_entry()
-    ...
+    >>> @exported_as_webservice_entry()
+    ... class InvalidMultiVersionEntry(Interface):
     ...     field = exported(TextLine(),
     ...         ('3.0', dict(not_recognized='this will error')))
     Traceback (most recent call last):
     ...
     ValueError: Unrecognized annotation for version "3.0": "not_recognized"
 
-    >>> class InvalidMultiVersionEntry(Interface):
-    ...     export_as_webservice_entry()
-    ...
+    >>> @exported_as_webservice_entry()
+    ... class InvalidMultiVersionEntry(Interface):
     ...     field = exported(TextLine(), not_recognized='this will error')
     Traceback (most recent call last):
     ...
@@ -2098,9 +2062,8 @@
 every version, even when an interface does not change at all between
 versions. (This could be optimized away.)
 
-    >>> class IUnchangingEntry(Interface):
-    ...     export_as_webservice_entry()
-    ...
+    >>> @exported_as_webservice_entry()
+    ... class IUnchangingEntry(Interface):
     ...     field = exported(TextLine(),
     ...         ('3.0', dict(exported_as='30_name')),
     ...         ('beta', dict(exported_as='unchanging_name')))
@@ -2118,10 +2081,8 @@
 2.0, 1.0, and in an unnamed pre-1.0 version.
 
     >>> from lazr.restful.declarations import operation_for_version
-    >>> class IMultiVersionMethod(Interface):
-    ...     export_as_webservice_entry()
-    ...
-    ...
+    >>> @exported_as_webservice_entry()
+    ... class IMultiVersionMethod(Interface):
     ...     @cache_for(300)
     ...     @operation_for_version('3.0')
     ...
@@ -2298,8 +2259,8 @@
 Let's define an operation that's introduced in 1.0 and removed in 2.0.
 
     >>> from lazr.restful.declarations import operation_removed_in_version
-    >>> class DisappearingMultiversionMethod(Interface):
-    ...     export_as_webservice_entry()
+    >>> @exported_as_webservice_entry()
+    ... class DisappearingMultiversionMethod(Interface):
     ...     @operation_removed_in_version(2.0)
     ...     @operation_parameters(arg=Float())
     ...     @export_read_operation()
@@ -2352,9 +2313,8 @@
 In this example, the type of the operation, the type and number of the
 arguments, and the return value change in version 1.0.
 
-    >>> class ReadOrWriteMethod(Interface):
-    ...     export_as_webservice_entry()
-    ...
+    >>> @exported_as_webservice_entry()
+    ... class ReadOrWriteMethod(Interface):
     ...     @operation_parameters(arg=TextLine(), arg2=TextLine())
     ...     @export_write_operation()
     ...     @operation_removed_in_version(1.0)
@@ -2403,9 +2363,8 @@
 
 Different versions can define different mutator methods for the same field.
 
-    >>> class IDifferentMutators(Interface):
-    ...     export_as_webservice_entry()
-    ...
+    >>> @exported_as_webservice_entry()
+    ... class IDifferentMutators(Interface):
     ...     field = exported(TextLine(readonly=True))
     ...
     ...     @mutator_for(field)
@@ -2427,9 +2386,8 @@
 
 But you can't define two mutators for the same field in the same version.
 
-    >>> class IDuplicateMutator(Interface):
-    ...     export_as_webservice_entry()
-    ...
+    >>> @exported_as_webservice_entry()
+    ... class IDuplicateMutator(Interface):
     ...     field = exported(TextLine(readonly=True))
     ...
     ...     @mutator_for(field)
@@ -2455,9 +2413,8 @@
 giving its name), and then define another one explicitly (giving the
 name of the earliest version.)
 
-    >>> class IImplicitAndExplicitMutator(Interface):
-    ...     export_as_webservice_entry()
-    ...
+    >>> @exported_as_webservice_entry()
+    ... class IImplicitAndExplicitMutator(Interface):
     ...     field = exported(TextLine(readonly=True))
     ...
     ...     @mutator_for(field)
@@ -2490,9 +2447,8 @@
 because the generate_entry_interfaces call modified the original
 class's annotations in place.)
 
-    >>> class IImplicitAndExplicitMutator(Interface):
-    ...     export_as_webservice_entry()
-    ...
+    >>> @exported_as_webservice_entry()
+    ... class IImplicitAndExplicitMutator(Interface):
     ...     field = exported(TextLine(readonly=True))
     ...
     ...     @mutator_for(field)
@@ -2522,9 +2478,8 @@
 earliest version, but not in '1.0'. This is fine: the 1.0 value for
 'fixed2' will be inherited from the previous version.
 
-    >>> class IGoodDestructorEntry(Interface):
-    ...     export_as_webservice_entry()
-    ...
+    >>> @exported_as_webservice_entry()
+    ... class IGoodDestructorEntry(Interface):
     ...     @call_with(fixed1="value3")
     ...     @operation_for_version('1.0')
     ...     @export_destructor_operation()
@@ -2542,9 +2497,8 @@
 'fixed2' is a problem. The fact that 'fixed2' is fixed in 3.0 doesn't
 help; the method is incompletely specified in 2.0.
 
-    >>> class IBadDestructorEntry(Interface):
-    ...     export_as_webservice_entry()
-    ...
+    >>> @exported_as_webservice_entry()
+    ... class IBadDestructorEntry(Interface):
     ...     @call_with(fixed2="value4")
     ...     @operation_for_version('2.0')
     ...     @export_destructor_operation()
@@ -2683,8 +2637,8 @@
 that named operation annotations proceed from the top down rather than
 the bottom up.)
 
-    >>> class WrongOrderVersions(Interface):
-    ...     export_as_webservice_entry()
+    >>> @exported_as_webservice_entry()
+    ... class WrongOrderVersions(Interface):
     ...     @export_operation_as('10_name')
     ...     @operation_for_version("1.0")
     ...     @operation_parameters(arg=Float())
@@ -2707,8 +2661,8 @@
 Here's a class in which a named operation is removed in version 1.0
 and then annotated without being reinstated.
 
-    >>> class AnnotatingARemovedMethod(Interface):
-    ...     export_as_webservice_entry()
+    >>> @exported_as_webservice_entry()
+    ... class AnnotatingARemovedMethod(Interface):
     ...     @operation_parameters(arg=TextLine())
     ...     @export_operation_as('already_been_removed')
     ...     @operation_removed_in_version("2.0")
@@ -2740,9 +2694,8 @@
 Let's consider an entry that defines a mutator in the very first
 version of the web service and never removes it.
 
-    >>> class IBetaMutatorEntry(Interface):
-    ...     export_as_webservice_entry()
-    ...
+    >>> @exported_as_webservice_entry()
+    ... class IBetaMutatorEntry(Interface):
     ...     field = exported(TextLine(readonly=True))
     ...
     ...     @mutator_for(field)
@@ -2799,9 +2752,8 @@
 Here's an entry that defines a mutator method in version 2.0, after
 the cutoff point.
 
-    >>> class I20MutatorEntry(Interface):
-    ...     export_as_webservice_entry()
-    ...
+    >>> @exported_as_webservice_entry()
+    ... class I20MutatorEntry(Interface):
     ...     field = exported(TextLine(readonly=True))
     ...
     ...     @mutator_for(field)
@@ -2843,9 +2795,8 @@
 Here's a named operation that was defined in '1.0' and promoted to a
 mutator in '3.0'.
 
-    >>> class IOperationPromotedToMutator(Interface):
-    ...     export_as_webservice_entry()
-    ...
+    >>> @exported_as_webservice_entry()
+    ... class IOperationPromotedToMutator(Interface):
     ...     field = exported(TextLine(readonly=True))
     ...
     ...     @mutator_for(field)
@@ -2915,9 +2866,8 @@
 as 'set_value' in version 2.0, and a third operation to be published as
 'set_value' in version 3.0.
 
-    >>> class IMutatorPlusNamedOperationEntry(Interface):
-    ...     export_as_webservice_entry()
-    ...
+    >>> @exported_as_webservice_entry()
+    ... class IMutatorPlusNamedOperationEntry(Interface):
     ...     field = exported(TextLine(readonly=True))
     ...
     ...     @mutator_for(field)
@@ -2981,9 +2931,8 @@
 the 'beta' version of the web service. (We have to redefine the class
 to avoid conflicting registrations.)
 
-    >>> class IBetaMutatorEntry2(IBetaMutatorEntry):
-    ...     export_as_webservice_entry()
-    ...
+    >>> @exported_as_webservice_entry()
+    ... class IBetaMutatorEntry2(IBetaMutatorEntry):
     ...     field = exported(TextLine(readonly=True))
     ...
     ...     @mutator_for(field)
@@ -3026,9 +2975,8 @@
 Again, we have to publish a new entry class, to avoid conflicting
 registrations.
 
-    >>> class IBetaMutatorEntry3(Interface):
-    ...     export_as_webservice_entry()
-    ...
+    >>> @exported_as_webservice_entry()
+    ... class IBetaMutatorEntry3(Interface):
     ...     field = exported(TextLine(readonly=True))
     ...
     ...     @mutator_for(field)

=== modified file 'src/lazr/restful/example/base/interfaces.py'
--- src/lazr/restful/example/base/interfaces.py	2020-02-04 11:52:59 +0000
+++ src/lazr/restful/example/base/interfaces.py	2020-02-19 16:09:23 +0000
@@ -29,11 +29,19 @@
 from lazr.restful.fields import CollectionField, Reference
 from lazr.restful.interfaces import IByteStorage, ITopLevelEntryLink
 from lazr.restful.declarations import (
-    collection_default_content, export_as_webservice_collection,
-    export_as_webservice_entry, export_destructor_operation,
-    export_factory_operation, export_read_operation, export_write_operation,
-    exported, operation_parameters, operation_returns_collection_of,
-    operation_returns_entry, webservice_error)
+    collection_default_content,
+    export_destructor_operation,
+    export_factory_operation,
+    export_read_operation,
+    export_write_operation,
+    exported,
+    exported_as_webservice_collection,
+    exported_as_webservice_entry,
+    operation_parameters,
+    operation_returns_collection_of,
+    operation_returns_entry,
+    webservice_error,
+    )
 
 
 class AlreadyNew(Exception):
@@ -73,9 +81,9 @@
         """Traverse to a contained object."""
 
 
+@exported_as_webservice_entry(plural_name='dishes')
 class IDish(ILocation):
     """A dish, annotated for export to the web service."""
-    export_as_webservice_entry(plural_name='dishes')
     name = exported(TextLine(title=u"Name", required=True))
     recipes = exported(CollectionField(
             title=u"Recipes in this cookbook",
@@ -85,9 +93,9 @@
         """Remove one of this dish's recipes."""
 
 
+@exported_as_webservice_entry()
 class IRecipe(ILocation):
     """A recipe, annotated for export to the web service."""
-    export_as_webservice_entry()
     id = exported(Int(title=u"Unique ID", required=True))
     dish = exported(Reference(title=u"Dish", schema=IDish))
     cookbook = exported(Reference(title=u"Cookbook", schema=Interface))
@@ -104,9 +112,9 @@
         """Delete the recipe."""
 
 
+@exported_as_webservice_entry()
 class ICookbook(IHasGet, ILocation):
     """A cookbook, annotated for export to the web service."""
-    export_as_webservice_entry()
     name = exported(TextLine(title=u"Name", required=True))
     copyright_date = exported(
         Date(title=u"Copyright Date",
@@ -165,6 +173,7 @@
 IRecipe['cookbook'].schema = ICookbook
 
 
+@exported_as_webservice_entry()
 class ICookbookSubclass(ICookbook):
     """A published subclass of ICookbook.
 
@@ -172,16 +181,15 @@
     a published entry interface that subclasses another published
     entry interface.
     """
-    export_as_webservice_entry()
 
 
 class IFeaturedCookbookLink(ITopLevelEntryLink):
     """A marker interface."""
 
 
+@exported_as_webservice_collection(ICookbook)
 class ICookbookSet(IHasGet):
     """The set of all cookbooks, annotated for export to the web service."""
-    export_as_webservice_collection(ICookbook)
 
     @collection_default_content()
     def getCookbooks():
@@ -214,18 +222,18 @@
     featured = Attribute("The currently featured cookbook.")
 
 
+@exported_as_webservice_collection(IDish)
 class IDishSet(IHasGet):
     """The set of all dishes, annotated for export to the web service."""
-    export_as_webservice_collection(IDish)
 
     @collection_default_content()
     def getDishes():
         """Return the list of dishes."""
 
 
+@exported_as_webservice_collection(IRecipe)
 class IRecipeSet(IHasGet):
     """The set of all recipes, annotated for export to the web service."""
-    export_as_webservice_collection(IRecipe)
 
     @collection_default_content()
     def getRecipes():

=== modified file 'src/lazr/restful/example/base_extended/comments.py'
--- src/lazr/restful/example/base_extended/comments.py	2020-02-04 11:52:59 +0000
+++ src/lazr/restful/example/base_extended/comments.py	2020-02-19 16:09:23 +0000
@@ -7,11 +7,13 @@
 from lazr.restful.example.base.interfaces import IRecipe
 
 from lazr.restful.declarations import (
-    export_as_webservice_entry, exported)
-
-
+    exported,
+    exported_as_webservice_entry,
+    )
+
+
+@exported_as_webservice_entry(contributes_to=[IRecipe])
 class IHasComments(Interface):
-    export_as_webservice_entry(contributes_to=[IRecipe])
     comments = exported(
         List(title=u'Comments made by users', value_type=Text()))
 

=== modified file 'src/lazr/restful/example/multiversion/resources.py'
--- src/lazr/restful/example/multiversion/resources.py	2020-02-04 11:52:59 +0000
+++ src/lazr/restful/example/multiversion/resources.py	2020-02-19 16:09:23 +0000
@@ -12,11 +12,20 @@
 from zope.location.interfaces import ILocation
 
 from lazr.restful.declarations import (
-    collection_default_content, export_as_webservice_collection,
-    export_as_webservice_entry, export_destructor_operation,
-    export_operation_as, export_read_operation, export_write_operation,
-    exported, mutator_for, operation_for_version, operation_parameters,
-    operation_removed_in_version, operation_returns_collection_of)
+    collection_default_content,
+    export_destructor_operation,
+    export_operation_as,
+    export_read_operation,
+    export_write_operation,
+    exported,
+    exported_as_webservice_collection,
+    exported_as_webservice_entry,
+    mutator_for,
+    operation_for_version,
+    operation_parameters,
+    operation_removed_in_version,
+    operation_returns_collection_of,
+    )
 
 # Our implementations of these classes can be based on the
 # implementations from the WSGI example.
@@ -26,8 +35,8 @@
 
 # Our interfaces _will_ diverge from the WSGI example interfaces, so
 # define them separately.
+@exported_as_webservice_entry()
 class IKeyValuePair(ILocation):
-    export_as_webservice_entry()
     key = exported(Text(title=u"The key"))
     value = exported(Text(title=u"The value"))
     a_comment = exported(Text(title=u"A comment on this key-value pair.",
@@ -61,9 +70,8 @@
         """A destructor that simply sets .deleted to True."""
 
 
+@exported_as_webservice_collection(IKeyValuePair)
 class IPairSet(ILocation):
-    export_as_webservice_collection(IKeyValuePair)
-
     # In versions 2.0 and 3.0, the collection of key-value pairs
     # includes all pairs.
     @collection_default_content("2.0")

=== modified file 'src/lazr/restful/example/wsgi/README.txt'
--- src/lazr/restful/example/wsgi/README.txt	2009-09-16 16:00:46 +0000
+++ src/lazr/restful/example/wsgi/README.txt	2020-02-19 16:09:23 +0000
@@ -76,7 +76,7 @@
 lazr.restful.example.wsgi.resources. First we define an interface
 (IPairSet) that's decorated with lazr.restful decorators:
 
-1. export_as_webservice_collection(IKeyValuePair) tells lazr.restful
+1. @exported_as_webservice_collection(IKeyValuePair) tells lazr.restful
    that an IPairSet should be published as a collection resource, as
    opposed to being published as an entry or not published at all. The
    "IKeyValuePair" lets lazr.restful know that this is a collection of
@@ -96,7 +96,7 @@
 lazr.restful.example.wsgi.resources. First we define an interface
 (IKeyValuePair) that's decorated with lazr.restful decorators:
 
-1. export_as_webservice_entry() tells lazr.restful that an
+1. @exported_as_webservice_entry() tells lazr.restful that an
    IKeyValuePair should be published as an entry, as opposed to being
    published as an entry or not published at all.
 
@@ -140,7 +140,7 @@
 3. There are no more path fragments, so traversal is complete. The
    PairSet object will be published as a collection resource. Why a
    collection? Because PairSet implements IPairSet, which is published
-   as a collection. (Remember export_as_webservice_collection()?)
+   as a collection. (Remember @exported_as_webservice_collection()?)
 
 You don't have to write all the traversal code your web service will
 ever use. There's a set of default rules that take over once your
@@ -158,7 +158,7 @@
    object.
 
 4. Because IKeyValuePair is published as an entry (remember
-   export_as_webservice_entry?), the custom traversal code now
+   @exported_as_webservice_entry?), the custom traversal code now
    stops. What happens next is entirely controlled by lazr.restful.
    Because of this, it doesn't make sense to have an entry subclass
    TraverseWithGet or implement IPublishTraverse.

=== modified file 'src/lazr/restful/example/wsgi/resources.py'
--- src/lazr/restful/example/wsgi/resources.py	2020-02-04 11:52:59 +0000
+++ src/lazr/restful/example/wsgi/resources.py	2020-02-19 16:09:23 +0000
@@ -13,21 +13,23 @@
 from zope.location.interfaces import ILocation
 
 from lazr.restful.declarations import (
-    collection_default_content, export_as_webservice_collection,
-    export_as_webservice_entry, exported)
+    collection_default_content,
+    exported,
+    exported_as_webservice_collection,
+    exported_as_webservice_entry,
+    )
 from lazr.restful.interfaces import IServiceRootResource
 from lazr.restful.simple import TraverseWithGet
 
 
+@exported_as_webservice_entry()
 class IKeyValuePair(ILocation):
-    export_as_webservice_entry()
     key = exported(Text(title=u"The key"))
     value = exported(Text(title=u"The value"))
 
 
+@exported_as_webservice_collection(IKeyValuePair)
 class IPairSet(ILocation):
-    export_as_webservice_collection(IKeyValuePair)
-
     @collection_default_content()
     def getPairs():
         """Return the key-value pairs."""

=== modified file 'src/lazr/restful/testing/webservice.py'
--- src/lazr/restful/testing/webservice.py	2020-02-04 13:17:32 +0000
+++ src/lazr/restful/testing/webservice.py	2020-02-19 16:09:23 +0000
@@ -47,7 +47,7 @@
 
 from lazr.restful.declarations import (
     collection_default_content, exported,
-    export_as_webservice_collection, export_as_webservice_entry,
+    exported_as_webservice_collection, exported_as_webservice_entry,
     export_read_operation, operation_parameters)
 from lazr.restful.interfaces import (
     IServiceRootResource, IWebServiceClientRequest,
@@ -546,12 +546,12 @@
         """)
 
 
+@exported_as_webservice_entry()
 class IGenericEntry(Interface):
     """A simple, reusable entry interface for use in tests.
 
     The entry publishes one field and one named operation.
     """
-    export_as_webservice_entry()
 
     # pylint: disable-msg=E0213
     a_field = exported(
@@ -569,9 +569,9 @@
         """
 
 
+@exported_as_webservice_collection(IGenericEntry)
 class IGenericCollection(Interface):
     """A simple collection containing `IGenericEntry`, for use in tests."""
-    export_as_webservice_collection(IGenericEntry)
 
     # pylint: disable-msg=E0211
     @collection_default_content()

=== modified file 'src/lazr/restful/tests/test_declarations.py'
--- src/lazr/restful/tests/test_declarations.py	2020-02-13 00:11:04 +0000
+++ src/lazr/restful/tests/test_declarations.py	2020-02-19 16:09:23 +0000
@@ -4,6 +4,8 @@
 
 from __future__ import absolute_import, print_function
 
+import sys
+
 import testtools
 from zope.component import (
     adapter,
@@ -34,13 +36,17 @@
 from lazr.restful.declarations import (
     accessor_for,
     call_with,
+    collection_default_content,
     error_status,
+    export_as_webservice_collection,
     export_as_webservice_entry,
-    exported,
     export_read_operation,
     export_write_operation,
+    exported,
+    exported_as_webservice_entry,
     generate_entry_interfaces,
     generate_operation_adapter,
+    LAZR_WEBSERVICE_EXPORTED,
     LAZR_WEBSERVICE_NAME,
     mutator_for,
     operation_for_version,
@@ -137,8 +143,8 @@
         # There can only be one accessor defined for a given attribute
         # at a given version.
         def declare_too_many_accessors():
+            @exported_as_webservice_entry(contributes_to=[IProduct])
             class IHasTooManyAccessors(Interface):
-                export_as_webservice_entry(contributes_to=[IProduct])
                 needs_an_accessor = exported(
                     TextLine(title=u'This needs an accessor', readonly=True))
 
@@ -241,8 +247,9 @@
     def test_redacted_fields_for_empty_entry(self):
         # An entry which doesn't export any fields/operations will have no
         # redacted fields.
+        @exported_as_webservice_entry()
         class IEmpty(Interface):
-            export_as_webservice_entry()
+            pass
         @implementer(IEmpty)
         class Empty:
             pass
@@ -300,8 +307,8 @@
         # A contributing interface can only contribute to exported interfaces.
         class INotExported(Interface):
             pass
+        @exported_as_webservice_entry(contributes_to=[INotExported])
         class IContributor(Interface):
-            export_as_webservice_entry(contributes_to=[INotExported])
             title = exported(TextLine(title=u'The project title'))
         self.assertRaises(
             AttemptToContributeToNonExportedInterface,
@@ -333,6 +340,150 @@
             'product', EntryAdapterUtility(adapter.__class__).singular_type)
 
 
+class TestExportAsWebserviceEntry(testtools.TestCase):
+    """Tests for export_as_webservice_entry."""
+
+    def setUp(self):
+        super(TestExportAsWebserviceEntry, self).setUp()
+        if sys.version_info[0] >= 3:
+            self.skipTest(
+                'export_as_webservice_entry is only supported on Python 2')
+
+    def test_works_on_interface(self):
+        # export_as_webservice_entry works on an interface.
+        class IFoo(Interface):
+            export_as_webservice_entry()
+
+        self.assertTrue(
+            IFoo.queryTaggedValue(LAZR_WEBSERVICE_EXPORTED)['exported'])
+
+    def test_requires_interface(self):
+        # export_as_webservice_entry can only be used on Interface.
+        def export_non_interface():
+            class NotAnInterface(object):
+                export_as_webservice_entry()
+
+        exception = self.assertRaises(TypeError, export_non_interface)
+        self.assertEqual(
+            'export_as_webservice_entry() can only be used on an interface.',
+            str(exception))
+
+    def test_must_be_within_interface_definition(self):
+        # export_as_webservice_entry can only be used from within a
+        # interface definition.
+        exception = self.assertRaises(TypeError, export_as_webservice_entry)
+        self.assertEqual(
+            'export_as_webservice_entry() can only be used from within an '
+            'interface definition.',
+            str(exception))
+
+
+class TestExportAsWebserviceCollection(testtools.TestCase):
+    """Tests for export_as_webservice_collection."""
+
+    def setUp(self):
+        super(TestExportAsWebserviceCollection, self).setUp()
+        if sys.version_info[0] >= 3:
+            self.skipTest(
+                'export_as_webservice_collection is only supported on '
+                'Python 2')
+
+    def test_works_on_interface_with_tagged_method(self):
+        # export_as_webservice_collection works on an interface that has an
+        # entry schema and a method tagged with @collection_default_content.
+        class IFoo(Interface):
+            export_as_webservice_collection(Interface)
+
+            @collection_default_content()
+            def getAll():
+                pass
+
+        self.assertEqual(
+            {None: ('getAll', {})},
+            IFoo.queryTaggedValue(LAZR_WEBSERVICE_EXPORTED)[
+                'collection_default_content'])
+
+    def test_requires_entry_schema(self):
+        # export_as_webservice_collection requires an entry schema.
+        def export_without_entry_schema():
+            class MissingEntrySchema(Interface):
+                export_as_webservice_collection()
+
+        exception = self.assertRaises(TypeError, export_without_entry_schema)
+        self.assertEqual(
+            'export_as_webservice_collection() takes exactly 1 argument (0 '
+            'given)',
+            str(exception))
+
+    def test_requires_entry_schema_as_interface(self):
+        # export_as_webservice_collection requires the entry schema to be an
+        # interface.
+        def export_with_invalid_entry_schema():
+            class InvalidEntrySchema(Interface):
+                export_as_webservice_collection('not an interface')
+
+        exception = self.assertRaises(
+            TypeError, export_with_invalid_entry_schema)
+        self.assertEqual('entry_schema must be an interface.', str(exception))
+
+    def test_requires_tagged_method(self):
+        # export_as_webservice_collection can only be used on a collection
+        # that has a method marked as exporting the default content.
+        def export_missing_default_content():
+            class MissingDefaultContent(Interface):
+                export_as_webservice_collection(Interface)
+
+        exception = self.assertRaises(
+            TypeError, export_missing_default_content)
+        self.assertEqual(
+            'export_as_webservice_collection() is missing a method tagged '
+            'with @collection_default_content.',
+            str(exception))
+
+    def test_refuses_multiple_tagged_methods(self):
+        # export_as_webservice_collection cannot be used on a collection
+        # that has multiple methods marked as exporting the default content.
+        def export_two_default_content():
+            class TwoDefaultContent(Interface):
+                export_as_webservice_collection(Interface)
+
+                @collection_default_content()
+                def getAll1():
+                    """A first getAll()."""
+
+                @collection_default_content()
+                def getAll2():
+                    """Another getAll()."""
+
+        exception = self.assertRaises(TypeError, export_two_default_content)
+        self.assertEqual(
+            "Only one method can be marked with @collection_default_content "
+            "for version '(earliest version)'.",
+            str(exception))
+
+    def test_requires_interface(self):
+        # export_as_webservice_collection can only be used on Interface.
+        def export_non_interface():
+            class NotAnInterface(object):
+                export_as_webservice_collection(Interface)
+
+        exception = self.assertRaises(TypeError, export_non_interface)
+        self.assertEqual(
+            'export_as_webservice_collection() can only be used on an '
+            'interface.',
+            str(exception))
+
+    def test_must_be_within_interface_definition(self):
+        # export_as_webservice_collection can only be used from within an
+        # interface definition.
+        exception = self.assertRaises(
+            TypeError, export_as_webservice_collection, Interface)
+        self.assertEqual(
+            'export_as_webservice_collection() can only be used from within '
+            'an interface definition.',
+            str(exception))
+
+
 class NotExportedException(Exception):
     pass
 
@@ -351,8 +502,9 @@
     pass
 
 
+@exported_as_webservice_entry()
 class IExported(Interface):
-    export_as_webservice_entry()
+    pass
 
 
 class TestFindExportedInterfaces(testtools.TestCase):
@@ -394,8 +546,8 @@
         self.assertExportsNames(Module, ['ExportedExceptionOne'])
 
 
+@exported_as_webservice_entry()
 class IProduct(Interface):
-    export_as_webservice_entry()
     title = exported(TextLine(title=u'The product title'))
     # Need to define the three attributes below because we have a test which
     # wraps a Product object with a security proxy and later uses adapters
@@ -415,8 +567,8 @@
     _bug_target_name = None
 
 
+@exported_as_webservice_entry()
 class IProject(Interface):
-    export_as_webservice_entry()
     title = exported(TextLine(title=u'The project title'))
 
 
@@ -426,8 +578,8 @@
     _bug_count = 0
 
 
+@exported_as_webservice_entry(contributes_to=[IProduct, IProject])
 class IHasBugs(Interface):
-    export_as_webservice_entry(contributes_to=[IProduct, IProject])
     bug_count = exported(Int(title=u'Number of bugs'))
     not_exported = TextLine(title=u'Not exported')
     bug_target_name = exported(
@@ -463,14 +615,14 @@
         pass
 
 
+@exported_as_webservice_entry(contributes_to=[IProduct])
 class IHasBugs2(Interface):
-    export_as_webservice_entry(contributes_to=[IProduct])
     bug_count = exported(Int(title=u'Number of bugs'))
     not_exported = TextLine(title=u'Not exported')
 
 
+@exported_as_webservice_entry(contributes_to=[IProduct])
 class IHasBugs3(Interface):
-    export_as_webservice_entry(contributes_to=[IProduct])
     not_exported = TextLine(title=u'Not exported')
 
     @export_read_operation()
@@ -504,8 +656,8 @@
     pass
 
 
+@exported_as_webservice_entry()
 class IBranch(Interface):
-    export_as_webservice_entry()
     name = TextLine(title=u'The branch name')
 
 
@@ -516,8 +668,8 @@
         self.name = name
 
 
+@exported_as_webservice_entry(contributes_to=[IProduct])
 class IHasBranches(Interface):
-    export_as_webservice_entry(contributes_to=[IProduct])
     not_exported = TextLine(title=u'Not exported')
     development_branch = exported(
         Reference(schema=IBranch, readonly=True),
@@ -571,32 +723,36 @@
 
 # Classes for TestEntryMultiversion.
 
+@exported_as_webservice_entry(as_of="2.0")
 class INotInitiallyExported(Interface):
     # An entry that's not exported in the first version of the web
     # service.
-    export_as_webservice_entry(as_of="2.0")
-
-
+    pass
+
+
+@exported_as_webservice_entry(
+    versioned_annotations=[('2.0', dict(exported=False))])
 class INotPresentInLaterVersion(Interface):
     # An entry that's only exported in the first version of the web
     # service.
-    export_as_webservice_entry(
-        versioned_annotations=[('2.0', dict(exported=False))])
-
-
+    pass
+
+
+@exported_as_webservice_entry(
+    singular_name="octopus", plural_name="octopi",
+    versioned_annotations=[
+        ('2.0', dict(singular_name="fish", plural_name="fishes"))])
 class IHasDifferentNamesInDifferentVersions(Interface):
     # An entry that has different names in different versions.
-    export_as_webservice_entry(
-        singular_name="octopus", plural_name="octopi",
-        versioned_annotations=[
-            ('2.0', dict(singular_name="fish", plural_name="fishes"))])
-
-
+    pass
+
+
+@exported_as_webservice_entry(
+    singular_name="frog",
+    versioned_annotations=[('2.0', dict(singular_name="toad"))])
 class IHasDifferentSingularNamesInDifferentVersions(Interface):
     # An entry that has different names in different versions.
-    export_as_webservice_entry(
-        singular_name="frog",
-        versioned_annotations=[('2.0', dict(singular_name="toad"))])
+    pass
 
 
 class TestEntryMultiversion(TestCaseWithWebServiceFixtures):
@@ -640,10 +796,11 @@
         # You can't define an entry class that includes an unrecognized
         # annotation in its versioned_annotations.
         try:
+            @exported_as_webservice_entry(
+                versioned_annotations=[
+                    ('2.0', dict(no_such_annotation=True))])
             class IUsesNonexistentAnnotation(Interface):
-                export_as_webservice_entry(
-                    versioned_annotations=[
-                        ('2.0', dict(no_such_annotation=True))])
+                pass
             self.fail("Expected ValueError.")
         except ValueError as exception:
             self.assertEqual(
@@ -671,58 +828,55 @@
 
 # Classes for TestReqireExplicitVersions
 
+@exported_as_webservice_entry()
 class IEntryExportedWithoutAsOf(Interface):
-    export_as_webservice_entry()
-
-
+    pass
+
+
+@exported_as_webservice_entry(as_of="1.0")
 class IEntryExportedWithAsOf(Interface):
-    export_as_webservice_entry(as_of="1.0")
-
-
+    pass
+
+
+@exported_as_webservice_entry(as_of="2.0")
 class IEntryExportedAsOfLaterVersion(Interface):
-    export_as_webservice_entry(as_of="2.0")
-
-
+    pass
+
+
+@exported_as_webservice_entry(as_of="1.0")
 class IFieldExportedWithoutAsOf(Interface):
-    export_as_webservice_entry(as_of="1.0")
-
     field = exported(TextLine(), exported=True)
 
 
+@exported_as_webservice_entry(as_of="1.0")
 class IFieldExportedToEarliestVersionUsingAsOf(Interface):
-    export_as_webservice_entry(as_of="1.0")
-
     field = exported(TextLine(), as_of='1.0')
 
 
+@exported_as_webservice_entry(as_of="1.0")
 class IFieldExportedToLatestVersionUsingAsOf(Interface):
-    export_as_webservice_entry(as_of="1.0")
-
     field = exported(TextLine(), as_of='2.0')
 
 
+@exported_as_webservice_entry(as_of="1.0")
 class IFieldDefiningAttributesBeforeAsOf(Interface):
-    export_as_webservice_entry(as_of="1.0")
-
     field = exported(TextLine(), ('1.0', dict(exported=True)),
                      as_of='2.0')
 
+
+@exported_as_webservice_entry(as_of="1.0")
 class IFieldAsOfNonexistentVersion(Interface):
-    export_as_webservice_entry(as_of="1.0")
-
     field = exported(TextLine(), as_of='nosuchversion')
 
 
+@exported_as_webservice_entry(as_of="1.0")
 class IFieldDoubleDefinition(Interface):
-    export_as_webservice_entry(as_of="1.0")
-
     field = exported(TextLine(), ('2.0', dict(exported_as='name2')),
                      exported_as='name2', as_of='2.0')
 
 
+@exported_as_webservice_entry(as_of="1.0")
 class IFieldImplicitOperationDefinition(Interface):
-    export_as_webservice_entry(as_of="1.0")
-
     @call_with(value="2.0")
     @operation_for_version('2.0')
     @call_with(value="1.0")
@@ -731,9 +885,8 @@
         pass
 
 
+@exported_as_webservice_entry(as_of="1.0")
 class IFieldExplicitOperationDefinition(Interface):
-    export_as_webservice_entry(as_of="1.0")
-
     @call_with(value="2.0")
     @operation_for_version('2.0')
     @call_with(value="1.0")
@@ -922,47 +1075,43 @@
     pass
 
 
+@exported_as_webservice_entry()
 class IReferencesNotPublished(Interface):
-    export_as_webservice_entry()
     field = exported(Reference(schema=INotPublished))
 
 
+@exported_as_webservice_entry()
 class IReferencesCollectionOfNotPublished(Interface):
-    export_as_webservice_entry()
     field = exported(
         CollectionField(value_type=Reference(schema=INotPublished)))
 
 
+@exported_as_webservice_entry()
 class IOperationReturnsNotPublished(Interface):
-    export_as_webservice_entry()
-
     @operation_returns_entry(INotPublished)
     @export_read_operation()
     def get_impossible_object():
         pass
 
 
+@exported_as_webservice_entry()
 class IOperationReturnsNotPublishedCollection(Interface):
-    export_as_webservice_entry()
-
     @operation_returns_collection_of(INotPublished)
     @export_read_operation()
     def get_impossible_objects():
         pass
 
 
+@exported_as_webservice_entry()
 class IOperationAcceptsNotPublished(Interface):
-    export_as_webservice_entry()
-
     @operation_parameters(arg=Reference(schema=INotPublished))
     @export_write_operation()
     def use_impossible_object(arg):
         pass
 
 
+@exported_as_webservice_entry()
 class IOperationAcceptsCollectionOfNotPublished(Interface):
-    export_as_webservice_entry()
-
     @operation_parameters(
         arg=CollectionField(value_type=Reference(schema=INotPublished)))
     @export_write_operation()
@@ -970,31 +1119,35 @@
         pass
 
 
+@exported_as_webservice_entry(as_of='2.0')
 class IPublishedTooLate(Interface):
-    export_as_webservice_entry(as_of='2.0')
-
-
+    pass
+
+
+@exported_as_webservice_entry(as_of='1.0')
 class IReferencesPublishedTooLate(Interface):
-    export_as_webservice_entry(as_of='1.0')
     field = exported(Reference(schema=IPublishedTooLate))
 
 
+@exported_as_webservice_entry(as_of='1.0')
 class IPublishedEarly(Interface):
-    export_as_webservice_entry(as_of='1.0')
-
-
+    pass
+
+
+@exported_as_webservice_entry(as_of='2.0')
 class IPublishedLate(Interface):
-    export_as_webservice_entry(as_of='2.0')
     field = exported(Reference(schema=IPublishedEarly))
 
 
+@exported_as_webservice_entry(
+    as_of='1.0', versioned_annotations=[
+        VersionedObject('2.0', dict(exported=False))])
 class IPublishedAndThenRemoved(Interface):
-    export_as_webservice_entry(
-        as_of='1.0', versioned_annotations=[
-            VersionedObject('2.0', dict(exported=False))])
-
+    pass
+
+
+@exported_as_webservice_entry(as_of='1.0')
 class IReferencesPublishedAndThenRemoved(Interface):
-    export_as_webservice_entry(as_of='1.0')
     field = exported(Reference(schema=IPublishedAndThenRemoved))
 
 

=== modified file 'src/lazr/restful/tests/test_webservice.py'
--- src/lazr/restful/tests/test_webservice.py	2020-02-13 00:11:04 +0000
+++ src/lazr/restful/tests/test_webservice.py	2020-02-19 16:09:23 +0000
@@ -58,7 +58,10 @@
     ResourceGETOperation,
     )
 from lazr.restful.declarations import (
-    exported, export_as_webservice_entry, LAZR_WEBSERVICE_NAME)
+    exported,
+    exported_as_webservice_entry,
+    LAZR_WEBSERVICE_NAME,
+    )
 from lazr.restful.testing.webservice import (
     create_web_service_request,
     DummyAbsoluteURL,
@@ -227,9 +230,9 @@
             IAbsoluteURL)
 
 
+@exported_as_webservice_entry()
 class IHasOneField(Interface):
     """An entry with a single field."""
-    export_as_webservice_entry()
     a_field = exported(TextLine(title=u"A field."))
 
 
@@ -240,9 +243,9 @@
         self.a_field = value
 
 
+@exported_as_webservice_entry()
 class IHasTwoFields(Interface):
     """An entry with two fields."""
-    export_as_webservice_entry()
     a_field = exported(TextLine(title=u"A field."))
     another_field = exported(TextLine(title=u"Another field."))
 
@@ -317,9 +320,9 @@
         self.assertFalse('web_link' in self.wadl)
 
 
+@exported_as_webservice_entry(publish_web_link=False)
 class IHasNoWebLink(Interface):
     """An entry that does not publish a web_link."""
-    export_as_webservice_entry(publish_web_link=False)
     a_field = exported(TextLine(title=u"A field."))
 
 
@@ -361,9 +364,9 @@
         return super(InterfaceRestrictedField, self).bind(context)
 
 
+@exported_as_webservice_entry()
 class IHasRestrictedField(Interface):
     """An entry with an InterfaceRestrictedField."""
-    export_as_webservice_entry()
     a_field = exported(InterfaceRestrictedField(Interface))
 
 
@@ -374,9 +377,9 @@
         self.a_field = value
 
 
+@exported_as_webservice_entry()
 class IHasFieldExportedAsDifferentName(Interface):
     """An entry with a field exported as a different name."""
-    export_as_webservice_entry()
     a_field = exported(TextLine(title=u"A field."), exported_as='field')
 
 
@@ -616,9 +619,9 @@
     UNICODE = Item(u"Uni\u00e7ode", "Uni\u00e7ode choice")
 
 
+@exported_as_webservice_entry()
 class ICanBeSetToUnicodeValue(Interface):
     """An entry with an InterfaceRestrictedField."""
-    export_as_webservice_entry()
     a_field = exported(Choice(
         vocabulary=UnicodeChoice,
         title=u"A value that might be ASCII or Unicode.",
@@ -662,9 +665,8 @@
     """Test the docstring generation."""
 
     # This one is used to test when docstrings are missing.
+    @exported_as_webservice_entry()
     class IUndocumentedEntry(Interface):
-        export_as_webservice_entry()
-
         a_field = exported(TextLine())
 
     testmodule_objects = [
@@ -768,8 +770,9 @@
 def make_entry(name):
     """Make an entity with some attibutes to expose as a web service."""
     code = """
+        @exported_as_webservice_entry(singular_name='%(name)s')
         class %(name)s(Interface):
-            export_as_webservice_entry(singular_name='%(name)s')
+            pass
         """ % locals()
 
     for letter in 'rstuvwxyz':
@@ -816,9 +819,9 @@
 class DuplicateSingularNameTestCase(DuplicateNameTestCase):
     """Test AssertionError when resource types share a singular name."""
 
+    @exported_as_webservice_entry('generic_entry')
     class IDuplicate(Interface):
         """An entry that reuses the singular name of IGenericEntry."""
-        export_as_webservice_entry('generic_entry')
 
     testmodule_objects = [IGenericEntry, IDuplicate]
 
@@ -830,9 +833,9 @@
 class DuplicatePluralNameTestCase(DuplicateNameTestCase):
     """Test AssertionERror when resource types share a plural name."""
 
+    @exported_as_webservice_entry(plural_name='generic_entrys')
     class IDuplicate(Interface):
         """An entry that reuses the plural name of IGenericEntry."""
-        export_as_webservice_entry(plural_name='generic_entrys')
 
     testmodule_objects = [IGenericEntry, IDuplicate]
 
@@ -890,9 +893,9 @@
         endInteraction()
 
 
+@exported_as_webservice_entry()
 class ITestEntry(IEntry):
     """Interface for a test entry."""
-    export_as_webservice_entry()
 
 
 @implementer(ITestEntry)