10000 use six to detect python version · ryanhorn/twilio-python@ab61071 · GitHub
[go: up one dir, main page]
Skip to content

Commit ab61071

Browse files
gbingbin
committed
use six to detect python version
1 parent a48af1a commit ab61071

13 files changed

+55
-59
lines changed

‎tests/test_applications.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
1-
import sys
2-
if sys.version_info < (2, 7):
3-
import unittest2 as unittest
4-
else:
1+
import six
2+
if six.PY3:
53
import unittest
4+
else:
5+
import unittest2 as unittest
66

77
from mock import Mock
8-
#from twilio import TwilioException
9-
#from twilio.rest.resources import Application
108
from twilio.rest.resources import Applications
119

1210

1311
class ApplicationsTest(unittest.TestCase):
14-
1512
def setUp(self):
1613
self.parent = Mock()
1714
self.resource = Applications("http://api.twilio.com", ("user", "pass"))

‎tests/test_authorized_connect_apps.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from __future__ import with_statement
2-
import sys
3-
if sys.version_info < (2, 7):
4-
import unittest2 as unittest
5-
else:
2+
import six
3+
if six.PY3:
64
import unittest
5+
else:
6+
import unittest2 as unittest
77

88
from mock import Mock, patch
99
from twilio.rest.resources import AuthorizedConnectApps

‎tests/test_available_phonenumber.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
from __future__ import with_statement
2-
import sys
3-
if sys.version_info < (2, 7):
4-
import unittest2 as unittest
5-
else:
2+
3+
import six
4+
if six.PY3:
65
import unittest
6+
else:
7+
import unittest2 as unittest
8+
79
from mock import Mock
810
from twilio import TwilioException
911
from twilio.rest.resources import AvailablePhoneNumber

‎tests/test_base_resource.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
# -*- coding: utf-8 -*-
22
from __future__ import with_statement
3-
import sys
4-
5-
if sys.version_info < (2, 7):
6-
import unittest2 as unittest
7-
else:
3+
import six
4+
if six.PY3:
85
import unittest
6+
else:
7+
import unittest2 as unittest
98

109
from mock import Mock, patch
1110
from nose.tools import assert_equals

‎tests/test_client.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import sys
2-
if sys.version_info < (2, 7):
3-
import unittest2 as unittest
4-
else:
1+
import six
2+
if six.PY3:
53
import unittest
4+
else:
5+
import unittest2 as unittest
66

77
from twilio.rest import TwilioRestClient, resources
88
from mock import patch, Mock

‎tests/test_conferences.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import sys
2-
if sys.version_info < (2, 7):
3-
import unittest2 as unittest
4-
else:
1+
import six
2+
if six.PY3:
53
import unittest
4+
else:
5+
import unittest2 as unittest
6+
67
from datetime import date
78
from mock import patch, Mock
89
from twilio.rest.resources import Conferences

‎tests/test_connect_apps.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from __future__ import with_statement
2-
import sys
3-
if sys.version_info < (2, 7):
4-
import unittest2 as unittest
5-
else:
2+
import six
3+
if six.PY3:
64
import unittest
5+
else:
6+
import unittest2 as unittest
77

88
from mock import Mock, patch
99
from twilio.rest.resources import ConnectApps

‎tests/test_core.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import sys
2-
if sys.version_info < (2, 7):
3-
import unittest2 as unittest
4-
else:
1+
import six
2+
if six.PY3:
53
import unittest
4+
else:
5+
import unittest2 as unittest
66
from datetime import datetime
77
from datetime import date
88
from twilio.rest.resources import parse_date

‎tests/test_jwt.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import time
22
from twilio import jwt
3-
import sys
4-
if sys.version_info < (2, 7):
5-
import unittest2 as unittest
6-
else:
3+
import six
4+
if six.PY3:
75
import unittest
6+
else:
7+
import unittest2 as unittest
88

99
from twilio.util import TwilioCapability
1010

‎tests/test_phone_numbers.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
import json
44
except ImportError:
55
import simplejson as json
6-
import sys
7-
if sys.version_info < (2, 7):
8-
import unittest2 as unittest
9-
else:
6+
import six
7+
if six.PY3:
108
import unittest
9+
else:
10+
import unittest2 as unittest
1111
from mock import Mock, patch
1212
from twilio import TwilioException
1313
from twilio.rest.resources import PhoneNumbers

0 commit comments

Comments
 (0)
0