Commit aa3e7991011f0e9e4699ee2bcdc712c098873bb6
1 parent
76626fa9
print in mraptor compliant python3.5
Showing
1 changed file
with
8 additions
and
8 deletions
oletools/mraptor.py
| @@ -233,16 +233,16 @@ def main(): | @@ -233,16 +233,16 @@ def main(): | ||
| 233 | 233 | ||
| 234 | # Print help if no arguments are passed | 234 | # Print help if no arguments are passed |
| 235 | if len(args) == 0: | 235 | if len(args) == 0: |
| 236 | - print __doc__ | 236 | + print(__doc__) |
| 237 | parser.print_help() | 237 | parser.print_help() |
| 238 | - print '\nAn exit code is returned based on the analysis result:' | 238 | + print('\nAn exit code is returned based on the analysis result:') |
| 239 | for result in (Result_NoMacro, Result_NotMSOffice, Result_MacroOK, Result_Error, Result_Suspicious): | 239 | for result in (Result_NoMacro, Result_NotMSOffice, Result_MacroOK, Result_Error, Result_Suspicious): |
| 240 | - print ' - %d: %s' % (result.exit_code, result.name) | 240 | + print(' - %d: %s' % (result.exit_code, result.name)) |
| 241 | sys.exit() | 241 | sys.exit() |
| 242 | 242 | ||
| 243 | # print banner with version | 243 | # print banner with version |
| 244 | - print 'MacroRaptor %s - http://decalage.info/python/oletools' % __version__ | ||
| 245 | - print 'This is work in progress, please report issues at %s' % URL_ISSUES | 244 | + print('MacroRaptor %s - http://decalage.info/python/oletools' % __version__) |
| 245 | + print('This is work in progress, please report issues at %s' % URL_ISSUES) | ||
| 246 | 246 | ||
| 247 | logging.basicConfig(level=LOG_LEVELS[options.loglevel], format='%(levelname)-8s %(message)s') | 247 | logging.basicConfig(level=LOG_LEVELS[options.loglevel], format='%(levelname)-8s %(message)s') |
| 248 | # enable logging in the modules: | 248 | # enable logging in the modules: |
| @@ -319,9 +319,9 @@ def main(): | @@ -319,9 +319,9 @@ def main(): | ||
| 319 | global_result = result | 319 | global_result = result |
| 320 | exitcode = result.exit_code | 320 | exitcode = result.exit_code |
| 321 | 321 | ||
| 322 | - print '' | ||
| 323 | - print 'Flags: A=AutoExec, W=Write, X=Execute' | ||
| 324 | - print 'Exit code: %d - %s' % (exitcode, global_result.name) | 322 | + print('') |
| 323 | + print('Flags: A=AutoExec, W=Write, X=Execute') | ||
| 324 | + print('Exit code: %d - %s' % (exitcode, global_result.name)) | ||
| 325 | sys.exit(exitcode) | 325 | sys.exit(exitcode) |
| 326 | 326 | ||
| 327 | if __name__ == '__main__': | 327 | if __name__ == '__main__': |