Skip to content

Commit 300c734

Browse files
committed
Merge remote-tracking branch 'origin/issue576'
* origin/issue576: issue #576: fix Kwargs minor version check.
2 parents 333151f + ee62c57 commit 300c734

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

docs/changelog.rst

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,17 @@ Fixes
2727
* `#557 <https://github.com/dw/mitogen/issues/557>`_: fix a crash when running
2828
on machines with high CPU counts.
2929

30+
* `#570 <https://github.com/dw/mitogen/issues/570>`_: the ``firewalld`` module
31+
internally caches a dbus name that changes across ``firewalld`` restarts,
32+
causing a failure if the service is restarted between ``firewalld`` module invocations.
33+
3034
* `#575 <https://github.com/dw/mitogen/issues/575>`_: fix a crash when
3135
rendering an error message to indicate no usable temporary directories could
3236
be found.
3337

34-
* `#570 <https://github.com/dw/mitogen/issues/570>`_: the ``firewalld`` module
35-
internally caches a dbus name that changes across ``firewalld`` restarts,
36-
causing a failure if the service is restarted between ``firewalld`` module invocations.
38+
* `#576 <https://github.com/dw/mitogen/issues/576>`_: fix a crash during
39+
startup on SuSE Linux 11, due to an incorrect version compatibility check in
40+
the Mitogen code.
3741

3842

3943
Thanks!

mitogen/core.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ def __init__(self, dct):
277277
self[k.decode()] = v
278278
else:
279279
self[k] = v
280-
elif sys.version_info < (2, 6):
280+
elif sys.version_info < (2, 6, 5):
281281
def __init__(self, dct):
282282
for k, v in dct.iteritems():
283283
if type(k) is unicode:

0 commit comments

Comments
 (0)