10000 Import unittest2 when needed · skyl/twilio-python@99067c9 · GitHub
[go: up one dir, main page]
Skip to content

Commit 99067c9

Browse files
kyleconroykyleconroy
committed
Import unittest2 when needed
1 parent ec03a17 commit 99067c9

15 files changed

+67
-13
lines changed

‎requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ httplib2
44
nose
55
pyjwt
66
simplejson
7+
unittest2

‎tests/test_applications.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
import unittest
1+
import sys
2+
if sys.version_info < (2, 7):
3+
import unittest2 as unittest
4+
else:
5+
import unittest
26
from mock import Mock
37
from twilio import TwilioException
48
from twilio.rest.resources import Application

‎tests/test_authorized_connect_apps.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
from __future__ import with_statement
2-
import unittest
2+
import sys
3+
if sys.version_info < (2, 7):
4+
import unittest2 as unittest
5+
else:
6+
import unittest
37
from mock import Mock, patch
48
from twilio import TwilioException
59
from twilio.rest.resources import AuthorizedConnectApps

‎tests/test_available_phonenumber.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
from __future__ import with_statement
2-
import unittest
2+
import sys
3+
if sys.version_info < (2, 7):
4+
import unittest2 as unittest
5+
else:
6+
import unittest
37
from mock import Mock
48
from twilio import TwilioException
59
from twilio.rest.resources import AvailablePhoneNumber

‎tests/test_base_resource.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
"""
22
Test the base Resource class
33
"""
4-
import unittest
4+
import sys
5+
if sys.version_info < (2, 7):
6+
import unittest2 as unittest
7+
else:
8+
import unittest
59
from mock import Mock
610
from nose.tools import assert_equals
711
from nose.tools import raises

‎tests/test_client.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
import unittest
1+
import sys
2+
if sys.version_info < (2, 7):
3+
import unittest2 as unittest
4+
else:
5+
import unittest
26
from twilio.rest import TwilioRestClient
37
from twilio.rest import resources
48
from mock import patch, Mock

‎tests/test_conferences.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
import unittest
1+
import sys
2+
if sys.version_info < (2, 7):
3+
import unittest2 as unittest
4+
else:
5+
import unittest
26
from datetime import date
37
from mock import patch, Mock
48
from twilio.rest.resources import Conferences

‎tests/test_connect_apps.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
from __future__ import with_statement
2-
import unittest
2+
import sys
3+
if sys.version_info < (2, 7):
4+
import unittest2 as unittest
5+
else:
6+
import unittest
37
from mock import Mock, patch
48
from twilio import TwilioException
59
from twilio.rest.resources import ConnectApps

‎tests/test_core.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
import unittest
1+
import sys
2+
if sys.version_info < (2, 7):
3+
import unittest2 as unittest
4+
else:
5+
import unittest
26
from datetime import datetime
37
from datetime import date
48
from twilio.rest.resources import parse_date

‎tests/test_jwt.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
import jwt
2-
import unittest
2+
import sys
3+
if sys.version_info < (2, 7):
4+
import unittest2 as unittest
5+
else:
6+
import unittest
37
import urllib
48
from twilio.util import TwilioCapability
59

0 commit comments

Comments
 (0)
0