summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/pyramid/registry.py6
-rw-r--r--src/pyramid/testing.py4
2 files changed, 3 insertions, 7 deletions
diff --git a/src/pyramid/registry.py b/src/pyramid/registry.py
index 37a39fedb..6f6ef5f77 100644
--- a/src/pyramid/registry.py
+++ b/src/pyramid/registry.py
@@ -57,7 +57,7 @@ class Registry(Components, dict):
def _clear_view_lookup_cache(self):
self._view_lookup_cache = {}
- def __nonzero__(self):
+ def __bool__(self):
# defeat bool determination via dict.__len__
return True
@@ -245,11 +245,9 @@ class Introspectable(dict):
self.discriminator,
)
- def __nonzero__(self):
+ def __bool__(self):
return True
- __bool__ = __nonzero__ # py3
-
def register(self, introspector, action_info):
self.discriminator = undefer(self.discriminator)
self.action_info = action_info
diff --git a/src/pyramid/testing.py b/src/pyramid/testing.py
index 7c54d7428..8ee9f976c 100644
--- a/src/pyramid/testing.py
+++ b/src/pyramid/testing.py
@@ -203,11 +203,9 @@ class DummyResource:
__iter__ = keys
- def __nonzero__(self):
+ def __bool__(self):
return True
- __bool__ = __nonzero__
-
def __len__(self):
return len(self.subs)