diff options
| author | Eli Collins <elic@assurancetechnologies.com> | 2012-04-17 23:14:51 -0400 |
|---|---|---|
| committer | Eli Collins <elic@assurancetechnologies.com> | 2012-04-17 23:14:51 -0400 |
| commit | 64ab6fc89b497efa9169f11d55251e417c4db0ba (patch) | |
| tree | b3f6f5dc27b87a6bc90cb3686fa98239ee8ff053 /passlib/utils/compat.py | |
| parent | 8eb4c4d3b58eec6802c698ddbf357b2fd243a68c (diff) | |
| parent | cd029846fdc0c3d7ffc7f53caad4579e7e0e8725 (diff) | |
| download | passlib-ironpython-support-dev.tar.gz | |
Merge from defaultironpython-support-dev
Diffstat (limited to 'passlib/utils/compat.py')
| -rw-r--r-- | passlib/utils/compat.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/passlib/utils/compat.py b/passlib/utils/compat.py index 3d7b012..5b413cd 100644 --- a/passlib/utils/compat.py +++ b/passlib/utils/compat.py @@ -85,7 +85,7 @@ __all__ = [ 'print_', # type detection - 'is_mapping', +## 'is_mapping', 'callable', 'int_types', 'num_types', @@ -289,9 +289,9 @@ else: #============================================================================= # typing #============================================================================= -def is_mapping(obj): - # non-exhaustive check, enough to distinguish from lists, etc - return hasattr(obj, "items") +##def is_mapping(obj): +## # non-exhaustive check, enough to distinguish from lists, etc +## return hasattr(obj, "items") if (3,0) <= sys.version_info < (3,2): # callable isn't dead, it's just resting @@ -454,7 +454,7 @@ class _LazyOverlayModule(ModuleType): attrs.update(self.__dict__) attrs.update(self.__attrmap) proxy = self.__proxy - if proxy: + if proxy is not None: attrs.update(dir(proxy)) return list(attrs) |