From c7c6bae92e89c03eae0b7fffc72d8b00e2ed9be5 Mon Sep 17 00:00:00 2001 From: d3m0nz Date: Fri, 5 Apr 2024 11:46:41 -0400 Subject: [PATCH 1/4] Update client.py Updated to Python 3 --- client.py | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/client.py b/client.py index 8d0a2e3..abc57b7 100644 --- a/client.py +++ b/client.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- # Copyright (c) 2013 Gustavo Hoirisch -import urllib2 -from urllib import quote_plus +import urllib +from urllib.parse import quote_plus +import urllib.request try: import json except ImportError: @@ -47,16 +48,16 @@ def devMode(self, flag): def build_url(self, method='caps', params={}): parameters = '' - for p, v in params.iteritems(): + for p, v in params.items(): parameters += '&%s=%s' % (p, quote_plus(v)) if self.json: parameters += '&o=json' - url = 'http://%s/api?t=%s%s&apikey=%s' % (self.url, method, parameters, self.api) + url = 'https://%s/api?t=%s%s&apikey=%s' % (self.url, method, parameters, self.api) if self.dev: - print url + print (url) return url @@ -64,13 +65,13 @@ def query(self, url): result = '{}' try: hdr = {'User-Agent': 'Mozilla/5.0'} - r = urllib2.Request(url, headers=hdr) - result = urllib2.urlopen(r).read() - except Exception, e: + r = urllib.request.Request(url, headers=hdr) + result = urllib.request.urlopen(r).read() + except Exception as e: raise e if self.dev: - print result + print (result) if self.json: result = json.loads(result) @@ -106,7 +107,7 @@ def search(self, **extras): offset=50 The 0 based query offset defining which part of the response we want. """ params = {} - for key, value in extras.iteritems(): + for key, value in extras.items(): params[key] = value return self.query(self.build_url('search', params)) @@ -126,9 +127,9 @@ def tv(self, **extras): offset=50 The 0 based query offset defining which part of the response we want. """ params = {} - for key, value in extras.iteritems(): + for key, value in extras.items(): params[key] = value - print '%s = %s' % (key, value) + print ('%s = %s' % (key, value)) return self.query(self.build_url('tvsearch', params)) @@ -146,9 +147,9 @@ def movie(self, **extras): offset=50 The 0 based query offset defining which part of the response we want. """ params = {} - for key, value in extras.iteritems(): + for key, value in extras.items(): params[key] = value - print '%s = %s' % (key, value) + print ('%s = %s' % (key, value)) return self.query(self.build_url('movie', params)) @@ -169,9 +170,9 @@ def music(self, **extras): offset=50 The 0 based query offset defining which part of the response we want. """ params = {} - for key, value in extras.iteritems(): + for key, value in extras.items(): params[key] = value - print '%s = %s' % (key, value) + print ('%s = %s' % (key, value)) return self.query(self.build_url('music', params)) @@ -187,9 +188,9 @@ def book(self, **extras): offset=50 The 0 based query offset defining which part of the response we want. """ params = {} - for key, value in extras.iteritems(): + for key, value in extras.items(): params[key] = value - print '%s = %s' % (key, value) + print ('%s = %s' % (key, value)) return self.query(self.build_url('book', params)) From d91147187b9fd2f0c5b70b6c15a0e6fb95085ced Mon Sep 17 00:00:00 2001 From: d3m0nz Date: Fri, 5 Apr 2024 11:57:18 -0400 Subject: [PATCH 2/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7ffe83a..85ae1e1 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ #Newznab Python Wrapper - +UPDATED TO PYTHON 3 * **Author**: [Gustavo Hoirisch](https://github.com/gugahoi) Simple python wrapper for NewzNab API calls. From 2a3308b3baa31d38a27e96a779c75a7fd5384dd4 Mon Sep 17 00:00:00 2001 From: d3m0nz Date: Fri, 5 Apr 2024 11:58:53 -0400 Subject: [PATCH 3/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 85ae1e1..c7f8a29 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ #Newznab Python Wrapper -UPDATED TO PYTHON 3 +UPDATED TO WORK WITH PYTHON 3 * **Author**: [Gustavo Hoirisch](https://github.com/gugahoi) Simple python wrapper for NewzNab API calls. From fc053fdcda91e9a70713a04a6f1d63d9b71e344b Mon Sep 17 00:00:00 2001 From: d3m0nz Date: Fri, 5 Apr 2024 12:04:14 -0400 Subject: [PATCH 4/4] Update README.md --- README.md | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index c7f8a29..8935245 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,18 @@ -#Newznab Python Wrapper -UPDATED TO WORK WITH PYTHON 3 -* **Author**: [Gustavo Hoirisch](https://github.com/gugahoi) +# Newznab Python Wrapper Simple python wrapper for NewzNab API calls. -At the moment it does everything through json. - -##Usage +At the moment it does everything through json. + + +--- +### Usage from client import wrapper c = wrapper("my_url.com", "my_api_goes_here") result = c.search(q="my query", maxage="20") categories = c.categories() + +--- + +Credits +* **Author**: [Gustavo Hoirisch](https://github.com/gugahoi)