ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-06 02:30:32 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[PR #9320/cb2cd00c backport][stable-10] cache plugins: use f-strings (#9331)

Browse source 
cache plugins: use f-strings (#9320)

* cache plugins: use f-strings

* add changelog frag

(cherry picked from commit cb2cd00cd1)

Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
This commit is contained in:
patchback[bot] 2024-12-23 12:25:24 +01:00 • committed by GitHub
parent 2499c1132d
commit 3c6131b451
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelogs/fragments/9320-fstr-cache-plugins.yml Normal file
View file

@ -0,0 +1,3 @@
minor_changes:
- memcached cache plugin - use f-strings instead of interpolations or ``format`` (https://github.com/ansible-collections/community.general/pull/9320).
- redis cache plugin - use f-strings instead of interpolations or ``format`` (https://github.com/ansible-collections/community.general/pull/9320).

2
plugins/cache/memcached.py vendored
View file

@ -191,7 +191,7 @@ class CacheModule(BaseCacheModule):
self._keys = CacheModuleKeys(self._db, self._db.get(CacheModuleKeys.PREFIX) or [])
def _make_key(self, key):
return "{0}{1}".format(self._prefix, key)
return f"{self._prefix}{key}"
def _expire_keys(self):
if self._timeout > 0:

6
plugins/cache/redis.py vendored
View file

@ -131,7 +131,7 @@ class CacheModule(BaseCacheModule):
connection = self._parse_connection(self.re_url_conn, uri)
self._db = StrictRedis(*connection, **kw)
display.vv('Redis connection: %s' % self._db)
display.vv(f'Redis connection: {self._db}')
@staticmethod
def _parse_connection(re_patt, uri):
@ -164,12 +164,12 @@ class CacheModule(BaseCacheModule):
pass # password is optional
sentinels = [self._parse_connection(self.re_sent_conn, shost) for shost in connections]
display.vv('\nUsing redis sentinels: %s' % sentinels)
display.vv(f'\nUsing redis sentinels: {sentinels}')
scon = Sentinel(sentinels, **kw)
try:
return scon.master_for(self._sentinel_service_name, socket_timeout=0.2)
except Exception as exc:
raise AnsibleError('Could not connect to redis sentinel: %s' % to_native(exc))
raise AnsibleError(f'Could not connect to redis sentinel: {to_native(exc)}')
def _make_key(self, key):
return self._prefix + key