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

[Colin Watson]

Handle int/long changes in Python 3.

[Tom Wardill (twom)]

review: Approve

=== modified file 'src/lazr/restful/declarations.py'
--- src/lazr/restful/declarations.py	2020-07-22 23:22:26 +0000
+++ src/lazr/restful/declarations.py	2020-08-10 16:58:57 +0000
@@ -47,6 +47,7 @@
 import itertools
 import sys
 
+import six
 from zope.component import getUtility, getGlobalSiteManager
 from zope.interface import classImplements
 from zope.interface.advice import addClassAdvisor
@@ -1042,9 +1043,9 @@
 
     def __init__(self, duration):
         """Specify the duration, in seconds, of the caching resource."""
-        if not isinstance(duration, (int, long)):
+        if not isinstance(duration, six.integer_types):
             raise TypeError(
-                'Caching duration should be int or long, not %s' %
+                'Caching duration should be an integer type, not %s' %
                 duration.__class__.__name__)
         if duration <= 0:
             raise ValueError(
 
=== modified file 'src/lazr/restful/docs/webservice-declarations.rst'
--- src/lazr/restful/docs/webservice-declarations.rst	2020-07-22 23:22:26 +0000
+++ src/lazr/restful/docs/webservice-declarations.rst	2020-08-10 16:58:57 +0000
@@ -1615,7 +1615,7 @@
     ...
     Traceback (most recent call last):
     ...
-    TypeError: Caching duration should be int or long, not str
+    TypeError: Caching duration should be an integer type, not str
     >>>
     >>> class ICachedBookSet(IBookSet):
     ...     @cache_for(-15)