Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-pymemcache for openSUSE:Factory checked in at 2022-04-08 00:28:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pymemcache (Old) and /work/SRC/openSUSE:Factory/.python-pymemcache.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pymemcache" Fri Apr 8 00:28:27 2022 rev:14 rq:967531 version:3.5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pymemcache/python-pymemcache.changes 2021-10-20 20:24:16.589377786 +0200 +++ /work/SRC/openSUSE:Factory/.python-pymemcache.new.1900/python-pymemcache.changes 2022-04-08 00:29:05.777392730 +0200 @@ -1,0 +2,10 @@ +Thu Apr 7 09:31:23 UTC 2022 - pgaj...@suse.com + +- version update to 3.5.2 + * Handle blank ``STAT`` values. + * ``Client.get`` returns the default when using ``ignore_exc`` and if memcached + is unavailable + * Added ``noreply`` support to ``HashClient.flush_all``. +- add python-pymemcache-no-mock.patch, do not require python-mock for build + +------------------------------------------------------------------- Old: ---- pymemcache-3.5.0.tar.gz New: ---- pymemcache-3.5.2.tar.gz python-pymemcache-no-mock.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pymemcache.spec ++++++ --- /var/tmp/diff_new_pack.pJeVw9/_old 2022-04-08 00:29:06.301386822 +0200 +++ /var/tmp/diff_new_pack.pJeVw9/_new 2022-04-08 00:29:06.305386776 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-pymemcache # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2014 Thomas Bechtold <thomasbecht...@jpberlin.de> # # All modifications and additions to the file contributed by third parties @@ -20,13 +20,15 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %bcond_without python2 Name: python-pymemcache -Version: 3.5.0 +Version: 3.5.2 Release: 0 Summary: A pure Python memcached client License: Apache-2.0 Group: Development/Languages/Python URL: https://github.com/Pinterest/pymemcache Source: https://files.pythonhosted.org/packages/source/p/pymemcache/pymemcache-%{version}.tar.gz +# https://github.com/pinterest/pymemcache/commit/0bf1baa4f539dedf8e4e4b2e48f8da5d66ed57b5 +Patch0: python-pymemcache-no-mock.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: memcached @@ -35,7 +37,6 @@ BuildArch: noarch # SECTION test requirements BuildRequires: %{python_module gevent} -BuildRequires: %{python_module mock} BuildRequires: %{python_module pylibmc} BuildRequires: %{python_module pytest} BuildRequires: %{python_module python-memcached} @@ -61,7 +62,7 @@ * The (optional) ability to treat network and memcached errors as cache misses. %prep -%setup -q -n pymemcache-%{version} +%autosetup -p1 -n pymemcache-%{version} # Disable pytest-cov sed -i 's/tool:pytest/tool:ignore-pytest-cov/' setup.cfg ++++++ pymemcache-3.5.0.tar.gz -> pymemcache-3.5.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pymemcache-3.5.0/ChangeLog.rst new/pymemcache-3.5.2/ChangeLog.rst --- old/pymemcache-3.5.0/ChangeLog.rst 2021-07-13 13:59:42.000000000 +0200 +++ new/pymemcache-3.5.2/ChangeLog.rst 2022-04-01 17:47:35.000000000 +0200 @@ -1,6 +1,16 @@ Changelog ========= +New in version 3.5.2 +-------------------- +* Handle blank ``STAT`` values. + +New in version 3.5.1 +-------------------- +* ``Client.get`` returns the default when using ``ignore_exc`` and if memcached + is unavailable +* Added ``noreply`` support to ``HashClient.flush_all``. + New in version 3.5.0 -------------------- * Sockets are now closed on ``MemcacheUnexpectedCloseError``. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pymemcache-3.5.0/PKG-INFO new/pymemcache-3.5.2/PKG-INFO --- old/pymemcache-3.5.0/PKG-INFO 2021-07-13 14:00:14.108447000 +0200 +++ new/pymemcache-3.5.2/PKG-INFO 2022-04-01 17:51:18.273440800 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: pymemcache -Version: 3.5.0 +Version: 3.5.2 Summary: A comprehensive, fast, pure Python memcached client Home-page: https://github.com/pinterest/pymemcache Author: Jon Parise @@ -118,7 +118,7 @@ https://github.com/linsomniac/python-memcached Mixpanel's Blog post about their memcached client for Python: - http://code.mixpanel.com/2012/07/16/we-went-down-so-we-wrote-a-better-pure-python-memcache-client/ + https://engineering.mixpanel.com/we-went-down-so-we-wrote-a-better-pure-python-memcache-client-b409a9fe07a9 Mixpanel's pure Python memcached client: https://github.com/mixpanel/memcache_client @@ -149,7 +149,7 @@ * `Stephen Rosen <https://github.com/sirosen>`_ * `Feras Alazzeh <https://github.com/FerasAlazzeh>`_ * `Mois??s Guimar??es de Medeiros <https://github.com/moisesguimaraes>`_ -* `Nick Pope <https://github.com/pope1ni>`_ +* `Nick Pope <https://github.com/ngnpope>`_ * `Herv?? Beraud <https://github.com/4383>`_ We're Hiring! @@ -160,6 +160,16 @@ Changelog ========= +New in version 3.5.2 +-------------------- +* Handle blank ``STAT`` values. + +New in version 3.5.1 +-------------------- +* ``Client.get`` returns the default when using ``ignore_exc`` and if memcached + is unavailable +* Added ``noreply`` support to ``HashClient.flush_all``. + New in version 3.5.0 -------------------- * Sockets are now closed on ``MemcacheUnexpectedCloseError``. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pymemcache-3.5.0/README.rst new/pymemcache-3.5.2/README.rst --- old/pymemcache-3.5.0/README.rst 2021-06-18 20:22:20.000000000 +0200 +++ new/pymemcache-3.5.2/README.rst 2022-04-01 17:45:22.000000000 +0200 @@ -96,7 +96,7 @@ https://github.com/linsomniac/python-memcached Mixpanel's Blog post about their memcached client for Python: - http://code.mixpanel.com/2012/07/16/we-went-down-so-we-wrote-a-better-pure-python-memcache-client/ + https://engineering.mixpanel.com/we-went-down-so-we-wrote-a-better-pure-python-memcache-client-b409a9fe07a9 Mixpanel's pure Python memcached client: https://github.com/mixpanel/memcache_client @@ -127,7 +127,7 @@ * `Stephen Rosen <https://github.com/sirosen>`_ * `Feras Alazzeh <https://github.com/FerasAlazzeh>`_ * `Mois??s Guimar??es de Medeiros <https://github.com/moisesguimaraes>`_ -* `Nick Pope <https://github.com/pope1ni>`_ +* `Nick Pope <https://github.com/ngnpope>`_ * `Herv?? Beraud <https://github.com/4383>`_ We're Hiring! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pymemcache-3.5.0/docs/apidoc/pymemcache.client.retrying.rst new/pymemcache-3.5.2/docs/apidoc/pymemcache.client.retrying.rst --- old/pymemcache-3.5.0/docs/apidoc/pymemcache.client.retrying.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/pymemcache-3.5.2/docs/apidoc/pymemcache.client.retrying.rst 2022-02-14 20:11:30.000000000 +0100 @@ -0,0 +1,7 @@ +pymemcache.client.retrying module +================================= + +.. automodule:: pymemcache.client.retrying + :members: + :undoc-members: + :show-inheritance: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pymemcache-3.5.0/docs/apidoc/pymemcache.client.rst new/pymemcache-3.5.2/docs/apidoc/pymemcache.client.rst --- old/pymemcache-3.5.0/docs/apidoc/pymemcache.client.rst 2020-04-28 17:24:24.000000000 +0200 +++ new/pymemcache-3.5.2/docs/apidoc/pymemcache.client.rst 2022-02-14 20:11:30.000000000 +0100 @@ -11,6 +11,7 @@ pymemcache.client.hash pymemcache.client.murmur3 pymemcache.client.rendezvous + pymemcache.client.retrying Module contents --------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pymemcache-3.5.0/docs/apidoc/pymemcache.test.rst new/pymemcache-3.5.2/docs/apidoc/pymemcache.test.rst --- old/pymemcache-3.5.0/docs/apidoc/pymemcache.test.rst 2020-04-28 17:24:24.000000000 +0200 +++ new/pymemcache-3.5.2/docs/apidoc/pymemcache.test.rst 2022-02-14 20:11:30.000000000 +0100 @@ -11,6 +11,7 @@ pymemcache.test.test_benchmark pymemcache.test.test_client pymemcache.test.test_client_hash + pymemcache.test.test_client_retry pymemcache.test.test_integration pymemcache.test.test_rendezvous pymemcache.test.test_serde diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pymemcache-3.5.0/docs/apidoc/pymemcache.test.test_client_retry.rst new/pymemcache-3.5.2/docs/apidoc/pymemcache.test.test_client_retry.rst --- old/pymemcache-3.5.0/docs/apidoc/pymemcache.test.test_client_retry.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/pymemcache-3.5.2/docs/apidoc/pymemcache.test.test_client_retry.rst 2022-02-14 20:11:31.000000000 +0100 @@ -0,0 +1,7 @@ +pymemcache.test.test\_client\_retry module +========================================== + +.. automodule:: pymemcache.test.test_client_retry + :members: + :undoc-members: + :show-inheritance: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pymemcache-3.5.0/docs/getting_started.rst new/pymemcache-3.5.2/docs/getting_started.rst --- old/pymemcache-3.5.0/docs/getting_started.rst 2021-07-13 13:59:42.000000000 +0200 +++ new/pymemcache-3.5.2/docs/getting_started.rst 2022-04-01 17:45:22.000000000 +0200 @@ -82,7 +82,7 @@ The library comes with retry mechanisms that can be used to wrap all kind of pymemcache clients. The wrapper allow you to define the exceptions that you want to handle with retries, which exceptions to exclude, how many attempts to make -and how long to wait between attemots. +and how long to wait between attempts. The ``RetryingClient`` wraps around any of the other included clients and will have the same methods. For this example we're just using the base ``Client``. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pymemcache-3.5.0/pymemcache/__init__.py new/pymemcache-3.5.2/pymemcache/__init__.py --- old/pymemcache-3.5.0/pymemcache/__init__.py 2021-07-13 13:59:42.000000000 +0200 +++ new/pymemcache-3.5.2/pymemcache/__init__.py 2022-04-01 17:50:21.000000000 +0200 @@ -1,4 +1,4 @@ -__version__ = '3.5.0' +__version__ = '3.5.2' from pymemcache.client.base import Client # noqa from pymemcache.client.base import PooledClient # noqa diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pymemcache-3.5.0/pymemcache/client/base.py new/pymemcache-3.5.2/pymemcache/client/base.py --- old/pymemcache-3.5.0/pymemcache/client/base.py 2021-07-06 16:01:58.000000000 +0200 +++ new/pymemcache-3.5.2/pymemcache/client/base.py 2022-04-01 17:46:06.000000000 +0200 @@ -293,7 +293,7 @@ Args: server: tuple(hostname, port) or string containing a UNIX socket path. - serde: optional seralizer object, see notes in the class docs. + serde: optional serializer object, see notes in the class docs. serializer: deprecated serialization function deserializer: deprecated deserialization function connect_timeout: optional float, seconds to wait for a connection to @@ -1038,7 +1038,7 @@ result[key] = value elif name == b'stats' and line.startswith(b'STAT'): key_value = line.split() - result[key_value[1]] = key_value[2] + result[key_value[1]] = key_value[2] if len(key_value) > 2 else b"" elif name == b'stats' and line.startswith(b'ITEM'): # For 'stats cachedump' commands key_value = line.split() @@ -1287,7 +1287,7 @@ return client.get(key, default) except Exception: if self.ignore_exc: - return None + return default else: raise diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pymemcache-3.5.0/pymemcache/client/hash.py new/pymemcache-3.5.2/pymemcache/client/hash.py --- old/pymemcache-3.5.0/pymemcache/client/hash.py 2021-07-06 15:15:21.000000000 +0200 +++ new/pymemcache-3.5.2/pymemcache/client/hash.py 2022-04-01 17:45:22.000000000 +0200 @@ -357,8 +357,8 @@ def set(self, key, *args, **kwargs): return self._run_cmd('set', key, False, *args, **kwargs) - def get(self, key, *args, **kwargs): - return self._run_cmd('get', key, None, *args, **kwargs) + def get(self, key, default=None, **kwargs): + return self._run_cmd('get', key, default, default=default, **kwargs) def incr(self, key, *args, **kwargs): return self._run_cmd('incr', key, False, *args, **kwargs) @@ -457,9 +457,9 @@ def touch(self, key, *args, **kwargs): return self._run_cmd('touch', key, False, *args, **kwargs) - def flush_all(self): + def flush_all(self, *args, **kwargs): for client in self.clients.values(): - self._safely_run_func(client, client.flush_all, False) + self._safely_run_func(client, client.flush_all, False, *args, **kwargs) def quit(self): for client in self.clients.values(): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pymemcache-3.5.0/pymemcache/test/test_client.py new/pymemcache-3.5.2/pymemcache/test/test_client.py --- old/pymemcache-3.5.0/pymemcache/test/test_client.py 2021-07-06 16:01:58.000000000 +0200 +++ new/pymemcache-3.5.2/pymemcache/test/test_client.py 2022-04-01 17:45:30.000000000 +0200 @@ -193,7 +193,7 @@ class ClientTestMixin(object): def make_client(self, mock_socket_values, **kwargs): client = Client(None, **kwargs) - # mock out client._connect() rather than hard-settting client.sock to + # mock out client._connect() rather than hard-setting client.sock to # ensure methods are checking whether self.sock is None before # attempting to use it sock = MockSocket(list(mock_socket_values)) @@ -203,7 +203,7 @@ def make_customized_client(self, mock_socket_values, **kwargs): client = CustomizedClient(None, **kwargs) - # mock out client._connect() rather than hard-settting client.sock to + # mock out client._connect() rather than hard-setting client.sock to # ensure methods are checking whether self.sock is None before # attempting to use it sock = MockSocket(list(mock_socket_values)) @@ -381,6 +381,16 @@ result = client.get(b'key', default='foobar') assert result == 'foobar' + def test_get_ignore_exc_default(self): + client = self.make_client([b'INVALID DATA\r\n'], ignore_exc=True) + result = client.get(b'key', default='foobar') + assert result == 'foobar' + + # Unit test for customized client (override _extract_value) + client = self.make_client([b'INVALID DATA\r\n'], ignore_exc=True) + result = client.get(b'key', default='foobar') + assert result == 'foobar' + def test_get_found(self): client = self.make_client([ b'STORED\r\n', @@ -991,6 +1001,11 @@ ] assert result == {b'fake_stats': 1} + def test_stats_with_blank_value(self): + client = self.make_client([b"STAT fake_stats \r\n", b"END\r\n"]) + result = client.stats() + assert result == {b"fake_stats": b""} + def test_stats_conversions(self): client = self.make_client([ # Most stats are converted to int diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pymemcache-3.5.0/pymemcache/test/test_client_hash.py new/pymemcache-3.5.2/pymemcache/test/test_client_hash.py --- old/pymemcache-3.5.0/pymemcache/test/test_client_hash.py 2021-05-27 22:16:10.000000000 +0200 +++ new/pymemcache-3.5.2/pymemcache/test/test_client_hash.py 2022-04-01 17:45:22.000000000 +0200 @@ -257,9 +257,24 @@ result = client.get('foo') assert result is None + result = client.get('foo', default='default') + assert result == 'default' result = client.set('foo', 'bar') assert result is False + def test_no_servers_left_return_positional_default(self): + from pymemcache.client.hash import HashClient + client = HashClient( + [], use_pooling=True, + ignore_exc=True, + timeout=1, connect_timeout=1 + ) + + # Ensure compatibility with clients that pass the default as a + # positional argument + result = client.get('foo', 'default') + assert result == 'default' + def test_no_servers_left_with_set_many(self): from pymemcache.client.hash import HashClient client = HashClient( @@ -322,6 +337,10 @@ result = client.set_many(values, noreply=True) assert result == [] + def test_noreply_flush(self): + client = self.make_client() + client.flush_all(noreply=True) + def test_set_many_unix(self): values = { 'key1': 'value1', @@ -379,7 +398,7 @@ # Client gets removed because of socket timeout assert ("127.0.0.1", 11211) in client._dead_clients - test_client.get.side_effect = lambda *_: "Some value" + test_client.get.side_effect = lambda *_, **_kw: "Some value" # Client should be retried and brought back assert client.get(b"key") == "Some value" assert ("127.0.0.1", 11211) not in client._dead_clients @@ -398,7 +417,7 @@ with pytest.raises(socket.timeout): client.get(b"key", noreply=False) - test_client.get.side_effect = lambda *_: "Some value" + test_client.get.side_effect = lambda *_, **_kw: "Some value" assert client.get(b"key") == "Some value" assert client_patch.call_count == 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pymemcache-3.5.0/pymemcache/test/test_client_retry.py new/pymemcache-3.5.2/pymemcache/test/test_client_retry.py --- old/pymemcache-3.5.0/pymemcache/test/test_client_retry.py 2021-07-13 13:59:42.000000000 +0200 +++ new/pymemcache-3.5.2/pymemcache/test/test_client_retry.py 2022-04-01 17:45:22.000000000 +0200 @@ -17,7 +17,7 @@ def make_base_client(self, mock_socket_values, **kwargs): base_client = Client(None, **kwargs) - # mock out client._connect() rather than hard-settting client.sock to + # mock out client._connect() rather than hard-setting client.sock to # ensure methods are checking whether self.sock is None before # attempting to use it sock = MockSocket(list(mock_socket_values)) @@ -43,7 +43,7 @@ def make_base_client(self, mock_socket_values, **kwargs): """ Creates a regular mock client to wrap in the RetryClient. """ base_client = Client(None, **kwargs) - # mock out client._connect() rather than hard-settting client.sock to + # mock out client._connect() rather than hard-setting client.sock to # ensure methods are checking whether self.sock is None before # attempting to use it sock = MockSocket(list(mock_socket_values)) @@ -104,7 +104,7 @@ with pytest.raises(ValueError): RetryingClient(base_client, retry_for="haha!") - # With collectino of string and exceptions? + # With collection of string and exceptions? with pytest.raises(ValueError): RetryingClient(base_client, retry_for=[Exception, str]) @@ -131,7 +131,7 @@ with pytest.raises(ValueError): RetryingClient(base_client, do_not_retry_for="haha!") - # With collectino of string and exceptions? + # With collection of string and exceptions? with pytest.raises(ValueError): RetryingClient(base_client, do_not_retry_for=[Exception, str]) @@ -294,7 +294,7 @@ client.get("key") def test_both_exception_filters(self): - # Test interacction between both exception filters. + # Test interaction between both exception filters. client = self.make_client( [ MemcacheClientError("Whoops."), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pymemcache-3.5.0/pymemcache.egg-info/PKG-INFO new/pymemcache-3.5.2/pymemcache.egg-info/PKG-INFO --- old/pymemcache-3.5.0/pymemcache.egg-info/PKG-INFO 2021-07-13 14:00:13.000000000 +0200 +++ new/pymemcache-3.5.2/pymemcache.egg-info/PKG-INFO 2022-04-01 17:51:17.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: pymemcache -Version: 3.5.0 +Version: 3.5.2 Summary: A comprehensive, fast, pure Python memcached client Home-page: https://github.com/pinterest/pymemcache Author: Jon Parise @@ -118,7 +118,7 @@ https://github.com/linsomniac/python-memcached Mixpanel's Blog post about their memcached client for Python: - http://code.mixpanel.com/2012/07/16/we-went-down-so-we-wrote-a-better-pure-python-memcache-client/ + https://engineering.mixpanel.com/we-went-down-so-we-wrote-a-better-pure-python-memcache-client-b409a9fe07a9 Mixpanel's pure Python memcached client: https://github.com/mixpanel/memcache_client @@ -149,7 +149,7 @@ * `Stephen Rosen <https://github.com/sirosen>`_ * `Feras Alazzeh <https://github.com/FerasAlazzeh>`_ * `Mois??s Guimar??es de Medeiros <https://github.com/moisesguimaraes>`_ -* `Nick Pope <https://github.com/pope1ni>`_ +* `Nick Pope <https://github.com/ngnpope>`_ * `Herv?? Beraud <https://github.com/4383>`_ We're Hiring! @@ -160,6 +160,16 @@ Changelog ========= +New in version 3.5.2 +-------------------- +* Handle blank ``STAT`` values. + +New in version 3.5.1 +-------------------- +* ``Client.get`` returns the default when using ``ignore_exc`` and if memcached + is unavailable +* Added ``noreply`` support to ``HashClient.flush_all``. + New in version 3.5.0 -------------------- * Sockets are now closed on ``MemcacheUnexpectedCloseError``. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pymemcache-3.5.0/pymemcache.egg-info/SOURCES.txt new/pymemcache-3.5.2/pymemcache.egg-info/SOURCES.txt --- old/pymemcache-3.5.0/pymemcache.egg-info/SOURCES.txt 2021-07-13 14:00:13.000000000 +0200 +++ new/pymemcache-3.5.2/pymemcache.egg-info/SOURCES.txt 2022-04-01 17:51:18.000000000 +0200 @@ -14,6 +14,7 @@ docs/apidoc/pymemcache.client.hash.rst docs/apidoc/pymemcache.client.murmur3.rst docs/apidoc/pymemcache.client.rendezvous.rst +docs/apidoc/pymemcache.client.retrying.rst docs/apidoc/pymemcache.client.rst docs/apidoc/pymemcache.exceptions.rst docs/apidoc/pymemcache.fallback.rst @@ -25,6 +26,7 @@ docs/apidoc/pymemcache.test.test_benchmark.rst docs/apidoc/pymemcache.test.test_client.rst docs/apidoc/pymemcache.test.test_client_hash.rst +docs/apidoc/pymemcache.test.test_client_retry.rst docs/apidoc/pymemcache.test.test_integration.rst docs/apidoc/pymemcache.test.test_rendezvous.rst docs/apidoc/pymemcache.test.test_serde.rst ++++++ python-pymemcache-no-mock.patch ++++++ diff --git a/pymemcache/test/test_client.py b/pymemcache/test/test_client.py index 8b323ded..f0aac442 100644 --- a/pymemcache/test/test_client.py +++ b/pymemcache/test/test_client.py @@ -1,5 +1,4 @@ # Copyright 2012 Pinterest.com -# -*- coding: utf-8 -*- # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,8 +19,8 @@ import functools import json import os -import mock import platform +from unittest import mock import re import socket import sys diff --git a/pymemcache/test/test_client_hash.py b/pymemcache/test/test_client_hash.py index ad3f2dac..ceab7052 100644 --- a/pymemcache/test/test_client_hash.py +++ b/pymemcache/test/test_client_hash.py @@ -7,7 +7,7 @@ import unittest import os import pytest -import mock +from unittest import mock import socket diff --git a/pymemcache/test/test_client_retry.py b/pymemcache/test/test_client_retry.py index 230a941..de64a46 100644 --- a/pymemcache/test/test_client_retry.py +++ b/pymemcache/test/test_client_retry.py @@ -2,8 +2,8 @@ import functools import unittest +from unittest import mock -import mock import pytest from .test_client import ClientTestMixin, MockSocket