solenv/bin/polib.py | 4 ++--
solenv/gdb/six.py | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit f295af7dfe6c91e00e7fb64f82de7dbba4bb0dc1
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Tue Nov 8 11:54:29 2022 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Tue Nov 8 12:20:18 2022 +0100
Simplify some Python version comparisons a bit
Change-Id: Ic1b475f4bc443a9f6e79c7c5ef36496dcf602a8e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142418
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/solenv/bin/polib.py b/solenv/bin/polib.py
index 092e7dfdb8b3..e1511cdb975f 100644
--- a/solenv/bin/polib.py
+++ b/solenv/bin/polib.py
@@ -43,7 +43,7 @@ default_encoding = 'utf-8'
# python 2/3 compatibility helpers {{{
-if sys.version_info[:2] < (3, 0):
+if sys.version_info < (3, 0):
PY3 = False
text_type = unicode
@@ -593,7 +593,7 @@ class _BaseFile(list):
0, keystart
)
- if PY3 and sys.version_info.minor > 1: # python 3.2 or superior
+ if sys.version_info >= (3, 2):
output += array.array("i", offsets).tobytes()
else:
output += array.array("i", offsets).tostring()
diff --git a/solenv/gdb/six.py b/solenv/gdb/six.py
index 5fe9f8e141ee..4196957e4102 100644
--- a/solenv/gdb/six.py
+++ b/solenv/gdb/six.py
@@ -35,7 +35,7 @@ __version__ = "1.14.0"
# Useful for very coarse version differentiation.
PY2 = sys.version_info[0] == 2
PY3 = sys.version_info[0] == 3
-PY34 = sys.version_info[0:2] >= (3, 4)
+PY34 = sys.version_info >= (3, 4)
if PY3:
string_types = str,
@@ -641,7 +641,7 @@ if PY3:
BytesIO = io.BytesIO
del io
_assertCountEqual = "assertCountEqual"
- if sys.version_info[1] <= 1:
+ if sys.version_info <= (3, 1):
_assertRaisesRegex = "assertRaisesRegexp"
_assertRegex = "assertRegexpMatches"
_assertNotRegex = "assertNotRegexpMatches"
@@ -726,7 +726,7 @@ else:
""")
-if sys.version_info[:2] > (3,):
+if sys.version_info > (3,):
exec_("""def raise_from(value, from_value):
try:
raise value from from_value
@@ -793,7 +793,7 @@ if print_ is None:
write(sep)
write(arg)
write(end)
-if sys.version_info[:2] < (3, 3):
+if sys.version_info < (3, 3):
_print = print_
def print_(*args, **kwargs):
@@ -805,7 +805,7 @@ if sys.version_info[:2] < (3, 3):
_add_doc(reraise, """Reraise an exception.""")
-if sys.version_info[0:2] < (3, 4):
+if sys.version_info < (3, 4):
# This does exactly the same what the :func:`py3:functools.update_wrapper`
# function does on Python versions after 3.2. It sets the ``__wrapped__``
# attribute on ``wrapper`` object and it doesn't raise an error if any of
@@ -845,7 +845,7 @@ def with_metaclass(meta, *bases):
class metaclass(type):
def __new__(cls, name, this_bases, d):
- if sys.version_info[:2] >= (3, 7):
+ if sys.version_info >= (3, 7):
# This version introduced PEP 560 that requires a bit
# of extra care (we mimic what is done by __build_class__).
resolved_bases = types.resolve_bases(bases)
