diff --git a/.gitignore b/.gitignore index ced8d90..c8671e5 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,7 @@ Icon ### Added by etg setenv + +### Added by ndm +venv +.idea \ No newline at end of file diff --git a/README.md b/README.md index e871e73..179d955 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,7 @@ ToopherPython is a Toopher API library that simplifies the task of interfacing w focus on just using the API. ### Python Version -* 2.6 -* 2.7 +* 3.6 ### Documentation Make sure you visit [https://dev.toopher.com](https://dev.toopher.com) to get acquainted with the Toopher API fundamentals. The documentation there will tell you the details about the operations this API wrapper library provides. @@ -102,4 +101,4 @@ $ nosetests test ``` ## License -ToopherPython is licensed under the MIT License. See LICENSE.txt for the full text. \ No newline at end of file +ToopherPython is licensed under the MIT License. See LICENSE.txt for the full text. diff --git a/toopher/__init__.py b/toopher/__init__.py index 9b60342..4a439d3 100644 --- a/toopher/__init__.py +++ b/toopher/__init__.py @@ -1,2 +1,2 @@ -from toopher_api import * -from toopher_iframe import * +from .toopher_api import * +from .toopher_iframe import * diff --git a/toopher/toopher_iframe.py b/toopher/toopher_iframe.py index 5721e0b..2c37829 100644 --- a/toopher/toopher_iframe.py +++ b/toopher/toopher_iframe.py @@ -1,12 +1,12 @@ from oauthlib import oauth1 import urllib -import urlparse +from urllib.parse import urlparse import hashlib import hmac import base64 import time import logging -from toopher_api import * +from .toopher_api import * DEFAULT_BASE_URL = 'https://api.toopher.com/v1' DEFAULT_IFRAME_TTL = 300