From 6c4e9075e2f62c949b27c57c993b1b232a554e28 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jul 17 2015 10:54:07 +0000 Subject: [PATCH 1/5] Remove comments in the setup.py --- diff --git a/setup.py b/setup.py index c4d0dfe..31a6cf1 100644 --- a/setup.py +++ b/setup.py @@ -1,14 +1,16 @@ from distutils.core import setup setup( name = 'libpagure', - packages = ['libpagure'], # this must be the same as the name above + packages = ['libpagure'], version = '0.21', description = 'A Python library for Pagure APIs.', author = 'Lei Yang', author_email = 'yltt1234512@gmail.com', - url = 'https://github.com/yangl1996/libpagure', # use the URL to the github repo - download_url = 'https://github.com/yangl1996/libpagure/tarball/0.21', # I'll explain this in a second - keywords = ['pagure', 'api', 'library'], # arbitrary keywords - classifiers = ['Programming Language :: Python'], - license = "GNU General Public License v2.0" -) \ No newline at end of file + url = 'https://github.com/yangl1996/libpagure', + download_url = 'https://github.com/yangl1996/libpagure/tarball/0.21', + keywords = ['pagure', 'api', 'library'], + classifiers = [ + 'Programming Language :: Python', + ], + license = "GNU General Public License v2.0", +) From 712d21e815c06b5ef4d5a332428ef8229ee4c331 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jul 17 2015 10:55:14 +0000 Subject: [PATCH 2/5] Let's be pep8 valid in the setup.py --- diff --git a/setup.py b/setup.py index 31a6cf1..1c2018e 100644 --- a/setup.py +++ b/setup.py @@ -1,16 +1,16 @@ from distutils.core import setup setup( - name = 'libpagure', - packages = ['libpagure'], - version = '0.21', - description = 'A Python library for Pagure APIs.', - author = 'Lei Yang', - author_email = 'yltt1234512@gmail.com', - url = 'https://github.com/yangl1996/libpagure', - download_url = 'https://github.com/yangl1996/libpagure/tarball/0.21', - keywords = ['pagure', 'api', 'library'], - classifiers = [ + name='libpagure', + packages=['libpagure'], + version='0.21', + description='A Python library for Pagure APIs.', + author='Lei Yang', + author_email='yltt1234512@gmail.com', + url='https://github.com/yangl1996/libpagure', + download_url='https://github.com/yangl1996/libpagure/tarball/0.21', + keywords=['pagure', 'api', 'library'], + classifiers=[ 'Programming Language :: Python', ], - license = "GNU General Public License v2.0", + license='GNU General Public License v2.0', ) From f7fa4202e463fb2d9b58e7881708f61e9f50ed37 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jul 17 2015 10:55:41 +0000 Subject: [PATCH 3/5] List the requirements in the setup.py --- diff --git a/setup.py b/setup.py index 1c2018e..0f25d7f 100644 --- a/setup.py +++ b/setup.py @@ -13,4 +13,5 @@ setup( 'Programming Language :: Python', ], license='GNU General Public License v2.0', + install_requires=['requests'], ) From faa1076b43cfba61b842a5ac9d84f5e096ab29b4 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jul 17 2015 10:56:01 +0000 Subject: [PATCH 4/5] Drop un-needed check in the __init__.py --- diff --git a/libpagure/__init__.py b/libpagure/__init__.py index ccda2ef..8f80539 100644 --- a/libpagure/__init__.py +++ b/libpagure/__init__.py @@ -1,8 +1 @@ -try: - import json - import requests -except ImportError: - print("Require module json and requests.") - exit() - from .libpagure import * From 744be0b47e271b4314dd47d52a37da24dad0d2ff Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jul 17 2015 10:58:39 +0000 Subject: [PATCH 5/5] Let requests do the json loading --- diff --git a/libpagure/libpagure.py b/libpagure/libpagure.py index 441a58c..c1ed92b 100644 --- a/libpagure/libpagure.py +++ b/libpagure/libpagure.py @@ -1,5 +1,4 @@ import requests -import json class Pagure: @@ -27,7 +26,7 @@ class Pagure: """ request_url = "{}/api/0/version".format(self.InstanceURL) r = requests.get(request_url, headers=self.Header) - return_value = json.loads(r.text) + return_value = r.json() return return_value['version'] def list_users(self, pattern=None): @@ -41,7 +40,7 @@ class Pagure: r = requests.get(request_url, headers=self.Header) else: r = requests.get(request_url, params={'pattern': pattern}) - return_value = json.loads(r.text) + return_value = r.json() return return_value['users'] def list_tags(self, pattern=None): @@ -58,7 +57,7 @@ class Pagure: r = requests.get(request_url, headers=self.Header) else: r = requests.get(request_url, headers=self.Header, params={'pattern': pattern}) - return_value = json.loads(r.text) + return_value = r.json() return return_value['tags'] def list_groups(self, pattern=None): @@ -72,7 +71,7 @@ class Pagure: r = requests.get(request_url, headers=self.Header) else: r = requests.get(request_url, headers=self.Header, params={'pattern': pattern}) - return_value = json.loads(r.text) + return_value = r.json() return return_value['groups'] def error_codes(self): @@ -82,7 +81,7 @@ class Pagure: """ request_url = "{}/api/0/error_codes" r = requests.get(request_url, headers=self.Header) - return_value = json.loads(r.text) + return_value = r.json() return return_value def list_requests(self, status=None, assignee=None, author=None): @@ -106,7 +105,7 @@ class Pagure: if author is not None: payload['author'] = author r = requests.get(request_url, headers=self.Header, params=payload) - return_value = json.loads(r.text) + return_value = r.json() return return_value['requests'] def request_info(self, request_id): @@ -121,7 +120,7 @@ class Pagure: request_url = "{}/api/0/fork/{}/{}/pull-request/{}".format(self.InstanceURL, self.ForkUsername, self.Repository, request_id) r = requests.get(request_url, headers=self.Header) - return_value = json.loads(r.text) + return_value = r.json() return return_value def merge_request(self, request_id): @@ -136,7 +135,7 @@ class Pagure: request_url = "{}/api/0/fork/{}/{}/pull-request/{}/merge".format(self.InstanceURL, self.ForkUsername, self.Repository, request_id) r = requests.post(request_url, headers=self.Header) - return_value = json.loads(r.text) + return_value = r.json() if return_value['message'] == "Changes merged!": result = (True, return_value['message']) else: @@ -155,7 +154,7 @@ class Pagure: request_url = "{}/api/0/fork/{}/{}/pull-request/{}/close".format(self.InstanceURL, self.ForkUsername, self.Repository, request_id) r = requests.post(request_url, headers=self.Header) - return_value = json.loads(r.text) + return_value = r.json() if return_value['message'] == "Pull-request closed!": result = (True, return_value['message']) else: @@ -185,7 +184,7 @@ class Pagure: if row is not None: payload['row'] = row r = requests.post(request_url, data=payload, headers=self.Header) - return_value = json.loads(r.text) + return_value = r.json() if return_value['message'] == "Comment added": result = (True, return_value['message']) else: @@ -215,7 +214,7 @@ class Pagure: if uid is not None: payload['uid'] = uid r = requests.post(request_url, data=payload, headers=self.Header) - return_value = json.loads(r.text) + return_value = r.json() if return_value['message'] == "Flag added" or return_value['message'] == "Flag updated": result = (True, return_value['message']) else: @@ -238,7 +237,7 @@ class Pagure: if private is not None: payload['private'] = private r = requests.post(request_url, data=payload, headers=self.Header) - return_value = json.loads(r.text) + return_value = r.json() if return_value['message'] == "Issue created": result = (True, return_value['message']) else: @@ -268,7 +267,7 @@ class Pagure: if author is not None: payload['author'] = author r = requests.get(request_url, params=payload, headers=self.Header) - return_value = json.loads(r.text) + return_value = r.json() return return_value['issues'] def issue_info(self, issue_id): @@ -282,7 +281,7 @@ class Pagure: else: request_url = "{}/api/0/fork/{}/{}/issue/{}".format(self.InstanceURL, self.ForkUsername, self.Repository, issue_id) r = requests.get(request_url, headers=self.Header) - return_value = json.loads(r.text) + return_value = r.json() return return_value def get_list_comment(self, issue_id, comment_id): @@ -299,7 +298,7 @@ class Pagure: request_url = "{}/api/0/fork/{}/{}/issue/{}/comment/{}".format(self.InstanceURL, self.ForkUsername, self.Repository, issue_id, comment_id) r = requests.get(request_url, headers=self.Header) - return_value = json.loads(r.text) + return_value = r.json() return return_value def change_issue_status(self, issue_id, new_status): @@ -316,7 +315,7 @@ class Pagure: self.Repository, issue_id) payload = {'status': new_status} r = requests.post(request_url, data=payload, headers=self.Header) - return_value = json.loads(r.text) + return_value = r.json() if return_value['message'].startswith("Successfully"): result = (True, return_value['message']) else: @@ -337,7 +336,7 @@ class Pagure: self.Repository, issue_id) payload = {'comment': body} r = requests.post(request_url, data=payload, headers=self.Header) - return_value = json.loads(r.text) + return_value = r.json() if return_value['message'] == 'Comment added': result = (True, return_value['message']) else: @@ -354,7 +353,7 @@ class Pagure: else: request_url = "{}/api/0/fork/{}/{}/git/tags".format(self.InstanceURL, self.ForkUsername, self.Repository) r = requests.get(request_url, headers=self.Header) - return_value = json.loads(r.text) + return_value = r.json() return return_value['tags'] def list_projects(self, tags=None, username=None, fork=None): @@ -374,7 +373,7 @@ class Pagure: if fork is not None: payload['fork'] = fork r = requests.get(request_url, params=payload, headers=self.Header) - return_value = json.loads(r.text) + return_value = r.json() return return_value['projects'] def user_info(self, username): @@ -385,5 +384,5 @@ class Pagure: """ request_url = "{}/api/0/user/{}".format(self.InstanceURL, username) r = requests.get(request_url, headers=self.Header) - return_value = json.loads(r.text) + return_value = r.json() return return_value