Merge pull request #104 from harikitech/topic/rename_backend

Rename class and module names (to respect pymemcache)
harikitech · Jun 29, 2020 · 1546a86 · 1546a86
2 parents 7d5360c + fe3b55e
commit 1546a86
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 40 deletions.
diff --git a/README.rst b/README.rst
@@ -38,7 +38,7 @@ Your cache backend should look something like this::
 
     CACHES = {
         'default': {
-            'BACKEND': 'django_elastipymemcache.memcached.ElastiPyMemCache',
+            'BACKEND': 'django_elastipymemcache.backend.ElastiPymemcache',
             'LOCATION': '[configuration endpoint]:11211',
             'OPTIONS': {
               'cluster_timeout': 1, # its used when get cluster info

diff --git a/django_elastipymemcache/__init__.py b/django_elastipymemcache/__init__.py
@@ -1,2 +1,2 @@
-VERSION = (1, 3, 1)
+VERSION = (2, 0, 0)
 __version__ = '.'.join(map(str, VERSION))
diff --git a/django_elastipymemcache/memcached.py → django_elastipymemcache/backend.py b/django_elastipymemcache/memcached.py → django_elastipymemcache/backend.py
@@ -29,7 +29,7 @@ def wrapper(self, *args, **kwds):
     return wrapper
 
 
-class ElastiPyMemCache(BaseMemcachedCache):
+class ElastiPymemcache(BaseMemcachedCache):
     """
     Backend for Amazon ElastiCache (memcached) with auto discovery mode
     it used pymemcache

diff --git a/tests/test_backend.py b/tests/test_backend.py
@@ -13,20 +13,20 @@
 
 @raises(InvalidCacheBackendError)
 def test_multiple_servers():
-    from django_elastipymemcache.memcached import ElastiPyMemCache
-    ElastiPyMemCache('h1:0,h2:0', {})
+    from django_elastipymemcache.backend import ElastiPymemcache
+    ElastiPymemcache('h1:0,h2:0', {})
 
 
 @raises(InvalidCacheBackendError)
 def test_wrong_server_format():
-    from django_elastipymemcache.memcached import ElastiPyMemCache
-    ElastiPyMemCache('h', {})
+    from django_elastipymemcache.backend import ElastiPymemcache
+    ElastiPymemcache('h', {})
 
 
-@patch('django_elastipymemcache.memcached.get_cluster_info')
+@patch('django_elastipymemcache.backend.get_cluster_info')
 def test_split_servers(get_cluster_info):
-    from django_elastipymemcache.memcached import ElastiPyMemCache
-    backend = ElastiPyMemCache('h:0', {})
+    from django_elastipymemcache.backend import ElastiPymemcache
+    backend = ElastiPymemcache('h:0', {})
     servers = [('h1', 0), ('h2', 0)]
     get_cluster_info.return_value = {
         'nodes': servers
@@ -41,15 +41,15 @@ def test_split_servers(get_cluster_info):
     )
 
 
-@patch('django_elastipymemcache.memcached.get_cluster_info')
+@patch('django_elastipymemcache.backend.get_cluster_info')
 def test_node_info_cache(get_cluster_info):
-    from django_elastipymemcache.memcached import ElastiPyMemCache
+    from django_elastipymemcache.backend import ElastiPymemcache
     servers = ['h1:0', 'h2:0']
     get_cluster_info.return_value = {
         'nodes': servers
     }
 
-    backend = ElastiPyMemCache('h:0', {})
+    backend = ElastiPymemcache('h:0', {})
     backend._lib.Client = Mock()
     backend.set('key1', 'val')
     backend.get('key1')
@@ -66,23 +66,23 @@ def test_node_info_cache(get_cluster_info):
             'h', '0', False, socket._GLOBAL_DEFAULT_TIMEOUT)
 
 
-@patch('django_elastipymemcache.memcached.get_cluster_info')
+@patch('django_elastipymemcache.backend.get_cluster_info')
 def test_failed_to_connect_servers(get_cluster_info):
-    from django_elastipymemcache.memcached import ElastiPyMemCache
-    backend = ElastiPyMemCache('h:0', {})
+    from django_elastipymemcache.backend import ElastiPymemcache
+    backend = ElastiPymemcache('h:0', {})
     get_cluster_info.side_effect = OSError()
     eq_(backend.get_cluster_nodes(), [])
 
 
-@patch('django_elastipymemcache.memcached.get_cluster_info')
+@patch('django_elastipymemcache.backend.get_cluster_info')
 def test_invalidate_cache(get_cluster_info):
-    from django_elastipymemcache.memcached import ElastiPyMemCache
+    from django_elastipymemcache.backend import ElastiPymemcache
     servers = ['h1:0', 'h2:0']
     get_cluster_info.return_value = {
         'nodes': servers
     }
 
-    backend = ElastiPyMemCache('h:0', {})
+    backend = ElastiPymemcache('h:0', {})
     backend._lib.Client = Mock()
     assert backend._cache
     backend._cache.get = Mock()
@@ -102,44 +102,44 @@ def test_invalidate_cache(get_cluster_info):
     eq_(get_cluster_info.call_count, 3)
 
 
-@patch('django_elastipymemcache.memcached.get_cluster_info')
+@patch('django_elastipymemcache.backend.get_cluster_info')
 def test_client_add(get_cluster_info):
-    from django_elastipymemcache.memcached import ElastiPyMemCache
+    from django_elastipymemcache.backend import ElastiPymemcache
 
     servers = ['h1:0', 'h2:0']
     get_cluster_info.return_value = {
         'nodes': servers
     }
 
-    backend = ElastiPyMemCache('h:0', {})
+    backend = ElastiPymemcache('h:0', {})
     ret = backend.add('key1', 'value1')
     eq_(ret, False)
 
 
-@patch('django_elastipymemcache.memcached.get_cluster_info')
+@patch('django_elastipymemcache.backend.get_cluster_info')
 def test_client_delete(get_cluster_info):
-    from django_elastipymemcache.memcached import ElastiPyMemCache
+    from django_elastipymemcache.backend import ElastiPymemcache
 
     servers = ['h1:0', 'h2:0']
     get_cluster_info.return_value = {
         'nodes': servers
     }
 
-    backend = ElastiPyMemCache('h:0', {})
+    backend = ElastiPymemcache('h:0', {})
     ret = backend.delete('key1')
     eq_(ret, None)
 
 
-@patch('django_elastipymemcache.memcached.get_cluster_info')
+@patch('django_elastipymemcache.backend.get_cluster_info')
 def test_client_get_many(get_cluster_info):
-    from django_elastipymemcache.memcached import ElastiPyMemCache
+    from django_elastipymemcache.backend import ElastiPymemcache
 
     servers = ['h1:0', 'h2:0']
     get_cluster_info.return_value = {
         'nodes': servers
     }
 
-    backend = ElastiPyMemCache('h:0', {})
+    backend = ElastiPymemcache('h:0', {})
     ret = backend.get_many(['key1'])
     eq_(ret, {})
 
@@ -188,57 +188,57 @@ def test_client_get_many(get_cluster_info):
         )
 
 
-@patch('django_elastipymemcache.memcached.get_cluster_info')
+@patch('django_elastipymemcache.backend.get_cluster_info')
 def test_client_set_many(get_cluster_info):
-    from django_elastipymemcache.memcached import ElastiPyMemCache
+    from django_elastipymemcache.backend import ElastiPymemcache
 
     servers = ['h1:0', 'h2:0']
     get_cluster_info.return_value = {
         'nodes': servers
     }
 
-    backend = ElastiPyMemCache('h:0', {})
+    backend = ElastiPymemcache('h:0', {})
     ret = backend.set_many({'key1': 'value1', 'key2': 'value2'})
     eq_(ret, ['key1', 'key2'])
 
 
-@patch('django_elastipymemcache.memcached.get_cluster_info')
+@patch('django_elastipymemcache.backend.get_cluster_info')
 def test_client_delete_many(get_cluster_info):
-    from django_elastipymemcache.memcached import ElastiPyMemCache
+    from django_elastipymemcache.backend import ElastiPymemcache
 
     servers = ['h1:0', 'h2:0']
     get_cluster_info.return_value = {
         'nodes': servers
     }
 
-    backend = ElastiPyMemCache('h:0', {})
+    backend = ElastiPymemcache('h:0', {})
     ret = backend.delete_many(['key1', 'key2'])
     eq_(ret, None)
 
 
-@patch('django_elastipymemcache.memcached.get_cluster_info')
+@patch('django_elastipymemcache.backend.get_cluster_info')
 def test_client_incr(get_cluster_info):
-    from django_elastipymemcache.memcached import ElastiPyMemCache
+    from django_elastipymemcache.backend import ElastiPymemcache
 
     servers = ['h1:0', 'h2:0']
     get_cluster_info.return_value = {
         'nodes': servers
     }
 
-    backend = ElastiPyMemCache('h:0', {})
+    backend = ElastiPymemcache('h:0', {})
     ret = backend.incr('key1', 1)
     eq_(ret, False)
 
 
-@patch('django_elastipymemcache.memcached.get_cluster_info')
+@patch('django_elastipymemcache.backend.get_cluster_info')
 def test_client_decr(get_cluster_info):
-    from django_elastipymemcache.memcached import ElastiPyMemCache
+    from django_elastipymemcache.backend import ElastiPymemcache
 
     servers = ['h1:0', 'h2:0']
     get_cluster_info.return_value = {
         'nodes': servers
     }
 
-    backend = ElastiPyMemCache('h:0', {})
+    backend = ElastiPymemcache('h:0', {})
     ret = backend.decr('key1', 1)
     eq_(ret, False)