From 2ff1cff90473e779affc98656822a04a757ef3e7 Mon Sep 17 00:00:00 2001 From: "David V. Lu" Date: Sat, 22 Feb 2020 21:14:47 -0500 Subject: [PATCH 1/6] Python3 compat --- pocketpy/pocket.py | 12 ++++++------ pocketpy/tags.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pocketpy/pocket.py b/pocketpy/pocket.py index d15efc8..55aab11 100644 --- a/pocketpy/pocket.py +++ b/pocketpy/pocket.py @@ -12,8 +12,8 @@ def retrieve(config, verbose=False): config["detailType"] = 'complete' response = requests.get(RETRIEVE_URL, params=config) if response.status_code not in range(200, 299): - print "Returned Status Code %d: %s" % (response.status_code, - response.content) + print("Returned Status Code %d: %s" % (response.status_code, + response.content)) sys.exit(1) items = response.json()['list'] return items @@ -27,8 +27,8 @@ def modify(config): payload = json.dumps(config) response = requests.post(SEND_URL, headers=headers, data=payload) if response.status_code not in range(200, 299): - print "Returned Status Code %d: %s" % (response.status_code, - response.content) + print("Returned Status Code %d: %s" % (response.status_code, + response.content)) sys.exit(1) return response @@ -40,7 +40,7 @@ def add(config): payload = json.dumps(config) response = requests.post(ADD_URL, headers=headers, data=payload) if response.status_code != 200: - print "Returned Status Code %d: %s" % (response.status_code, - response.content) + print("Returned Status Code %d: %s" % (response.status_code, + response.content)) sys.exit(1) return response diff --git a/pocketpy/tags.py b/pocketpy/tags.py index 6316491..e5740bd 100644 --- a/pocketpy/tags.py +++ b/pocketpy/tags.py @@ -1,4 +1,4 @@ -from pocket import modify +from .pocket import modify def tag_action(config, item_ids, tags, action): From a304bae81b1f693ff7dc65bc067ac166da360746 Mon Sep 17 00:00:00 2001 From: "David V. Lu" Date: Mon, 14 Sep 2020 16:49:44 -0400 Subject: [PATCH 2/6] Update requirements - wsgiref is a default python3 library now --- requirements | 1 - setup.py | 1 - 2 files changed, 2 deletions(-) diff --git a/requirements b/requirements index 22bb9a7..5ce87b0 100644 --- a/requirements +++ b/requirements @@ -2,4 +2,3 @@ HNComments==0.1.1 argparse==1.2.1 mock==1.0.1 requests==1.0.4 -wsgiref==0.1.2 diff --git a/setup.py b/setup.py index a257e02..8dbcb7e 100644 --- a/setup.py +++ b/setup.py @@ -15,6 +15,5 @@ "HNComments==0.1.1", "argparse==1.2.1", "requests==1.0.4", - "wsgiref==0.1.2", ], ) From 00f7f46696595172364a5c97e998f65e3e095049 Mon Sep 17 00:00:00 2001 From: "David V. Lu" Date: Mon, 14 Sep 2020 16:56:04 -0400 Subject: [PATCH 3/6] Update requests version --- requirements | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements b/requirements index 5ce87b0..f947133 100644 --- a/requirements +++ b/requirements @@ -1,4 +1,4 @@ HNComments==0.1.1 argparse==1.2.1 mock==1.0.1 -requests==1.0.4 +requests==2.18 diff --git a/setup.py b/setup.py index 8dbcb7e..7bb8ec2 100644 --- a/setup.py +++ b/setup.py @@ -14,6 +14,6 @@ install_requires=[ "HNComments==0.1.1", "argparse==1.2.1", - "requests==1.0.4", + "requests==2.18", ], ) From e68f028e372b294f1d8ae8eba38b3aa24e5e14dd Mon Sep 17 00:00:00 2001 From: "David V. Lu" Date: Mon, 17 Oct 2022 14:07:10 -0400 Subject: [PATCH 4/6] Remove dependencies --- bin/comments_apply.py | 44 ------------------------------------------- requirements | 2 -- setup.py | 4 +--- 3 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 bin/comments_apply.py diff --git a/bin/comments_apply.py b/bin/comments_apply.py deleted file mode 100644 index f07dec7..0000000 --- a/bin/comments_apply.py +++ /dev/null @@ -1,44 +0,0 @@ -import copy - -from optparse import OptionParser -from pocketpy.auth import auth -from hncomments import utils - -from pocketpy.pocket import retrieve, add -from pocketpy.tags import has_tag, remove_tags - -def find_items_with_comments_tag(items): - uids = [] - - for uid, item in items.iteritems(): - if has_tag(item, "comments"): - uids.append((uid, item.get('given_url', ''))) - - return uids - - -def find_and_add_hn_urls(credentials, comment_items): - config = copy.deepcopy(credentials) - - for uid, url in comment_items: - hn_url = utils.get_hn_comments_url(url) - if hn_url: - config["url"] = hn_url - add(config) - uids = [uid for uid, url in comment_items] - remove_tags(credentials, uids, ["comments"]) - - -if __name__ == "__main__": - parser = OptionParser() - parser.add_option('--key', dest='key', - help='pocket apps consumer key') - (options, args) = parser.parse_args() - - config = auth(options) - credentials = copy.deepcopy(config) - # retrieve items - items = retrieve(config, verbose=True) - - comment_items = find_items_with_comments_tag(items) - comment_urls = find_and_add_hn_urls(credentials, comment_items) diff --git a/requirements b/requirements index f947133..6ff133c 100644 --- a/requirements +++ b/requirements @@ -1,4 +1,2 @@ -HNComments==0.1.1 -argparse==1.2.1 mock==1.0.1 requests==2.18 diff --git a/setup.py b/setup.py index 7bb8ec2..c1b2289 100644 --- a/setup.py +++ b/setup.py @@ -6,14 +6,12 @@ author='Richard Delaney', author_email='richdel1991@gmail.com', packages=['pocketpy', 'pocketpy.test'], - scripts=['bin/comments_apply.py', 'bin/operators.py', 'bin/pocket_ticker.py'], + scripts=['bin/operators.py', 'bin/pocket_ticker.py'], url='http://pypi.python.org/pypi/PocketPy', license='LICENSE.txt', description='A python wrapper and some scripts for communication with pocket api', long_description=open('README.txt').read(), install_requires=[ - "HNComments==0.1.1", - "argparse==1.2.1", "requests==2.18", ], ) From 4e7fde040389db68936b08e14a100b6eb17ab9fd Mon Sep 17 00:00:00 2001 From: "David V. Lu" Date: Sat, 15 Apr 2023 23:33:51 -0400 Subject: [PATCH 5/6] Bump requests version --- requirements | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements b/requirements index 6ff133c..faf2f79 100644 --- a/requirements +++ b/requirements @@ -1,2 +1,2 @@ mock==1.0.1 -requests==2.18 +requests==2.28 diff --git a/setup.py b/setup.py index c1b2289..941d632 100644 --- a/setup.py +++ b/setup.py @@ -12,6 +12,6 @@ description='A python wrapper and some scripts for communication with pocket api', long_description=open('README.txt').read(), install_requires=[ - "requests==2.18", + "requests==2.28", ], ) From fd58773487d8505dac1eab52cd22b7a496fedadd Mon Sep 17 00:00:00 2001 From: "David V. Lu" Date: Sun, 8 Sep 2024 14:58:53 -0400 Subject: [PATCH 6/6] Greater than or equal to requirements --- requirements | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements b/requirements index faf2f79..151ad22 100644 --- a/requirements +++ b/requirements @@ -1,2 +1,2 @@ -mock==1.0.1 -requests==2.28 +mock>=1.0.1 +requests>=2.28