Merge lp:~cjwatson/lazr.restful/py3-safe-hasattr-tests into lp:lazr.restful

[Colin Watson]

Adjust tests for hasattr() fix in Python 3.2.

Python 3.2 fixed hasattr() to only catch AttributeError rather than masking other errors, giving it similar behaviour to safe_hasattr() for most purposes. Adjust the tests to handle this.

[Cristian Gonzalez (cristiangsp)]

Looks good!

review: Approve

[Ioana Lasc (ilasc)]

review: Approve

=== modified file 'src/lazr/restful/docs/utils.rst'
--- src/lazr/restful/docs/utils.rst	2020-09-06 22:57:35 +0000
+++ src/lazr/restful/docs/utils.rst	2021-01-21 00:48:28 +0000
@@ -297,6 +297,9 @@
 caller. This behaviour of the builtin hasattr() is annoying because it
 makes problems harder to diagnose.
 
+(The builtin hasattr() is fixed as of Python 3.2.)
+
+    >>> import sys
     >>> from lazr.restful.utils import safe_hasattr
 
     >>> class Oracle(object):
@@ -304,12 +307,15 @@
     ...     def is_full_moon(self):
     ...         return full_moon
     >>> oracle = Oracle()
-    >>> hasattr(oracle, 'is_full_moon')
+    >>> if sys.version_info[:2] < (3, 2):
+    ...     hasattr(oracle, 'is_full_moon')
+    ... else:
+    ...     False
     False
     >>> safe_hasattr(oracle, 'is_full_moon')
     Traceback (most recent call last):
       ...
-    NameError: global name 'full_moon' is not defined
+    NameError: ...name 'full_moon' is not defined
 
     >>> full_moon = True
     >>> hasattr(oracle, 'is_full_moon')