summaryrefslogtreecommitdiff
path: root/psutil/_compat.py
diff options
context:
space:
mode:
authorGiampaolo Rodola' <g.rodola@gmail.com>2013-11-21 21:04:44 +0100
committerGiampaolo Rodola' <g.rodola@gmail.com>2013-11-21 21:04:44 +0100
commitd59d12c6b815d6488cf40cc1e4e380bc4ddc934a (patch)
tree9e5571896bc57853e459125abdb1103590553325 /psutil/_compat.py
parent33024b00cdf3cb0253fba91bedc429ed8344e933 (diff)
downloadpsutil-d59d12c6b815d6488cf40cc1e4e380bc4ddc934a.tar.gz
pep8ify
Diffstat (limited to 'psutil/_compat.py')
-rw-r--r--psutil/_compat.py31
1 files changed, 15 insertions, 16 deletions
diff --git a/psutil/_compat.py b/psutil/_compat.py
index 17ecc2a0..282c05af 100644
--- a/psutil/_compat.py
+++ b/psutil/_compat.py
@@ -10,17 +10,14 @@ __all__ = ["PY3", "int", "long", "xrange", "exec_", "callable",
"namedtuple", "property", "defaultdict"]
import sys
-
-
-# --- python 2/3 compatibility layer
-
-PY3 = sys.version_info >= (3,)
-
try:
import __builtin__
except ImportError:
import builtins as __builtin__ # py3
+PY3 = sys.version_info >= (3,)
+
+
if PY3:
int = int
long = int
@@ -90,22 +87,22 @@ except ImportError:
names = list(field_names)
seen = set()
for i, name in enumerate(names):
- if (not min(c.isalnum() or c=='_' for c in name) or _iskeyword(name)
+ if (not min(c.isalnum() or c == '_' for c in name) or _iskeyword(name)
or not name or name[0].isdigit() or name.startswith('_')
or name in seen):
names[i] = '_%d' % i
seen.add(name)
field_names = tuple(names)
for name in (typename,) + field_names:
- if not min(c.isalnum() or c=='_' for c in name):
- raise ValueError('Type names and field names can only contain ' \
+ if not min(c.isalnum() or c == '_' for c in name):
+ raise ValueError('Type names and field names can only contain '
'alphanumeric characters and underscores: %r'
% name)
if _iskeyword(name):
- raise ValueError('Type names and field names cannot be a keyword: %r' \
+ raise ValueError('Type names and field names cannot be a keyword: %r'
% name)
if name[0].isdigit():
- raise ValueError('Type names and field names cannot start with a ' \
+ raise ValueError('Type names and field names cannot start with a '
'number: %r' % name)
seen_names = set()
for name in field_names:
@@ -154,8 +151,9 @@ except ImportError:
sys.stdout.flush()
# Execute the template string in a temporary namespace
- namespace = dict(_itemgetter=_itemgetter, __name__='namedtuple_%s' % typename,
- _property=property, _tuple=tuple)
+ namespace = dict(
+ _itemgetter=_itemgetter, __name__='namedtuple_%s' % typename,
+ _property=property, _tuple=tuple)
try:
exec_(template, namespace)
except SyntaxError:
@@ -169,7 +167,8 @@ except ImportError:
# for example) or sys._getframe is not defined for arguments
# greater than 0 (IronPython).
try:
- result.__module__ = _sys._getframe(1).f_globals.get('__name__', '__main__')
+ result.__module__ = _sys._getframe(
+ 1).f_globals.get('__name__', '__main__')
except (AttributeError, ValueError):
pass
@@ -208,8 +207,8 @@ except ImportError:
class defaultdict(dict):
def __init__(self, default_factory=None, *a, **kw):
- if (default_factory is not None and
- not hasattr(default_factory, '__call__')):
+ if (default_factory is not None and \
+ not hasattr(default_factory, '__call__')):
raise TypeError('first argument must be callable')
dict.__init__(self, *a, **kw)
self.default_factory = default_factory