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/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): diff --git a/requirements b/requirements index 22bb9a7..151ad22 100644 --- a/requirements +++ b/requirements @@ -1,5 +1,2 @@ -HNComments==0.1.1 -argparse==1.2.1 -mock==1.0.1 -requests==1.0.4 -wsgiref==0.1.2 +mock>=1.0.1 +requests>=2.28 diff --git a/setup.py b/setup.py index a257e02..941d632 100644 --- a/setup.py +++ b/setup.py @@ -6,15 +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==1.0.4", - "wsgiref==0.1.2", + "requests==2.28", ], )