commit de7aca3b517c46d6485ce0464e6126216c592b1c Author: Damian Johnson atagar@torproject.org Date: Sat Jun 7 13:03:22 2014 -0700
Adding hotfix changes to our changelog
We had a note for our 1.0.1 hotfix release, but none of the later ones. --- docs/change_log.rst | 9 +++++++++ stem/util/conf.py | 8 ++++---- 2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/docs/change_log.rst b/docs/change_log.rst index 6e9a13c..ae0db05 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -92,6 +92,12 @@ among numerous other improvements and fixes. * Added a section with `example scripts <tutorials/double_double_toil_and_trouble.html#scripts>`_. * Made FAQ and other sections quite a bit more succinct.
+ * **Version 1.2.2** (June 7th, 2014) - fixed an issue where the stem.util.conf + module would fail under Python 2.6 with an AttributeError (:trac:`12223`) + + * **Version 1.2.1** (June 3rd, 2014) - fixed an issue where descriptor + parsersing would fail under Python 3.x with a TypeError + .. _version_1.1:
Version 1.1 @@ -151,6 +157,9 @@ and a myriad of smaller improvements and fixes. https://www.atagar.com/transfer/stem_frontpage/before.png`_ and `after https://www.atagar.com/transfer/stem_frontpage/after.png`_).
+ * **Version 1.1.1** (November 9th, 2013) - fixed an issue where imports of stem.util.system + would fail with an ImportError for pwd under Windows (:trac:`10072`) + .. _version_1.0:
Version 1.0 diff --git a/stem/util/conf.py b/stem/util/conf.py index 6443fba..702c27f 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -687,14 +687,14 @@ class Config(object): elif isinstance(default, tuple): val = tuple(val) elif isinstance(default, dict): - valMap = OrderedDict() + val_map = OrderedDict() for entry in val: if '=>' in entry: - entryKey, entryVal = entry.split('=>', 1) - valMap[entryKey.strip()] = entryVal.strip() + entry_key, entry_val = entry.split('=>', 1) + val_map[entry_key.strip()] = entry_val.strip() else: log.debug('Ignoring invalid %s config entry (expected a mapping, but "%s" was missing "=>")' % (key, entry)) - val = valMap + val = val_map
return val