From 0aee1ec1540ecd9a1d131b85c25a997e6ab1ef05 Mon Sep 17 00:00:00 2001 From: Alexander Kanevskiy Date: Tue, 3 Jun 2014 13:12:38 +0300 Subject: [PATCH] Make project_id more generic, as it can be used for other objects --- gerritrest/GerritREST.py | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/gerritrest/GerritREST.py b/gerritrest/GerritREST.py index 2543977..9e2d2e8 100644 --- a/gerritrest/GerritREST.py +++ b/gerritrest/GerritREST.py @@ -2,7 +2,7 @@ # -*- coding: UTF-8 -*- # vim: sw=4 ts=4 expandtab ai # -# Copyright (c) 2013 Intel, Inc. +# Copyright (c) 2013-2014 Intel, Inc. # License: GPLv2 # Author: Alexander Kanevskiy # @@ -63,15 +63,15 @@ class GerritREST(object): return None @staticmethod - def project_id(project): - "Returns encoded project name if it contains /" - return urllib2.quote(project,"") if '/' in project else project + def quote_id(oid): + "Returns encoded project or group name if it contains /" + return urllib2.quote(oid,"") if '/' in oid else oid @staticmethod def change_id(changeid, project=None, branch=None): "Returns constructed change_id with project / branch info" if project and branch: - return "%s~%s~%s" % (GerritREST.project_id(project), branch, changeid) + return "%s~%s~%s" % (GerritREST.quote_id(project), branch, changeid) else: return "%s" % changeid @@ -104,7 +104,7 @@ class GerritREST(object): """ if not project: return None - return self._do_json_call("a/projects/%s" % self.project_id(project)) + return self._do_json_call("a/projects/%s" % self.quote_id(project)) def create_project(self, project, parent=None, description=None, permissions_only=None, create_empty_commit=None, submit_type=None, @@ -159,7 +159,7 @@ class GerritREST(object): if require_change_id: info['require_change_id'] = require_change_id return self._do_json_call( - "a/projects/%s" % self.project_id(project), + "a/projects/%s" % self.quote_id(project), method='PUT', headers={'Content-Type': 'application/json;charset=UTF-8'}, data=json.dumps(info)) @@ -170,7 +170,7 @@ class GerritREST(object): """ if not project: return None - return self._do_json_call("a/projects/%s/description" % self.project_id(project)) + return self._do_json_call("a/projects/%s/description" % self.quote_id(project)) def set_project_description(self, project, description=None, commit_message=None): """ @@ -190,7 +190,7 @@ class GerritREST(object): if commit_message: info['commit_message'] = commit_message return self._do_json_call( - "a/projects/%s/description" % self.project_id(project), + "a/projects/%s/description" % self.quote_id(project), method='PUT', headers={'Content-Type': 'application/json;charset=UTF-8'}, data=json.dumps(info)) @@ -201,7 +201,7 @@ class GerritREST(object): """ if not project: return None - return self._do_json_call("a/projects/%s/description" % self.project_id(project), method='DELETE') + return self._do_json_call("a/projects/%s/description" % self.quote_id(project), method='DELETE') def get_project_parent(self, project): """ @@ -209,7 +209,7 @@ class GerritREST(object): """ if not project: return None - return self._do_json_call("a/projects/%s/parent" % self.project_id(project)) + return self._do_json_call("a/projects/%s/parent" % self.quote_id(project)) def set_project_parent(self, project, parent, commit_message=None): """ @@ -229,7 +229,7 @@ class GerritREST(object): if commit_message: info['commit_message'] = commit_message return self._do_json_call( - "a/projects/%s/parent" % self.project_id(project), + "a/projects/%s/parent" % self.quote_id(project), method='PUT', headers={'Content-Type': 'application/json;charset=UTF-8'}, data=json.dumps(info)) @@ -240,7 +240,7 @@ class GerritREST(object): """ if not project: return None - return self._do_json_call("a/projects/%s/HEAD" % self.project_id(project)) + return self._do_json_call("a/projects/%s/HEAD" % self.quote_id(project)) def set_project_head(self, project, head): """ @@ -252,7 +252,7 @@ class GerritREST(object): if head: info['ref'] = head return self._do_json_call( - "a/projects/%s/HEAD" % self.project_id(project), + "a/projects/%s/HEAD" % self.quote_id(project), method='PUT', headers={'Content-Type': 'application/json;charset=UTF-8'}, data=json.dumps(info)) @@ -263,7 +263,7 @@ class GerritREST(object): """ if not project: return None - return self._do_json_call("a/projects/%s/statistics.git" % self.project_id(project)) + return self._do_json_call("a/projects/%s/statistics.git" % self.quote_id(project)) def run_project_gc(self, project): """ @@ -272,7 +272,7 @@ class GerritREST(object): """ if not project: return None - return self._do_http_call("a/projects/%s/gc" % self.project_id(project), method='POST')[0] + return self._do_http_call("a/projects/%s/gc" % self.quote_id(project), method='POST')[0] def get_groups(self, members=False, includes=False, project=None, user=None): """ @@ -285,7 +285,7 @@ class GerritREST(object): if includes: opts.append("o=INCLUDES") if project: - opts.append("p=%s" % self.project_id(project)) + opts.append("p=%s" % self.quote_id(project)) if user: opts.append("u=%s" % user) if opts: -- 2.34.1