| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -20,6 +20,7 @@ | |||
| 20 | 20 | from gitlab import cli | |
| 21 | 21 | from gitlab import exceptions as exc | |
| 22 | 22 | from gitlab import types as g_types | |
| 23 | + from gitlab import utils | ||
| 23 | 24 | ||
| 24 | 25 | ||
| 25 | 26 | class GetMixin(object): | |
@@ -42,7 +43,7 @@ def get(self, id, lazy=False, **kwargs): | |||
| 42 | 43 | GitlabGetError: If the server cannot perform the request | |
| 43 | 44 | """ | |
| 44 | 45 | if not isinstance(id, int): | |
| 45 | - id = id.replace("/", "%2F") | ||
| 46 | + id = utils.clean_str_id(id) | ||
| 46 | 47 | path = "%s/%s" % (self.path, id) | |
| 47 | 48 | if lazy is True: | |
| 48 | 49 | return self._obj_cls(self, {self._obj_cls._id_attr: id}) | |
@@ -299,7 +300,7 @@ def set(self, key, value, **kwargs): | |||
| 299 | 300 | Returns: | |
| 300 | 301 | obj: The created/updated attribute | |
| 301 | 302 | """ | |
| 302 | - path = "%s/%s" % (self.path, key.replace("/", "%2F")) | ||
| 303 | + path = "%s/%s" % (self.path, utils.clean_str_id(key)) | ||
| 303 | 304 | data = {"value": value} | |
| 304 | 305 | server_data = self.gitlab.http_put(path, post_data=data, **kwargs) | |
| 305 | 306 | return self._obj_cls(self, server_data) | |
@@ -322,7 +323,7 @@ def delete(self, id, **kwargs): | |||
| 322 | 323 | path = self.path | |
| 323 | 324 | else: | |
| 324 | 325 | if not isinstance(id, int): | |
| 325 | - id = id.replace("/", "%2F") | ||
| 326 | + id = utils.clean_str_id(id) | ||
| 326 | 327 | path = "%s/%s" % (self.path, id) | |
| 327 | 328 | self.gitlab.http_delete(path, **kwargs) | |
| 328 | 329 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -0,0 +1,43 @@ | |||
| 1 | + # -*- coding: utf-8 -*- | ||
| 2 | + # | ||
| 3 | + # Copyright (C) 2019 Gauvain Pocentek <gauvain@pocentek.net> | ||
| 4 | + # | ||
| 5 | + # This program is free software: you can redistribute it and/or modify | ||
| 6 | + # it under the terms of the GNU Lesser General Public License as published by | ||
| 7 | + # the Free Software Foundation, either version 3 of the License, or | ||
| 8 | + # (at your option) any later version. | ||
| 9 | + # | ||
| 10 | + # This program is distributed in the hope that it will be useful, | ||
| 11 | + # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 12 | + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 13 | + # GNU Lesser General Public License for more details. | ||
| 14 | + # | ||
| 15 | + # You should have received a copy of the GNU Lesser General Public License | ||
| 16 | + # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 17 | + | ||
| 18 | + try: | ||
| 19 | + import unittest | ||
| 20 | + except ImportError: | ||
| 21 | + import unittest2 as unittest | ||
| 22 | + | ||
| 23 | + from gitlab import utils | ||
| 24 | + | ||
| 25 | + | ||
| 26 | + class TestUtils(unittest.TestCase): | ||
| 27 | + def test_clean_str_id(self): | ||
| 28 | + src = "nothing_special" | ||
| 29 | + dest = "nothing_special" | ||
| 30 | + self.assertEqual(dest, utils.clean_str_id(src)) | ||
| 31 | + | ||
| 32 | + src = "foo#bar/baz/" | ||
| 33 | + dest = "foo%23bar%2Fbaz%2F" | ||
| 34 | + self.assertEqual(dest, utils.clean_str_id(src)) | ||
| 35 | + | ||
| 36 | + def test_sanitized_url(self): | ||
| 37 | + src = "http://localhost/foo/bar" | ||
| 38 | + dest = "http://localhost/foo/bar" | ||
| 39 | + self.assertEqual(dest, utils.sanitized_url(src)) | ||
| 40 | + | ||
| 41 | + src = "http://localhost/foo.bar.baz" | ||
| 42 | + dest = "http://localhost/foo%2Ebar%2Ebaz" | ||
| 43 | + self.assertEqual(dest, utils.sanitized_url(src)) | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -47,6 +47,10 @@ def copy_dict(dest, src): | |||
| 47 | 47 | dest[k] = v | |
| 48 | 48 | ||
| 49 | 49 | ||
| 50 | + def clean_str_id(id): | ||
| 51 | + return id.replace("/", "%2F").replace("#", "%23") | ||
| 52 | + | ||
| 53 | + | ||
| 50 | 54 | def sanitized_url(url): | |
| 51 | 55 | parsed = six.moves.urllib.parse.urlparse(url) | |
| 52 | 56 | new_path = parsed.path.replace(".", "%2E") | |
| Back | FazBrowse Home | New Git URL |
0 commit comments