From b4f1f97491eab8b97608b8cea79aea74a394a04e Mon Sep 17 00:00:00 2001 From: Jeffrey Smith Date: Fri, 8 Mar 2024 04:26:20 -0500 Subject: [PATCH] ODP-1073: Changed print statements to work in Python2 and Python3 (#1) * ODP-1073: Changed print statements to work in Python2 and Python3 --- .../resources/scripts/ranger_credential_helper.py | 14 +++++++------- .../test/resources/jython/callbacks/compress.py | 6 +++--- .../test/resources/jython/callbacks/decompress.py | 6 +++--- .../resources/jython/callbacks/read_first_line.py | 6 +++--- .../src/test/resources/jython/test_compress.py | 10 +++++----- .../src/test/resources/jython/test_modules_path.py | 10 +++++----- .../src/test/resources/jython/test_reader.py | 10 +++++----- .../test/resources/jython/test_update_attribute.py | 10 +++++----- 8 files changed, 36 insertions(+), 36 deletions(-) diff --git a/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-resources/src/main/resources/scripts/ranger_credential_helper.py b/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-resources/src/main/resources/scripts/ranger_credential_helper.py index 940dbf168873..a51df8328a2f 100644 --- a/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-resources/src/main/resources/scripts/ranger_credential_helper.py +++ b/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-resources/src/main/resources/scripts/ranger_credential_helper.py @@ -20,11 +20,11 @@ from optparse import OptionParser if os.getenv('JAVA_HOME') is None: - print "[W] ---------- JAVA_HOME environment property not defined, using java in path. ----------" + print("[W] ---------- JAVA_HOME environment property not defined, using java in path. ----------") JAVA_BIN='java' else: JAVA_BIN=os.path.join(os.getenv('JAVA_HOME'),'bin','java') -print "Using Java:" + str(JAVA_BIN) +print("Using Java:" + str(JAVA_BIN)) def main(): @@ -54,9 +54,9 @@ def call_keystore(libpath, filepath, aliasKey, aliasValue='', getorcreate='get') output, error = p.communicate() statuscode = p.returncode if statuscode == 0: - print "Alias " + aliasKey + " created successfully!" + print("Alias " + aliasKey + " created successfully!") else : - print "Error creating Alias!! Error: " + str(error) + print("Error creating Alias!! Error: " + str(error)) elif getorcreate == 'get': commandtorun = [JAVA_BIN, '-cp', finalLibPath, 'org.apache.ranger.credentialapi.buildks' ,'get', aliasKey, '-provider',finalFilePath] @@ -64,12 +64,12 @@ def call_keystore(libpath, filepath, aliasKey, aliasValue='', getorcreate='get') output, error = p.communicate() statuscode = p.returncode if statuscode == 0: - print "Alias : " + aliasKey + " Value : " + str(output) + print("Alias : " + aliasKey + " Value : " + str(output)) else : - print "Error getting value!! Error: " + str(error) + print("Error getting value!! Error: " + str(error)) else: - print 'Invalid Arguments!!' + print('Invalid Arguments!!') if __name__ == '__main__': main() diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/jython/callbacks/compress.py b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/jython/callbacks/compress.py index 51409a940ab8..c61524e479f1 100755 --- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/jython/callbacks/compress.py +++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/jython/callbacks/compress.py @@ -42,8 +42,8 @@ def process(self, input, output) : output.write(comp.compress(StringUtil.fromBytes(buf, 0, bytes_read))) output.write(comp.flush()) except : - print "Exception in Compress:" - print '-' * 60 + print("Exception in Compress:") + print('-' * 60) traceback.print_exc(file=sys.stdout) - print '-' * 60 + print('-' * 60) raise diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/jython/callbacks/decompress.py b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/jython/callbacks/decompress.py index a45ef92fe4ba..7561e58d036c 100755 --- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/jython/callbacks/decompress.py +++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/jython/callbacks/decompress.py @@ -41,8 +41,8 @@ def process(self, input, output) : break output.write(comp.decompress(StringUtil.fromBytes(buf, 0, bytes_read))) except : - print "Exception in Decompress:" - print '-' * 60 + print("Exception in Decompress:") + print('-' * 60) traceback.print_exc(file=sys.stdout) - print '-' * 60 + print('-' * 60) raise diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/jython/callbacks/read_first_line.py b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/jython/callbacks/read_first_line.py index a66909b9828f..6af34e31bf72 100755 --- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/jython/callbacks/read_first_line.py +++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/jython/callbacks/read_first_line.py @@ -38,10 +38,10 @@ def process(self, input) : bufferedReader = BufferedReader(reader) self.__line = bufferedReader.readLine() except : - print "Exception in Reader:" - print '-' * 60 + print("Exception in Reader:") + print('-' * 60) traceback.print_exc(file=sys.stdout) - print '-' * 60 + print('-' * 60) raise finally : if bufferedReader is not None : diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/jython/test_compress.py b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/jython/test_compress.py index bc74f9ac1639..1023fcd54d01 100755 --- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/jython/test_compress.py +++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/jython/test_compress.py @@ -45,13 +45,13 @@ def onTrigger(self, context, sessionFactory) : session.transfer(flowfile, self.__rel_success) session.commitAsync() except : - print sys.exc_info()[0] - print "Exception in TestReader:" - print '-' * 60 + print(sys.exc_info()[0]) + print("Exception in TestReader:") + print('-' * 60) traceback.print_exc(file=sys.stdout) - print '-' * 60 + print('-' * 60) session.rollback(true) raise -processor = CompressFlowFile() \ No newline at end of file +processor = CompressFlowFile() diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/jython/test_modules_path.py b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/jython/test_modules_path.py index c7954777288b..0fb1485cbfc9 100644 --- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/jython/test_modules_path.py +++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/jython/test_modules_path.py @@ -62,13 +62,13 @@ def onTrigger(self, context, sessionFactory) : session.transfer(flowfile, self.__rel_success) session.commitAsync() except : - print sys.exc_info()[0] - print "Exception in TestReader:" - print '-' * 60 + print(sys.exc_info()[0]) + print("Exception in TestReader:") + print('-' * 60) traceback.print_exc(file=sys.stdout) - print '-' * 60 + print('-' * 60) session.rollback(True) raise -processor = ReadModulesPathAndStoreAsAttribute() \ No newline at end of file +processor = ReadModulesPathAndStoreAsAttribute() diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/jython/test_reader.py b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/jython/test_reader.py index 1b9d27c20144..3f67e68abd91 100755 --- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/jython/test_reader.py +++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/jython/test_reader.py @@ -62,13 +62,13 @@ def onTrigger(self, context, sessionFactory) : session.transfer(flowfile, self.__rel_success) session.commitAsync() except : - print sys.exc_info()[0] - print "Exception in TestReader:" - print '-' * 60 + print(sys.exc_info()[0]) + print("Exception in TestReader:") + print('-' * 60) traceback.print_exc(file=sys.stdout) - print '-' * 60 + print('-' * 60) session.rollback(True) raise -processor = ReadContentAndStoreAsAttribute() \ No newline at end of file +processor = ReadContentAndStoreAsAttribute() diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/jython/test_update_attribute.py b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/jython/test_update_attribute.py index beb33c7bdf42..9ff229211cee 100755 --- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/jython/test_update_attribute.py +++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/jython/test_update_attribute.py @@ -67,13 +67,13 @@ def onTrigger(self, context, sessionFactory) : session.transfer(flowfile, self.__rel_success) session.commitAsync() except : - print sys.exc_info()[0] - print "Exception in TestReader:" - print '-' * 60 + print(sys.exc_info()[0]) + print("Exception in TestReader:") + print('-' * 60) traceback.print_exc(file=sys.stdout) - print '-' * 60 + print('-' * 60) session.rollback(true) raise -processor = UpdateAttributes() \ No newline at end of file +processor = UpdateAttributes()