IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

pylint: Fix deprecated-method for threading

Browse Source 
As of Python3 `currentThread`, `thread.getName` are aliases for
`threading.current_thread()` and `threading.Thread.name`
respectively.

In Python3.10:
> bpo-43723: The following threading methods are now deprecated and
  should be replaced:
  currentThread => threading.current_thread()
  activeCount => threading.active_count()
  Condition.notifyAll => threading.Condition.notify_all()
  Event.isSet => threading.Event.is_set()
  Thread.setName => threading.Thread.name
  thread.getName => threading.Thread.name
  Thread.isDaemon => threading.Thread.daemon
  Thread.setDaemon => threading.Thread.daemon

Fixes: https://pagure.io/freeipa/issue/9117
Signed-off-by: Stanislav Levin <slev@altlinux.org>
Reviewed-By: Rob Crittenden <rcritten@redhat.com>
This commit is contained in:
Stanislav Levin
2022-02-21 13:21:06 +03:00
committed by Rob Crittenden
parent adc7b7cc0b
commit feab723c59
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ipalib/backend.py
View File

@@ -63,7 +63,7 @@ class Connectible(Backend):
"{0} is already connected ({1} in {2})".format(
self.name,
self.id,
threading.currentThread().getName()
threading.current_thread().name,
)
)
conn = self.create_connection(*args, **kw)
@@ -80,7 +80,7 @@ class Connectible(Backend):
"{0} is not connected ({1} in {2})".format(
self.name,
self.id,
threading.currentThread().getName()
threading.current_thread().name,
)
)
self.destroy_connection()
@@ -105,7 +105,7 @@ class Connectible(Backend):
"{0} is not connected ({1} in {2})".format(
self.name,
self.id,
threading.currentThread().getName()
threading.current_thread().name,
)
)
return getattr(context, self.id).conn

8
ipatests/test_ipalib/test_backend.py
View File

@@ -94,7 +94,8 @@ class test_Connectible(ClassChecker):
m = "{0} is already connected ({1} in {2})"
e = raises(Exception, o.connect, *args, **kw)
assert str(e) == m.format(
'example', o.id, threading.currentThread().getName())
"example", o.id, threading.current_thread().name
)
# Double check that it works after deleting context.example:
del context.example
@@ -124,7 +125,8 @@ class test_Connectible(ClassChecker):
m = "{0} is not connected ({1} in {2})"
e = raises(Exception, o.disconnect)
assert str(e) == m.format(
'example', o.id, threading.currentThread().getName())
"example", o.id, threading.current_thread().name
)
context.example = 'The connection.'
assert o.disconnect() is None
@@ -169,7 +171,7 @@ class test_Connectible(ClassChecker):
o = klass(api, shared_instance=True)
e = raises(AttributeError, getattr, o, 'conn')
assert str(e) == msg.format(
klass.__name__, o.id, threading.currentThread().getName()
klass.__name__, o.id, threading.current_thread().name
)
conn = Connection('The connection.', Disconnect())
setattr(context, klass.__name__, conn)