Merge branch 'master' of github.com:twilio/twilio-python into call-feedback

Doug Black · Doug Black · commit 4db8dfc1c9f8 · 2014-03-27T17:19:55.000-07:00
diff --git a/setup.py b/setup.py
@@ -1,3 +1,4 @@
+from __future__ import with_statement
 import sys
 from setuptools import setup, find_packages
 
diff --git a/tests/test_phone_numbers.py b/tests/test_phone_numbers.py
@@ -1,3 +1,4 @@
+from __future__ import with_statement
 import json
 import unittest
 
diff --git a/tests/test_rest.py.inactive b/tests/test_rest.py.inactive
@@ -1,3 +1,4 @@
+from __future__ import with_statement
 import json
 import os
 import unittest
diff --git a/tests/test_twiml.py b/tests/test_twiml.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import with_statement
 import unittest
 import xml.etree.ElementTree as ET
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+from __future__ import with_statement`
`1`	`2`	`import sys`
`2`	`3`	`from setuptools import setup, find_packages`
`3`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+from __future__ import with_statement`
`1`	`2`	`import json`
`2`	`3`	`import unittest`
`3`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`# -- coding: utf-8 --`
	`2`	`+from __future__ import with_statement`
`2`	`3`	`import unittest`
`3`	`4`	`import xml.etree.ElementTree as ET`
`4`	`5`