From 8d43da80dd3038aa0dc29ee0940f783af00c08a5 Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Wed, 24 Feb 2016 22:21:39 -0600 Subject: [PATCH] Resolves Issue #343 --- ChangeLog | 1 + cement/core/controller.py | 2 +- cement/ext/ext_memcached.py | 1 - doc/source/whats_new.rst | 1 + requirements-dev-py3.txt | 1 + tests/ext/memcached_tests.py | 7 +------ 6 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6c24b214..3655ddc4 100755 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,7 @@ Features: * :issue:`336` - Added Support for ``CementApp.reload()`` (SIGHUP) * :issue:`337` - Added ``app.run_forever()`` alternative run method. * :issue:`342` - Added Alarm/Timeout Support + * :issue:`343` - Memcached Extension/Pylibmc Now Supports Python 3 Refactoring: diff --git a/cement/core/controller.py b/cement/core/controller.py index 7951fe75..d39a9ee4 100644 --- a/cement/core/controller.py +++ b/cement/core/controller.py @@ -115,7 +115,7 @@ class IController(interface.Interface): arguments (I.e. self.app.args.parse()). :returns: Returns the result of the executed controller function, - or ``None`` if no controller function is called. + or ``None`` if no controller function is called. """ diff --git a/cement/ext/ext_memcached.py b/cement/ext/ext_memcached.py index cfb651c2..35174d4e 100644 --- a/cement/ext/ext_memcached.py +++ b/cement/ext/ext_memcached.py @@ -6,7 +6,6 @@ Requirements ------------ * pylibmc (``pip install pylibmc``) - * Python < 3 Configuration diff --git a/doc/source/whats_new.rst b/doc/source/whats_new.rst index 4916bc76..ae54743e 100644 --- a/doc/source/whats_new.rst +++ b/doc/source/whats_new.rst @@ -48,6 +48,7 @@ Extensions * :ref:`Alarm ` - Provides quick access to setting an application alarm to easily handling timing out long running operations. + * :ref:`Memcached ` - Now supported on Python 3. Misc Enhancements diff --git a/requirements-dev-py3.txt b/requirements-dev-py3.txt index efeb9a50..589d8524 100644 --- a/requirements-dev-py3.txt +++ b/requirements-dev-py3.txt @@ -12,3 +12,4 @@ pystache pyYaml colorlog tabulate +pylibmc diff --git a/tests/ext/memcached_tests.py b/tests/ext/memcached_tests.py index e28210cb..5acaddb0 100644 --- a/tests/ext/memcached_tests.py +++ b/tests/ext/memcached_tests.py @@ -1,18 +1,13 @@ """Tests for cement.ext.ext_memcached.""" import sys +import pylibmc from time import sleep from random import random from cement.core import handler from cement.utils import test from cement.utils.misc import init_defaults -if sys.version_info[0] < 3: - import pylibmc -else: - raise test.SkipTest( - 'pylibmc does not support Python 3') # pragma: no cover - class MemcachedExtTestCase(test.CementTestCase):