Skip to content

Added Python3 support #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
JenkinsDev wants to merge 1 commit into from
Closed

Added Python3 support #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
*.swp
*.egg-info
dist
build
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ python setup.py install
```

## Requirements
* oauth2
* requests-oauthlib

## Getting Started

Expand Down
2 changes: 1 addition & 1 deletion README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ To install the latest source from the repository
Requirements
------------

- oauth2
- requests-oauthlib

Getting Started
---------------
Expand Down
15 changes: 11 additions & 4 deletions semantics3/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
__all__ = ['categories', 'offers', 'products', 'semantics3', 'error']
from semantics3 import Semantics3Request
from categories import Categories
from offers import Offers
from products import Products

try:
from .semantics3 import Semantics3Request
from .categories import Categories
from .offers import Offers
from .products import Products
except ImportError:
from semantics3 import Semantics3Request
from categories import Categories
from offers import Offers
from products import Products
6 changes: 4 additions & 2 deletions semantics3/categories.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
from semantics3 import Semantics3Request

try:
from .semantics3 import Semantics3Request
except ImportError:
from semantics3 import Semantics3Request

class Categories(Semantics3Request):
def __init__(self, api_key, api_secret):
Expand Down
6 changes: 4 additions & 2 deletions semantics3/offers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
from semantics3 import Semantics3Request

try:
from .semantics3 import Semantics3Request
except ImportError:
from semantics3 import Semantics3Request

class Offers(Semantics3Request):
def __init__(self, api_key, api_secret):
Expand Down
5 changes: 4 additions & 1 deletion semantics3/products.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
from semantics3 import Semantics3Request
try:
from .semantics3 import Semantics3Request
except ImportError:
from semantics3 import Semantics3Request


class Products(Semantics3Request):
Expand Down
30 changes: 20 additions & 10 deletions semantics3/semantics3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
import json
import oauth2 as oauth
import urllib
from error import Semantics3Error
from requests_oauthlib import OAuth1Session

try:
import urllib.parse as urllib
except ImportError:
import urllib

try:
from .error import Semantics3Error
except ImportError:
from error import Semantics3Error


API_DOMAIN = 'api.semantics3.com'
API_BASE = 'https://' + API_DOMAIN + '/v1/'


class Semantics3Request:

def __init__(self, api_key=None, api_secret=None, endpoint=None):
if api_key is None:
raise Semantics3Error(
Expand All @@ -24,17 +34,15 @@ def __init__(self, api_key=None, api_secret=None, endpoint=None):
self.api_key = api_key
self.api_secret = api_secret
self.endpoint = endpoint
self.consumer = oauth.Consumer(api_key, api_secret)
self.access_token = oauth.Token('', '')
self.client = oauth.Client(self.consumer, self.access_token)
self.oauth = OAuth1Session(api_key, client_secret=api_secret)
self.data_query = {}
self.query_result = None
self.cache_size = 10

def fetch(self, endpoint, params):
api_endpoint = API_BASE + endpoint + '?' +\
urllib.urlencode({'q': params})
resp, content = self.client.request(api_endpoint, 'GET')
urllib.urlencode({'q': params})
content = self.oauth.get(api_endpoint)
return content

def remove(self, endpoint, *fields):
Expand Down Expand Up @@ -96,7 +104,8 @@ def iter(self):
self.run_query()

def query(self, endpoint, **kwargs):
return json.loads(self.fetch(endpoint, json.dumps(kwargs)))
content = self.fetch(endpoint, json.dumps(kwargs)).content.decode('utf-8')
return json.loads(content)

def run_query(self, endpoint=None):
endpoint = endpoint or self.endpoint
Expand All @@ -108,9 +117,10 @@ def run_query(self, endpoint=None):
endpoint,
**query
)

if self.query_result['code'] != 'OK':
raise Semantics3Error(self.query_result['code'],
self.query_result['message'])
self.query_result['message'])

def get(self, endpoint=None):
self.run_query(endpoint)
Expand Down
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
from distutils.core import setup

install_requires = [
'oauth2 >= 1.5.211',
'requests-oauthlib >= 0.4.0'
]


def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname)).read()
setup(
name="semantics3",
version="0.0.1",
version="0.0.2",
author="Shawn Tan",
author_email="[email protected]",
description=("Semantics3 Products API"),
Expand Down