saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Py3 compatibility fixes

Browse source
This commit is contained in:
Pedro Algarvio 2014-11-21 17:40:40 +00:00
parent e3d230c212
commit 0e3dc486a6
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/version.py
View file

@ -3,12 +3,15 @@
Set up the version of Salt
'''
# pylint: disable=incompatible-py3-code
# Import python libs
from __future__ import absolute_import, print_function
import re
import sys
# Don't rely on external packages in this module since it's used at install time
# pylint: disable=invalid-name,redefined-builtin
if sys.version_info[0] == 3:
MAX_SIZE = sys.maxsize
string_types = (str,)
@ -16,6 +19,7 @@ else:
MAX_SIZE = sys.maxint
string_types = (basestring,)
from itertools import imap as map
# pylint: enable=invalid-name,redefined-builtin
# ----- ATTENTION --------------------------------------------------------------------------------------------------->
#
@ -188,9 +192,9 @@ class SaltStackVersion(object):
# pylint: enable=E8203,E8265
}
LNAMES = dict((k.lower(), v) for (k, v) in NAMES.items())
VNAMES = dict((v, k) for (k, v) in NAMES.items())
RMATCH = dict((v[:2], k) for (k, v) in NAMES.items())
LNAMES = dict((k.lower(), v) for (k, v) in iter(NAMES.items()))
VNAMES = dict((v, k) for (k, v) in iter(NAMES.items()))
RMATCH = dict((v[:2], k) for (k, v) in iter(NAMES.items()))
def __init__(self, # pylint: disable=C0103
major,