Merge master

README.md

@@ -18,7 +18,7 @@ avoid namespace collisions and to have more consistency with Pinax.
 
 ## Pinax
 
-Pinax is an open-source platform built on the Django Web Framework. It is an ecosystem of reusable Django apps, themes, and starter project templates.
+Pinax is an open-source platform built on the Django Web Framework. It is an ecosystem of reusable Django apps and starter project templates.
 This collection can be found at http://pinaxproject.com.
 
 This app was developed as part of the Pinax ecosystem but is just a Django app and can be used independently of other Pinax apps.

pinax/stripe/tests/test_models.py

@@ -61,12 +61,6 @@ def test_plan_str_jpy(self):
         p = Plan(amount=decimal.Decimal("5"), name="My Plan", currency="jpy", interval="monthly", interval_count=1)
         self.assertTrue(u"\u00a5" in _str(p))
 
-    def test_plan_per_account(self):
-        Plan.objects.create(stripe_id="plan", amount=decimal.Decimal("100"), interval="monthly", interval_count=1)
-        account = Account.objects.create(stripe_id="acct_A")
-        Plan.objects.create(stripe_id="plan", stripe_account=account, amount=decimal.Decimal("100"), interval="monthly", interval_count=1)
-        self.assertEquals(Plan.objects.count(), 2)
-
     @patch("stripe.Plan.retrieve")
     def test_plan_stripe_plan(self, RetrieveMock):
         c = Plan(stripe_id="plan")
@@ -81,6 +75,12 @@ def test_plan_stripe_plan_with_account(self, RetrieveMock):
         self.assertTrue(RetrieveMock.call_args_list, [
             call("plan", stripe_account="acct_A")])
 
+    def test_plan_per_account(self):
+        Plan.objects.create(stripe_id="plan", amount=decimal.Decimal("100"), interval="monthly", interval_count=1)
+        account = Account.objects.create(stripe_id="acct_A")
+        Plan.objects.create(stripe_id="plan", stripe_account=account, amount=decimal.Decimal("100"), interval="monthly", interval_count=1)
+        self.assertEquals(Plan.objects.count(), 2)
+
     def test_event_processing_exception_str(self):
         e = EventProcessingException(data="hello", message="hi there", traceback="fake")
         self.assertTrue("Event=" in str(e))