diff options
| author | Douglas Bagnall <douglas.bagnall@catalyst.net.nz> | 2020-07-04 13:44:52 +1200 |
|---|---|---|
| committer | Noel Power <npower@samba.org> | 2020-08-11 16:37:35 +0000 |
| commit | 323073f4e0feadcaaf0978604741660b6ef02a16 (patch) | |
| tree | 6deecf960c134bd98d79f1ec6be1bdc1d0b4f403 /python | |
| parent | 32eb7f3966703582f2f8f2c75b2f960c5e4eb492 (diff) | |
| download | samba-323073f4e0feadcaaf0978604741660b6ef02a16.tar.gz samba-323073f4e0feadcaaf0978604741660b6ef02a16.tar.bz2 samba-323073f4e0feadcaaf0978604741660b6ef02a16.zip | |
python compat: remove integer_types
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
Diffstat (limited to 'python')
| -rw-r--r-- | python/samba/compat.py | 1 | ||||
| -rw-r--r-- | python/samba/tests/dcerpc/testrpc.py | 3 | ||||
| -rw-r--r-- | python/samba/tests/messaging.py | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/python/samba/compat.py b/python/samba/compat.py index a6baa8dad1a..9ef60045bd3 100644 --- a/python/samba/compat.py +++ b/python/samba/compat.py @@ -72,7 +72,6 @@ if PY3: from functools import cmp_to_key as cmp_to_key_fn # compat types - integer_types = int, string_types = str text_type = str binary_type = bytes diff --git a/python/samba/tests/dcerpc/testrpc.py b/python/samba/tests/dcerpc/testrpc.py index 537c23129d8..d4fc39e51f8 100644 --- a/python/samba/tests/dcerpc/testrpc.py +++ b/python/samba/tests/dcerpc/testrpc.py @@ -22,7 +22,6 @@ sys.path.insert(0, "bin/python") import samba import samba.tests from samba.dcerpc import drsuapi -from samba.compat import integer_types import talloc talloc.enable_null_tracking() @@ -99,7 +98,7 @@ class RpcTests(object): if isinstance(value, str): # print "%s=\"%s\"" % (n, value) pass - elif isinstance(value, integer_types): + elif isinstance(value, int): # print "%s=%d" % (n, value) pass elif isinstance(value, type): diff --git a/python/samba/tests/messaging.py b/python/samba/tests/messaging.py index 6484d0655ff..7a4aa17b9d5 100644 --- a/python/samba/tests/messaging.py +++ b/python/samba/tests/messaging.py @@ -26,7 +26,6 @@ from samba.ndr import ndr_print from samba.dcerpc import server_id import random import os -from samba.compat import integer_types class MessagingTests(TestCase): @@ -41,7 +40,7 @@ class MessagingTests(TestCase): def callback(): pass msg_type = x.register((callback, None)) - self.assertTrue(isinstance(msg_type, integer_types)) + self.assertTrue(isinstance(msg_type, int)) x.deregister(callback, msg_type) def test_all_servers(self): |