diff --git a/docs/changelog.rst b/docs/changelog.rst index 84b24cd0..8b5189cb 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -27,13 +27,17 @@ Fixes * `#557 `_: fix a crash when running on machines with high CPU counts. +* `#570 `_: the ``firewalld`` module + internally caches a dbus name that changes across ``firewalld`` restarts, + causing a failure if the service is restarted between ``firewalld`` module invocations. + * `#575 `_: fix a crash when rendering an error message to indicate no usable temporary directories could be found. -* `#570 `_: the ``firewalld`` module - internally caches a dbus name that changes across ``firewalld`` restarts, - causing a failure if the service is restarted between ``firewalld`` module invocations. +* `#576 `_: fix a crash during + startup on SuSE Linux 11, due to an incorrect version compatibility check in + the Mitogen code. Thanks! diff --git a/mitogen/core.py b/mitogen/core.py index 578337f7..ff77bba9 100644 --- a/mitogen/core.py +++ b/mitogen/core.py @@ -277,7 +277,7 @@ class Kwargs(dict): self[k.decode()] = v else: self[k] = v - elif sys.version_info < (2, 6): + elif sys.version_info < (2, 6, 5): def __init__(self, dct): for k, v in dct.iteritems(): if type(k) is unicode: