From 9a2afe2c5448c511cf058f02d01482ba90412698 Mon Sep 17 00:00:00 2001 From: Paul Hallett Date: Thu, 28 Aug 2014 10:42:44 +0100 Subject: [PATCH 1/2] Fix #179 Add exceptions to __init__.py for backwards compatibility. --- twilio/__init__.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/twilio/__init__.py b/twilio/__init__.py index f75cb4d39b..49684b6f31 100644 --- a/twilio/__init__.py +++ b/twilio/__init__.py @@ -5,3 +5,7 @@ # Backwards compatibility. from .version import __version__, __version_info__ + +from exceptions import TwilioException, TwimlException + +from rest.exceptions import TwilioRestException From 21217183e5e3b1919ac20606e6d12c0c28e415db Mon Sep 17 00:00:00 2001 From: Paul Hallett Date: Mon, 29 Sep 2014 16:09:17 +0100 Subject: [PATCH 2/2] Fix Python3 compatibility --- .gitignore | 2 +- twilio/__init__.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 37b67c2e65..da3952e5d3 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,7 @@ develop-eggs .installed.cfg scratch env -venv +venv* # Installer logs pip-log.txt diff --git a/twilio/__init__.py b/twilio/__init__.py index 49684b6f31..b35df5e5ae 100644 --- a/twilio/__init__.py +++ b/twilio/__init__.py @@ -6,6 +6,6 @@ # Backwards compatibility. from .version import __version__, __version_info__ -from exceptions import TwilioException, TwimlException +from .exceptions import TwilioException, TwimlException -from rest.exceptions import TwilioRestException +from .rest.exceptions import TwilioRestException