From c81ac284f8f9d4f5689a48384bc97d3ac284b612 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 29 May 2012 16:33:08 +0200 Subject: [PATCH 1/2] use urllib2 for urlopen to be more campatible to different python versions --- .../src/main/resources/sonia/scm/python/scmhooks.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/python/scmhooks.py b/scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/python/scmhooks.py index fe25aafef2..c7266ccf23 100644 --- a/scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/python/scmhooks.py +++ b/scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/python/scmhooks.py @@ -36,7 +36,7 @@ # changegroup.scm = python:scmhooks.callback # -import os, urllib +import os, urllib, urllib2 baseUrl = os.environ['SCM_URL'] challenge = os.environ['SCM_CHALLENGE'] @@ -51,7 +51,7 @@ def callback(ui, repo, hooktype, node=None, source=None, pending=None, **kwargs) url = baseUrl + hooktype ui.debug( "send scm-hook to " + url + " and " + node + "\n" ) data = urllib.urlencode({'node': node, 'challenge': challenge, 'credentials': credentials, 'repositoryPath': repo.root}) - conn = urllib.urlopen(url, data); + conn = urllib2.urlopen(url, data); if conn.code >= 200 and conn.code < 300: ui.debug( "scm-hook " + hooktype + " success with status code " + str(conn.code) + "\n" ) failure = False From 527b568df29a158790b2f53c1115628ed21b31c7 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 29 May 2012 16:54:39 +0200 Subject: [PATCH 2/2] close branch issue-163