merge master

Author: Balanced Marshall

.travis.yml

@@ -1,5 +1,6 @@
 language: python
 python:
+  - 2.6
   - 2.7
 install:
   - python setup.py develop

balanced/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.9.12'
+__version__ = '0.10.0'
 from collections import defaultdict
 import contextlib
 

balanced/http_client.py

@@ -34,7 +34,7 @@ def handle_exception(response):
         response.deserialized = deserialized
         extra = deserialized.get('additional') or ''
         if extra:
-            extra = ' -- {}.'.format(extra)
+            extra = ' -- {0}.'.format(extra)
         error_msg = '{name}: {code}: {msg} {extra}'.format(
             name=deserialized['status'],
             code=deserialized['status_code'],
@@ -175,7 +175,7 @@ def deserialize(self, resp):
         try:
             return deserializers[resp.headers['Content-Type']](resp.content)
         except KeyError:
-            raise exc.BalancedError('Invalid content type "{}": {}'.format(
+            raise exc.BalancedError('Invalid content type "{0}": {1}'.format(
                 resp.headers['Content-Type'], resp.content,
             ))
 

balanced/resources.py

@@ -154,7 +154,7 @@ def from_response(cls, uri, **kwargs):
 
     def __repr__(self):
         _resource = _RESOURCES.from_uri(self.uri)
-        return '<Page{}{}>'.format(_resource, self.qs)
+        return '<Page{0}{1}>'.format(_resource, self.qs)
 
     def all(self):
         return list(self)
@@ -164,7 +164,7 @@ def one(self):
 
         if len(ret) == 1:
             return ret[0]
-        elif len(ret) == 0:
+        elif not len(ret):
             raise NoResultFound(
                 'Nothing found for one(). Make sure balanced.configure() '
                 'is invoked with your API key secret')
@@ -241,18 +241,18 @@ def filter(self, *args, **kwargs):
         query_arguments = {}
         for expression in args:
             if not isinstance(expression, FilterExpression):
-                raise ValueError('"{}" is not a FilterExpression'.format(
+                raise ValueError('"{0}" is not a FilterExpression'.format(
                     expression))
             if expression.op == '=':
-                f = '{}'.format(expression.field.name)
+                f = '{0}'.format(expression.field.name)
             else:
-                f = '{}[{}]'.format(expression.field.name, expression.op)
+                f = '{0}[{1}]'.format(expression.field.name, expression.op)
             values = expression.value
             if not isinstance(values, (list, tuple)):
                 values = [values]
             query_arguments[f] = ','.join(str(v) for v in values)
         for k, values in kwargs.iteritems():
-            f = '{}'.format(k)
+            f = '{0}'.format(k)
             if not isinstance(values, (list, tuple)):
                 values = [values]
             v = ','.join(str(v) for v in values)
@@ -265,9 +265,9 @@ def sort(self, *args):
         sorts = []
         for expression in args:
             if not isinstance(expression, SortExpression):
-                raise ValueError('"{}" is not a SortExpression'.format(
+                raise ValueError('"{0}" is not a SortExpression'.format(
                     expression))
-            v = '{},{}'.format(
+            v = '{0},{1}'.format(
                 expression.field.name,
                 'asc' if expression.ascending else 'desc')
             sorts.append(v)
@@ -326,7 +326,7 @@ def delete(self):
 def uri_discovery(resource):
     uri = resource.RESOURCE['collection']
     if resource.RESOURCE['resides_under_marketplace']:
-        uri = '{}/{}'.format(
+        uri = '{0}/{1}'.format(
             Marketplace.my_marketplace.uri,
             resource.RESOURCE['collection']
         )
@@ -434,7 +434,7 @@ def __init__(self, name):
         self.name = name
 
     def __getattr__(self, name):
-        return _ResourceField('{}.{}'.format(self.name, name))
+        return _ResourceField('{0}.{1}'.format(self.name, name))
 
     def asc(self):
         return SortExpression(self, ascending=True)
@@ -1172,11 +1172,11 @@ def __init__(self, field, op, value, inv_op):
 
     def __invert__(self):
         if self.inv_op is None:
-            raise TypeError('"{}" cannot be inverted', self)
+            raise TypeError('"{0}" cannot be inverted', self)
         return FilterExpression(self.field, self.inv_op, self.value, self.op)
 
     def __str__(self):
-        return '{} {} {}'.format(
+        return '{0} {1} {2}'.format(
             self.field.name, self.field.op, self.field.values)
 
 

examples/examples.py

@@ -30,15 +30,15 @@
 # what's my marketplace?
 if not balanced.Marketplace.my_marketplace:
     raise Exception("Marketplace.my_marketplace should not be nil")
-print "what's my marketplace?, easy: Marketplace.my_marketplace: {}".format(
+print "what's my marketplace?, easy: Marketplace.my_marketplace: {0}".format(
     balanced.Marketplace.my_marketplace
 )
 
-print "My marketplace's name is: {}".format(marketplace.name)
+print "My marketplace's name is: {0}".format(marketplace.name)
 print "Changing it to TestFooey"
 marketplace.name = "TestFooey"
 marketplace.save()
-print "My marketplace name is now: {}".format(marketplace.name)
+print "My marketplace name is now: {0}".format(marketplace.name)
 if marketplace.name != 'TestFooey':
     raise Exception("Marketplace name is NOT TestFooey!")
 
@@ -65,7 +65,7 @@
 marketplace = balanced.Marketplace.my_marketplace
 if marketplace.in_escrow != 1500:
     raise Exception("1500 is not in escrow! this is wrong")
-print "i have {} in escrow!".format(marketplace.in_escrow)
+print "i have {0} in escrow!".format(marketplace.in_escrow)
 
 print "cool. now let me refund the full amount"
 refund = debit.refund()  # the full amount!
@@ -115,4 +115,19 @@
 print "invalidating a bank account"
 bank_account.delete()
 
+# a little filtering
+merchants = balanced.Account.query.filter(roles='merchant')
+buyers = balanced.Account.query.filter(roles='buyer')
+print (
+    'we have {0} accounts, {1} with the role "buyer", '
+    'and {2} with the role "merchant"'.format(
+        balanced.Account.query.count(),
+        buyers.count(),
+        merchants.count(),
+    )
+)
+
+print 'here are our merchants: {0}'.format([a.name for a in merchants])
+print 'here are our buyers: {0}'.format([a.name for a in buyers])
+
 print "and there you have it :)"

test-requirements.txt

@@ -2,3 +2,4 @@ nose==1.1.2
 bottle==0.10.9
 nose-setenv
 mock==0.8.0
+unittest2

tests/_responses/marketplaces.py

@@ -57,9 +57,9 @@ def index(limit=10, offset=0, num=1, pages=1):
     items = []
     for _ in xrange(num):
         rand = int(random.random() * 10000)
-        mp_uri = '/v1/marketplaces/TEST-MP-123-456-{}'.format(rand)
+        mp_uri = '/v1/marketplaces/TEST-MP-123-456-{0}'.format(rand)
         rand = int(random.random() * 10000)
-        ac_uri = mp_uri + '/accounts/AC123-456-{}'.format(rand)
+        ac_uri = mp_uri + '/accounts/AC123-456-{0}'.format(rand)
 
         items.append({
             'uri': mp_uri,

tests/acceptance_suite.py

@@ -6,7 +6,7 @@
 import balanced
 import copy
 import requests
-import unittest
+import unittest2 as unittest
 
 from fixtures import cards, merchants, bank_accounts
 

tests/suite.py

@@ -4,8 +4,8 @@
 import mock
 import warnings
 import re
-import unittest
 
+import unittest2 as unittest
 import requests
 
 import balanced

tests/test_balanced.py

@@ -1,4 +1,4 @@
-import unittest
+import unittest2 as unittest
 
 
 class TestBalancedImportStar(unittest.TestCase):