dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 17 Wiki Activity

Formatting and layout changes

Browse Source
This commit is contained in:
Ebag333
2017-02-08 23:32:51 -08:00
parent 9a137bb158
commit 72633825cf
56 changed files with 168 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
utils/compat.py
View File

@@ -13,7 +13,7 @@ except ImportError:
class OrderedDict(dict):
'Dictionary that remembers insertion order'
"""Dictionary that remembers insertion order"""
# An inherited dict maps keys to values.
# The inherited dict provides __getitem__, __len__, __contains__, and get.
# The remaining methods are order-aware.
@@ -25,11 +25,11 @@ class OrderedDict(dict):
# Each link is stored as a list of length three: [PREV, NEXT, KEY].
def __init__(self, *args, **kwds):
'''Initialize an ordered dictionary. Signature is the same as for
"""Initialize an ordered dictionary. Signature is the same as for
regular dictionaries, but keyword arguments are not recommended
because their insertion order is arbitrary.
'''
"""
super(OrderedDict, self).__init__(**kwds)
if len(args) > 1:
raise TypeError('expected at most 1 arguments, got %d' % len(args))
@@ -42,7 +42,7 @@ class OrderedDict(dict):
self.__update(*args, **kwds)
def __setitem__(self, key, value, dict_setitem=dict.__setitem__):
'od.__setitem__(i, y) <==> od[i]=y'
"""od.__setitem__(i, y) <==> od[i]=y"""
# Setting a new item creates a new link which goes at the end of the linked
# list, and the inherited dictionary is updated with the new key/value pair.
if key not in self:
@@ -52,7 +52,7 @@ class OrderedDict(dict):
dict_setitem(self, key, value)
def __delitem__(self, key, dict_delitem=dict.__delitem__):
'od.__delitem__(y) <==> del od[y]'
"""od.__delitem__(y) <==> del od[y]"""
# Deleting an existing item uses self.__map to find the link which is
# then removed by updating the links in the predecessor and successor nodes.
dict_delitem(self, key)
@@ -61,7 +61,7 @@ class OrderedDict(dict):
link_next[0] = link_prev
def __iter__(self):
'od.__iter__() <==> iter(od)'
"""od.__iter__() <==> iter(od)"""
root = self.__root
curr = root[1]
while curr is not root:
@@ -69,7 +69,7 @@ class OrderedDict(dict):
curr = curr[1]
def __reversed__(self):
'od.__reversed__() <==> reversed(od)'
"""od.__reversed__() <==> reversed(od)"""
root = self.__root
curr = root[0]
while curr is not root:
@@ -77,7 +77,7 @@ class OrderedDict(dict):
curr = curr[0]
def clear(self):
'od.clear() -> None. Remove all items from od.'
"""od.clear() -> None. Remove all items from od."""
try:
for node in self.__map.itervalues():
del node[:]
@@ -89,10 +89,10 @@ class OrderedDict(dict):
dict.clear(self)
def popitem(self, last=True):
'''od.popitem() -> (k, v), return and remove a (key, value) pair.
"""od.popitem() -> (k, v), return and remove a (key, value) pair.
Pairs are returned in LIFO order if last is true or FIFO order if false.
'''
"""
if not self:
raise KeyError('dictionary is empty')
root = self.__root
@@ -114,40 +114,40 @@ class OrderedDict(dict):
# -- the following methods do not depend on the internal structure --
def keys(self):
'od.keys() -> list of keys in od'
"""od.keys() -> list of keys in od"""
return list(self)
def values(self):
'od.values() -> list of values in od'
"""od.values() -> list of values in od"""
return [self[key] for key in self]
def items(self):
'od.items() -> list of (key, value) pairs in od'
"""od.items() -> list of (key, value) pairs in od"""
return [(key, self[key]) for key in self]
def iterkeys(self):
'od.iterkeys() -> an iterator over the keys in od'
"""od.iterkeys() -> an iterator over the keys in od"""
return iter(self)
def itervalues(self):
'od.itervalues -> an iterator over the values in od'
"""od.itervalues -> an iterator over the values in od"""
for k in self:
yield self[k]
def iteritems(self):
'od.iteritems -> an iterator over the (key, value) items in od'
"""od.iteritems -> an iterator over the (key, value) items in od"""
for k in self:
yield (k, self[k])
def update(*args, **kwds):
'''od.update(E, **F) -> None. Update od from dict/iterable E and F.
"""od.update(E, **F) -> None. Update od from dict/iterable E and F.
If E is a dict instance, does: for k in E: od[k] = E[k]
If E has a .keys() method, does: for k in E.keys(): od[k] = E[k]
Or if E is an iterable of items, does: for k, v in E: od[k] = v
In either case, this is followed by: for k, v in F.items(): od[k] = v
'''
"""
if len(args) > 2:
raise TypeError('update() takes at most 2 positional '
'arguments (%d given)' % (len(args),))
@@ -175,10 +175,10 @@ class OrderedDict(dict):
__marker = object()
def pop(self, key, default=__marker):
'''od.pop(k[,d]) -> v, remove specified key and return the corresponding value.
"""od.pop(k[,d]) -> v, remove specified key and return the corresponding value.
If key is not found, d is returned if given, otherwise KeyError is raised.
'''
"""
if key in self:
result = self[key]
del self[key]
@@ -188,14 +188,14 @@ class OrderedDict(dict):
return default
def setdefault(self, key, default=None):
'od.setdefault(k[,d]) -> od.get(k,d), also set od[k]=d if k not in od'
"""od.setdefault(k[,d]) -> od.get(k,d), also set od[k]=d if k not in od"""
if key in self:
return self[key]
self[key] = default
return default
def __repr__(self, _repr_running=None):
'od.__repr__() <==> repr(od)'
"""od.__repr__() <==> repr(od)"""
if _repr_running is None:
_repr_running = {}
call_key = id(self), _get_ident()
@@ -210,35 +210,35 @@ class OrderedDict(dict):
del _repr_running[call_key]
def __reduce__(self):
'Return state information for pickling'
"""Return state information for pickling"""
items = [[k, self[k]] for k in self]
inst_dict = vars(self).copy()
for k in vars(OrderedDict()):
inst_dict.pop(k, None)
if inst_dict:
return (self.__class__, (items,), inst_dict)
return self.__class__, (items,), inst_dict
return self.__class__, (items,)
def copy(self):
'od.copy() -> a shallow copy of od'
"""od.copy() -> a shallow copy of od"""
return self.__class__(self)
@classmethod
def fromkeys(cls, iterable, value=None):
'''OD.fromkeys(S[, v]) -> New ordered dictionary with keys from S
"""OD.fromkeys(S[, v]) -> New ordered dictionary with keys from S
and values equal to v (which defaults to None).
'''
"""
d = cls()
for key in iterable:
d[key] = value
return d
def __eq__(self, other):
'''od.__eq__(y) <==> od==y. Comparison to another OD is order-sensitive
"""od.__eq__(y) <==> od==y. Comparison to another OD is order-sensitive
while comparison to a regular mapping is order-insensitive.
'''
"""
if isinstance(other, OrderedDict):
return len(self) == len(other) and self.items() == other.items()
return dict.__eq__(self, other)
@@ -249,21 +249,21 @@ class OrderedDict(dict):
# -- the following methods are only used in Python 2.7 --
def viewkeys(self):
"od.viewkeys() -> a set-like object providing a view on od's keys"
"""od.viewkeys() -> a set-like object providing a view on od's keys"""
if KeysView:
return KeysView(self)
else:
return None
def viewvalues(self):
"od.viewvalues() -> an object providing a view on od's values"
"""od.viewvalues() -> an object providing a view on od's values"""
if ValuesView:
return ValuesView(self)
else:
return None
def viewitems(self):
"od.viewitems() -> a set-like object providing a view on od's items"
"""od.viewitems() -> a set-like object providing a view on od's items"""
if ItemsView:
return ItemsView(self)
else: