# HG changeset patch # User RhodeCode Admin # Date 2023-03-27 12:55:52 # Node ID 8dff4d0fa76a5a8d78d4ee15492318b6910050cb # Parent 69a85da830dae9496107f46d693ae93bd629a454 hooks: fixed python3 compat diff --git a/vcsserver/hook_utils/hook_templates/git_post_receive.py.tmpl b/vcsserver/hook_utils/hook_templates/git_post_receive.py.tmpl --- a/vcsserver/hook_utils/hook_templates/git_post_receive.py.tmpl +++ b/vcsserver/hook_utils/hook_templates/git_post_receive.py.tmpl @@ -11,7 +11,7 @@ try: except ImportError: if os.environ.get('RC_DEBUG_GIT_HOOK'): import traceback - print traceback.format_exc() + print(traceback.format_exc()) hooks = None @@ -42,7 +42,7 @@ def main(): # TODO: johbo: Improve handling of this special case if not getattr(error, '_vcs_kind', None) == 'repo_locked': raise - print 'ERROR:', error + print(f'ERROR: {error}') sys.exit(1) sys.exit(0) diff --git a/vcsserver/hook_utils/hook_templates/git_pre_receive.py.tmpl b/vcsserver/hook_utils/hook_templates/git_pre_receive.py.tmpl --- a/vcsserver/hook_utils/hook_templates/git_pre_receive.py.tmpl +++ b/vcsserver/hook_utils/hook_templates/git_pre_receive.py.tmpl @@ -11,7 +11,7 @@ try: except ImportError: if os.environ.get('RC_DEBUG_GIT_HOOK'): import traceback - print traceback.format_exc() + print(traceback.format_exc()) hooks = None @@ -42,7 +42,7 @@ def main(): # TODO: johbo: Improve handling of this special case if not getattr(error, '_vcs_kind', None) == 'repo_locked': raise - print 'ERROR:', error + print(f'ERROR: {error}') sys.exit(1) sys.exit(0) diff --git a/vcsserver/hook_utils/hook_templates/svn_post_commit_hook.py.tmpl b/vcsserver/hook_utils/hook_templates/svn_post_commit_hook.py.tmpl --- a/vcsserver/hook_utils/hook_templates/svn_post_commit_hook.py.tmpl +++ b/vcsserver/hook_utils/hook_templates/svn_post_commit_hook.py.tmpl @@ -12,7 +12,7 @@ try: except ImportError: if os.environ.get('RC_DEBUG_SVN_HOOK'): import traceback - print traceback.format_exc() + print(traceback.format_exc()) hooks = None @@ -40,7 +40,7 @@ def main(): # TODO: johbo: Improve handling of this special case if not getattr(error, '_vcs_kind', None) == 'repo_locked': raise - print 'ERROR:', error + print(f'ERROR: {error}') sys.exit(1) sys.exit(0) diff --git a/vcsserver/hook_utils/hook_templates/svn_pre_commit_hook.py.tmpl b/vcsserver/hook_utils/hook_templates/svn_pre_commit_hook.py.tmpl --- a/vcsserver/hook_utils/hook_templates/svn_pre_commit_hook.py.tmpl +++ b/vcsserver/hook_utils/hook_templates/svn_pre_commit_hook.py.tmpl @@ -12,7 +12,7 @@ try: except ImportError: if os.environ.get('RC_DEBUG_SVN_HOOK'): import traceback - print traceback.format_exc() + print(traceback.format_exc()) hooks = None @@ -43,7 +43,7 @@ def main(): # TODO: johbo: Improve handling of this special case if not getattr(error, '_vcs_kind', None) == 'repo_locked': raise - print 'ERROR:', error + print(f'ERROR: {error}') sys.exit(1) sys.exit(0)