Fix #552: Import Script from the correct place (#554)

* Fix #552: Import Script from the correct place

* Upgrade redis-py to 4.1.0

* Bump version number

pottery/__init__.py

@@ -32,7 +32,7 @@
 
 
 __title__: Final[str] = 'pottery'
-__version__: Final[str] = '2.2.1'
+__version__: Final[str] = '2.2.2'
 __description__: Final[str] = __doc__.split(sep='\n\n', maxsplit=1)[0]
 __url__: Final[str] = 'https://github.com/brainix/pottery'
 __author__: Final[str] = 'Rajiv Bakulesh Shah'

pottery/base.py

@@ -53,7 +53,7 @@
 
 
 logger: Final[logging.Logger] = logging.getLogger('pottery')
-_default_url: Final[str] = os.environ.get('REDIS_URL', 'redis://localhost:6379/')
+_default_url: Final[str] = os.environ.get('REDIS_URL', 'redis://localhost:6379/0')
 _default_redis: Final[Redis] = Redis.from_url(_default_url, socket_timeout=1)
 
 
@@ -213,8 +213,10 @@ def __context_managers(self,
         redises = collections.defaultdict(list)
         for container in (self, *others):
             if isinstance(container, _Pipelined):
-                connection_kwargs = frozenset(
-                    container.redis.connection_pool.connection_kwargs.items(),
+                connection_kwargs = (
+                    container.redis.connection_pool.connection_kwargs['host'],
+                    container.redis.connection_pool.connection_kwargs.get('port', 6379),
+                    container.redis.connection_pool.connection_kwargs.get('db', 0),
                 )
                 redises[connection_kwargs].append(container)
         for containers in redises.values():

pottery/nextid.py

@@ -36,7 +36,7 @@
 
 from redis import Redis
 from redis import RedisError
-from redis.client import Script
+from redis.commands.core import Script
 
 from .base import Primitive
 from .base import logger

pottery/redlock.py

@@ -52,7 +52,7 @@
 
 from redis import Redis
 from redis import RedisError
-from redis.client import Script
+from redis.commands.core import Script
 # TODO: When we drop support for Python 3.7, change the following import to:
 #   from typing import Final
 from typing_extensions import Final

requirements.txt

@@ -22,7 +22,7 @@ pyflakes==2.4.0
 Pygments==2.10.0
 pyparsing==3.0.6
 readme-renderer==30.0
-redis==4.0.2
+redis==4.1.0
 requests==2.26.0
 requests-toolbelt==0.9.1
 rfc3986==1.5.0
@@ -31,7 +31,7 @@ toml==0.10.2
 tomli==2.0.0
 tqdm==4.62.3
 twine==3.7.1
-types-redis==4.0.5
+types-redis==4.0.6
 typing_extensions==4.0.1
 urllib3==1.26.7
 webencodings==0.5.1