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

Use print as a function [PEP 3105].

Browse source 
This reduces warnings from the 2to3 utility
and future proofs the code when it is time to move to Python 3.
This commit is contained in:
Craig Rodrigues 2015-12-04 16:17:35 -08:00
parent 7caead8630
commit 381e8cc144
9 changed files with 32 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/rpm/build.py
View file

@ -1,5 +1,5 @@
#! /bin/env python
from __future__ import print_function
import sys
import os
import tarfile

35
pkg/windows/portable.py
View file

@ -1,25 +1,26 @@
#!/usr/bin/python
from __future__ import print_function
import sys, getopt
def display_help():
print '####################################################################'
print '# #'
print '# File: portable.py #'
print '# Description: #'
print '# - search and replace within a binary file #'
print '# #'
print '# Parameters: #'
print '# -f, --file : target file #'
print '# -s, --search : term to search for #'
print '# default is "C:\Python" #'
print '# -r, --replace : replace with this #'
print '# default is ".." #'
print '# #'
print '# example: #'
print '# portable.py -f <target_file> -s <search_term> -r <replace_term> #'
print '# #'
print '####################################################################'
print('####################################################################')
print('# #')
print('# File: portable.py #')
print('# Description: #')
print('# - search and replace within a binary file #')
print('# #')
print('# Parameters: #')
print('# -f, --file : target file #')
print('# -s, --search : term to search for #')
print('# default is "C:\Python" #')
print('# -r, --replace : replace with this #')
print('# default is ".." #')
print('# #')
print('# example: #')
print('# portable.py -f <target_file> -s <search_term> -r <replace_term> #')
print('# #')
print('####################################################################')
sys.exit(2)
def main(argv):

4
salt/modules/inspectlib/collector.py
View file

@ -15,7 +15,7 @@
# limitations under the License.
# Import Python Libs
from __future__ import absolute_import
from __future__ import absolute_import, print_function
import os
import sys
from subprocess import Popen, PIPE, STDOUT
@ -435,7 +435,7 @@ def main(dbfile, pidfile, mode):
if __name__ == '__main__':
if len(sys.argv) != 4:
print >> sys.stderr, "This module is not intended to use directly!"
print("This module is not intended to use directly!", file=sys.stderr)
sys.exit(1)
pidfile, dbfile, mode = sys.argv[1:]

2
salt/modules/state.py
View file

@ -12,7 +12,7 @@ states themselves.
'''
# Import python libs
from __future__ import absolute_import
from __future__ import absolute_import, print_function
import copy
import fnmatch
import json

3
salt/netapi/rest_tornado/saltnado.py
View file

@ -1,4 +1,6 @@
# encoding: utf-8
from __future__ import absolute_import, print_function
'''
A non-blocking REST API for Salt
================================
@ -188,7 +190,6 @@ a return like::
# pylint: disable=W0232
# Import Python libs
from __future__ import absolute_import
import time
import math
import fnmatch

4
salt/transport/local.py
View file

@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Import Python Libs
from __future__ import absolute_import
from __future__ import absolute_import, print_function
import logging
# Import Salt Libs
@ -32,7 +32,7 @@ class LocalChannel(ReqChannel):
'data': ''.join(f.readlines()),
'dest': load['path'],
}
print ('returning', ret)
print('returning', ret)
else:
# end of buffer
ret = {

2
tests/buildpackage.py
View file

@ -10,7 +10,7 @@
# pylint: disable=file-perms
from __future__ import absolute_import
from __future__ import absolute_import, print_function
import errno
import glob
import logging

2
tests/integration/files/file/base/script.py
View file

@ -1,5 +1,5 @@
#!/usr/bin/env python
from __future__ import print_function
import sys
print(' '.join(sys.argv[1:]))

8
tests/perf/fire_fake.py
View file

@ -1,6 +1,6 @@
# -*- encoding: utf-8 -**
from __future__ import absolute_import
from __future__ import absolute_import, print_function
# Import system libs
import sys
import time
@ -14,7 +14,7 @@ import salt.client.raet
try:
opts = salt.config.master_config('/etc/salt/master')
except OSError:
print 'Could not open master config. Do you need to be root?'
print('Could not open master config. Do you need to be root?')
sys.exit(1)
@ -48,7 +48,7 @@ class SwarmController(object):
self.calibrate()
last_check = 0
if self.total_complete > goal:
print 'Test complete'
print('Test complete')
break
def fire_it(self):
@ -67,7 +67,7 @@ class SwarmController(object):
#remaining_requests = (self.reqs_sec * self.run_time) - self.total_complete
# Figure out what the reqs/sec has been up to this point and then adjust up or down
runtime_reqs_sec = self.total_complete / elapsed_time.total_seconds()
print 'Recalibrating. Current reqs/sec: {0}'.format(runtime_reqs_sec)
print('Recalibrating. Current reqs/sec: {0}'.format(runtime_reqs_sec))
return
controller = SwarmController(opts)