diff options
| author | Scott Bahling <sbahling@suse.com> | 2020-02-13 12:23:57 +0100 |
|---|---|---|
| committer | Scott Bahling <sbahling@suse.com> | 2020-02-13 12:23:57 +0100 |
| commit | b2e96e97ccbe3b6b670a8366dc1ff5ed775deddf (patch) | |
| tree | c494c9ac43a29a9d346de0f53c00236a0601ec88 | |
| parent | 18b01d7861312b85bab1421cec42000d20106b26 (diff) | |
| download | obsapi-b2e96e97ccbe3b6b670a8366dc1ff5ed775deddf.tar.gz obsapi-b2e96e97ccbe3b6b670a8366dc1ff5ed775deddf.tar.xz obsapi-b2e96e97ccbe3b6b670a8366dc1ff5ed775deddf.zip | |
Cleanup sourceapi
| -rw-r--r-- | obsapi/core.py | 6 | ||||
| -rw-r--r-- | obsapi/sourceapi.py | 10 | ||||
| -rw-r--r-- | test/test_obs_source_api.py | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/obsapi/core.py b/obsapi/core.py index e91c408..8e17de7 100644 --- a/obsapi/core.py +++ b/obsapi/core.py @@ -109,8 +109,10 @@ class ObsApi(object): def get_meta(self, prj, pkg=None): return self.source.get_meta(prj, pkg=pkg) - def put_meta(self, prj, pkg=None, xml=None): - return self.source.put_meta(prj, pkg=pkg, xml=xml) + def put_meta(self, prj, pkg=None, meta=None): + if meta is None: + raise TypeError('Expected argument "meta" as xml text, got None') + return self.source.put_meta(prj, pkg=pkg, meta=meta) def ls(self, prj=None, pkg=None, repo=None, arch=None): if repo and arch: diff --git a/obsapi/sourceapi.py b/obsapi/sourceapi.py index 890ac52..1d4ba56 100644 --- a/obsapi/sourceapi.py +++ b/obsapi/sourceapi.py @@ -18,7 +18,7 @@ class ObsSourceApi(ObsHttpApi): def get(self, prj=None, pkg=None, filename=None, binary_get=None, **kwargs): if filename: - binary_get=True + binary_get = True return self.__get(prj, pkg, filename, binary_get=binary_get, **kwargs) def put(self, prj, pkg=None, filename=None, data=None, **kwargs): @@ -30,12 +30,10 @@ class ObsSourceApi(ObsHttpApi): def get_meta(self, prj, pkg=''): return self.__get(prj, pkg, '_meta') - def put_meta(self, prj, xml=None, pkg=None): - if xml is None: - return None - return self.__put(prj, pkg, '_meta', data=xml) + def put_meta(self, prj, pkg=None, meta=None): + return self.__put(prj, pkg, '_meta', data=meta) - def get_attribute(self, prj, pkg='', binary='', attribute=''): + def get_attribute(self, prj, pkg=None, binary=None, attribute=None): return self.__get(prj, pkg, binary, '_attribute', attribute) def get_config(self, prj): diff --git a/test/test_obs_source_api.py b/test/test_obs_source_api.py index e947547..beace47 100644 --- a/test/test_obs_source_api.py +++ b/test/test_obs_source_api.py @@ -27,7 +27,7 @@ def test_source_put_meta(requests_mock): matcher = RequestMatcher() matcher.put_data = xml requests_mock.put(uri, content=content, additional_matcher=matcher.match_put_data) - response = sourceapi.put_meta(prj, xml) + response = sourceapi.put_meta(prj, meta=xml) assert response.content == content |