diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2015-09-14 12:37:45 +0200 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2015-10-07 10:27:20 +0200 |
| commit | 7f1204a42c0fd13602768e24da7af8814cbf97d2 (patch) | |
| tree | 18c50e71bb2caf5ae676285aaadbd1a17bab2fc2 | |
| parent | 60d626845d9ed1b59bff25bb29c8c1ae283e1e98 (diff) | |
| download | freeipa-7f1204a42c0fd13602768e24da7af8814cbf97d2.tar.gz freeipa-7f1204a42c0fd13602768e24da7af8814cbf97d2.tar.xz freeipa-7f1204a42c0fd13602768e24da7af8814cbf97d2.zip | |
Use sys.maxsize instead of sys.maxint
In Python 3, integers don't have a maximum. The number called
"sys.maxint" is now "sys.maxsize" (defined as larger than the
largest possible list/string index).
The new spelling is also available in Python 2.7.
Reviewed-By: David Kupka <dkupka@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Reviewed-By: Martin Basti <mbasti@redhat.com>
| -rw-r--r-- | ipapython/log_manager.py | 12 | ||||
| -rw-r--r-- | ipatests/test_ipalib/test_parameters.py | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/ipapython/log_manager.py b/ipapython/log_manager.py index bc9efc5de..0cb134693 100644 --- a/ipapython/log_manager.py +++ b/ipapython/log_manager.py @@ -172,7 +172,7 @@ FAQ (Frequently Asked Questions) See above. Logger's will never have a level less than the level of the handlers visible to the logger. If there are no handlers then - loggers can't output anything so their level is set to maxint. + loggers can't output anything so their level is set to maxsize. #. **I set the default_level but all the loggers are configured at INFO or DEBUG, what happened?** @@ -547,7 +547,7 @@ def get_unique_levels(iterable): levels = set() for obj in iterable: - level = getattr(obj, 'level', sys.maxint) + level = getattr(obj, 'level', sys.maxsize) if level != logging.NOTSET: levels.add(level) levels = list(levels) @@ -557,7 +557,7 @@ def get_unique_levels(iterable): def get_minimum_level(iterable): ''' Given a iterable of objects containing a logging level return the - minimum level. If no levels are defined return maxint. + minimum level. If no levels are defined return maxsize. set of unique levels. :parameters: @@ -566,10 +566,10 @@ def get_minimum_level(iterable): :returns: Ordered list (min to max) of unique levels. ''' - min_level = sys.maxint + min_level = sys.maxsize for obj in iterable: - level = getattr(obj, 'level', sys.maxint) + level = getattr(obj, 'level', sys.maxsize) if level != logging.NOTSET: if level < min_level: min_level = level @@ -1442,7 +1442,7 @@ class LogManager(object): :return: The minimum of all the handler's levels. If no - handlers are defined sys.maxint will be returned. + handlers are defined sys.maxsize will be returned. ''' handlers = self.get_logger_handlers(logger) diff --git a/ipatests/test_ipalib/test_parameters.py b/ipatests/test_ipalib/test_parameters.py index 929289258..3f9b2f3ab 100644 --- a/ipatests/test_ipalib/test_parameters.py +++ b/ipatests/test_ipalib/test_parameters.py @@ -1186,9 +1186,9 @@ def check_int_scalar_conversions(o): assert e.name == 'my_number' assert e.index is None # Assure large magnitude values are handled correctly - assert type(o._convert_scalar(sys.maxint * 2)) == long - assert o._convert_scalar(sys.maxint * 2) == sys.maxint * 2 - assert o._convert_scalar(unicode(sys.maxint * 2)) == sys.maxint * 2 + assert type(o._convert_scalar(sys.maxsize * 2)) == long + assert o._convert_scalar(sys.maxsize * 2) == sys.maxsize * 2 + assert o._convert_scalar(unicode(sys.maxsize * 2)) == sys.maxsize * 2 assert o._convert_scalar(long(16)) == 16 # Assure normal conversions produce expected result assert o._convert_scalar(u'16.99') == 16 |