merge master

Doug Black · Doug Black · commit e15b80b22f45 · 2013-09-14T17:53:25.000-07:00
diff --git a/twilio/rest/resources/base.py b/twilio/rest/resources/base.py
@@ -244,7 +244,7 @@ def delete_instance(self):
         return self.parent.delete(self.name)
 
     def __str__(self):
-        return "<{} {}>".format(self.__class__.__name__, self.name[0:5])
+        return "<{0} {1}>".format(self.__class__.__name__, self.name[0:5])
 
 
 class ListResource(Resource):
@@ -402,6 +402,7 @@ def load_instance(self, data):
 
     def __str__(self):
         return '<{} ({})>'.format(self.__class__.__name__, self.count())
+        return '<{0} ({1})>'.format(self.__class__.__name__, self.count())
 
     def list(self, **kw):
         """Query the list resource for a list of InstanceResources.
