Changeset 46 for trunk

Timestamp:

04/16/08 23:54:32 (4 years ago)

Author:

tim

Message:

In implementing GetAccountActivity?, I decided that the special
cases found in the response parsing code had to go. Although
a small number of special cases do exist in the new code, it
should be much more flexible in processing response documents
from the service.

The price paid is a small change in the attributes available
from the response object.

Location:

trunk/fpys

Files:

• client.py (modified) (2 diffs)
• tests/client_test.py (modified) (11 diffs)
• tests/wsgi_responder.py (modified) (2 diffs)

trunk/fpys/client.py

@@ -23 +23 @@
     return 0
 
-class Token(object):
-    def __init__(self, document=None):
-        if document is not None:
-            document = ET.ElementTree(document)
-        self.document = document
-
-        for name in ['TokenId', 'FriendlyName', 'Status', 
-                     'DateInstalled', 'CallerInstalled',
-                     'CallerReference', 'TokenType',
-                     'OldTokenId']:
-            if document.find(name) is not None:
-                attr_name = name[0].lower() + name[1:]
-                setattr(self, attr_name, document.find(name).text)
-
-        if hasattr(self, 'dateInstalled'):
-            # TODO this is a little less than ideal
-            # we truncate the milliseconds and time zone info
-            di = self.dateInstalled
-            di = di[0:di.find(".")]
-            self.dateInstalled = datetime.strptime(di,
-                                                   "%Y-%m-%dT%H:%M:%S")
-
-class Transaction(object):
-    def __init__(self, transaction_element):
-        for element in transaction_element.getchildren():
-            attr_name = element.tag[0].lower() + element.tag[1:]
-            setattr(self, attr_name, element.text)
-
-class TransactionResponse(object):
-    def __init__(self, id=None, status=None):
-        self.id = id
-        self.status = status
+def attr_name_from_tag(tag_name):
+    # some tag names have an XML namespace that we
+    # aren't really concerned with.  This strips them:
+    tag_name = tag_name[tag_name.find("}")+1:]
+    # Then we lowercase the first letter
+    return tag_name[0].lower() + tag_name[1:]
 
 class FPSResponse(object):
-    def __init__(self, document=None):
-        if document is not None:
-            document = ET.ElementTree(document)
-            log.debug(ET.tostring(document.getroot()))
-        self.document = document
-
-        if document.find("RequestId"):
-            self.requestId = document.find("RequestId").text
-        elif document.find("RequestID"):
-            self.requestId = document.find("RequestID").text
-
-        if document.find("Status") is not None:
-            if document.find("Status").text == "Success":
-                self.success = True
+    def __init__(self, element=None):
+        if element is not None:
+            if isinstance(element, str):
+                element = ET.fromstring(element)
+        self.element = element
+
+        for child in element.getchildren():
+            if len(child.getchildren()) ==0:
+                value = child.text
+                if child.tag.find("Date") >= 0:
+                    # TODO this is a little less than ideal
+                    # we truncate the milliseconds and time zone info
+                    value = value[0:value.find(".")]
+                    value = datetime.strptime(value,
+                                             "%Y-%m-%dT%H:%M:%S")
+                if child.tag == "Amount":
+                    value = float(child.text)
+                if child.tag.find("Size") >= 0:
+                    value = int(child.text)
+                setattr(self, attr_name_from_tag(child.tag), value)
             else:
-                self.success = False
-                self.errors = []
-
-                for error in document.findall("//Errors/Errors"):
-                    err = {}
-                    err['type'] = error.find("ErrorType").text
-                    err['retriable'] = error.find("IsRetriable").text
-                    if err['retriable'] == "False":
-                        err['retriable'] = False
-                    else:
-                        err['retriable'] = True
-                    err['errorCode'] = error.find("ErrorCode").text
-                    err['reason'] = error.find("ReasonText").text
-                    self.errors.append(err)
-
-
-        for name in ['CallerTokenId', 'SenderTokenId', 'RecipientTokenId', 'TokenId',
-                     'PaymentInstruction', 'AccountId', 'TokenFriendlyName', 'RequestId']:
-            if document.find(name) is not None:
-                attr_name = name[0].lower() + name[1:]
-                setattr(self, attr_name, document.find(name).text)
-
-        if document.find("Token"):
-            self.token = Token(document.find("Token"))
-
-        if document.find("Transaction"):
-            self.transaction = Transaction(document.find("Transaction"))
-
-        if document.find("AccountBalance"):
-            self.balances = {}
-            for bal in ['TotalBalance', 'PendingInBalance', 'PendingOutBalance', 
-                        'DisburseBalance', 'RefundBalance']:
-                self.balances[bal] = (float(document.find("//" + bal).find("Amount").text),
-                                      document.find("//" + bal).find("CurrencyCode").text)
-
-        # Hackish at best... 
-        root_tag = document.getroot().tag
-        for tag_name in ["PayResponse", "RefundResponse", "ReserveResponse",
-                         "RetryTransactionResponse", "SettleResponse"]:
-            if self.success and root_tag.find(tag_name) >= 0:
-                self.transaction = TransactionResponse()
-                self.transaction.id = document.find("//TransactionId").text
-                self.transaction.status = document.find("//Status").text
-
+                if child.tag == "Errors" and child.getchildren()[0].tag == "Errors":
+                    self.errors = []
+                    for e in child.getchildren():
+                        self.errors.append(FPSResponse(e))
+                elif child.tag =="Transactions":
+                    if not hasattr(self, "transactions"):
+                        self.transactions = []
+                    self.transactions.append(FPSResponse(child))
+                else:
+                    setattr(self, attr_name_from_tag(child.tag), FPSResponse(child))
+
+        if hasattr(self, "status"):
+            self.success = (self.status == "Success")
+        if hasattr(self, "transactionResponse"):
+            setattr(self, "transaction", self.transactionResponse)
+            delattr(self, "transactionResponse")
 
 class FlexiblePaymentClient(object):
@@ -234 +186 @@
         return self.execute(params)
 
-    def getAccountActivity(self):
-        pass
+    def getAccountActivity(self, start_date, end_date=None,
+                           operation=None, payment_method=None,
+                           max_batch_size=None, response_group="Detail",
+                           sort_order="Descending", role=None,
+                           status=None):
+        params = {'Action': 'GetAccountActivity',
+                  'StartDate': start_date,
+                  'ResponseGroup': response_group,
+                  'SortOrderByDate': sort_order,
+                  }
+        # TODO
+        # these blocks of if statements sprinkled throughout
+        # the client strike me as ugly
+        if end_date is not None:
+            params['EndDate'] = end_date
+        if operation is not None:
+            params['Operation'] = operation
+        if max_batch_size is not None:
+            params['MaxBatchSize'] = max_batch_size
+        if role is not None:
+            params['Role'] = role
+        if status is not None:
+            params['Status'] = status
+
+        return self.execute(params)
 
     def getAccountBalance(self):

trunk/fpys/tests/client_test.py

@@ -46 +46 @@
 def test_getAccountBalance():
     response = fps_client.getAccountBalance()
-    assert 16.5 == response.balances['TotalBalance'][0]
+    assert 16.5 == response.accountBalance.totalBalance.amount
 
 # def test_getDebtBalance():
@@ -78 +78 @@
     assert response.success == False
     assert len(response.errors) == 1
-    assert response.errors[0]['errorCode'] == "DuplicateRequest"
+    assert response.errors[0].errorCode == "DuplicateRequest"
 
 def test_installPaymentInstructionInvalid():
@@ -90 +90 @@
     assert response.success == False
     assert len(response.errors) == 2
-    assert response.errors[0]['reason'].startswith("Parse errors")
+    assert response.errors[0].reasonText.startswith("Parse errors")
 
 
@@ -104 +104 @@
     response = fps_client.cancelToken(token_id)
     assert response.success == False
-    assert response.errors[0]['errorCode'] == "InvalidParams"
+    assert response.errors[0].errorCode == "InvalidParams"
 
 def test_discardResults():
@@ -110 +110 @@
     response = fps_client.discardResults("135AHMQA9H3NEFJL73GQ33873PLPNGLQZP1")
     assert response.success == True
+
+def test_getAccountActivity():
+    response = fps_client.getAccountActivity("2008-04-13")
+    assert response.success == True
+    assert response.responseBatchSize == 8
+    trans = response.transactions[0]
+    assert trans.transactionParts.feePaid.amount == 0.0
+    assert trans.callerTokenId == "Z34XMGF4GCILGV7EV2D45DDO4Q6WXEJZ9175UNR5I9LFEC1H8MMX3R6NBJUJH8MQ"
+    assert trans.operation == "Pay"
+    assert trans.dateReceived.month == 4
 
 def test_getPaymentInstruction():
@@ -144 +154 @@
     response = fps_client.getTokenUsage("Z74XLGQ4GSIKGV2ES2DQ5GDOCQZWXIJV9195JNRZIVLFSC1H84M33RDN3JUGHFM5")
     assert response.success == False
-    assert response.errors[0]['errorCode'] == 'InvalidTokenType'
+    assert response.errors[0].errorCode == 'InvalidTokenType'
 
 def test_getTokenUsageUnrestricted():
@@ -172 +182 @@
                               caller_reference="FPeS Invoice 37")
     assert response.success == True
-    assert response.transaction.id == "133I77HJS56JVM7M54OZIRITRVLUT5F227U"
+    assert response.transaction.transactionId == "133I77HJS56JVM7M54OZIRITRVLUT5F227U"
     assert response.transaction.status == "Initiated"
 
@@ -189 +199 @@
     assert response.success == True
     assert response.transaction.status == "Initiated"
-    assert response.transaction.id == "134P2CRSN5JFN3KDV3RKPKVQ3OG4H67PPR8"
+    assert response.transaction.transactionId == "134P2CRSN5JFN3KDV3RKPKVQ3OG4H67PPR8"
 
 def test_reserve():
@@ -199 +209 @@
     assert response.success == True
     assert response.transaction.status == "Initiated"
-    assert response.transaction.id == "134OLF7MHB2L4V9T54RHADQ9FCK5NLVZHDC"
+    assert response.transaction.transactionId == "134OLF7MHB2L4V9T54RHADQ9FCK5NLVZHDC"
 
 def test_retry():
@@ -211 +221 @@
     assert response.success == False
     assert 1 == len(response.errors)
-    assert response.errors[0]['errorCode'] == 'SettleAmountGreaterThanReserveAmount'
+    assert response.errors[0].errorCode == 'SettleAmountGreaterThanReserveAmount'
 
 def test_settle():
@@ -217 +227 @@
                                  "19.95")
     assert response.success == True
-    assert response.transaction.id == "134OLF7MHB2L4V9T54RHADQ9FCK5NLVZHDC"
-    assert response.transaction.status == "Initiated"
-
-    
+    assert response.transaction.transactionId == "134OLF7MHB2L4V9T54RHADQ9FCK5NLVZHDC"
+    assert response.transaction.status == "Initiated"
+
+

trunk/fpys/tests/wsgi_responder.py

@@ -18 +18 @@
     def DiscardResults(self, environ):
         response = """<ns0:DiscardResultsResponse xmlns:ns0="http://fps.amazonaws.com/doc/2007-01-08/"><Status>Success</Status><RequestId>d80fd512-d5c9-4ee0-90fa-f2af1ac837a2:0</RequestId></ns0:DiscardResultsResponse>"""
+        return [response]
+
+    def GetAccountActivity(self, environ):
+        response = """<ns0:GetAccountActivityResponse xmlns:ns0="http://fps.amazonaws.com/doc/2007-01-08/"><ResponseBatchSize>8</ResponseBatchSize><Transactions><TransactionId>135AHMQA9H3NEFJL73GQ33873PLPNGLQZP1</TransactionId><CallerTransactionDate>2008-04-15T19:43:01.000-07:00</CallerTransactionDate><DateReceived>2008-04-15T19:41:09.000-07:00</DateReceived><DateCompleted>2008-04-15T19:41:10.000-07:00</DateCompleted><TransactionAmount><CurrencyCode>USD</CurrencyCode><Amount>1.000000</Amount></TransactionAmount><Operation>Pay</Operation><Status>Success</Status><ErrorCode /><TransactionParts><AccountId>JMXHWUQJONDR53DM28EHVCGFILGI4RGNX541Z9</AccountId><Role>Recipient</Role><Name>Timothy P. Freund</Name><Reference /><Description /><FeePaid><CurrencyCode>USD</CurrencyCode><Amount>0.100000</Amount></FeePaid></TransactionParts><TransactionParts><AccountId>JMXHWUQJONDR53DM28EHVCGFILGI4RGNX541Z9</AccountId><Role>Caller</Role><Name>Timothy P. Freund</Name><Reference>FPeS Invoice #10</Reference><Description /><FeePaid><CurrencyCode>USD</CurrencyCode><Amount>0.000000</Amount></FeePaid></TransactionParts><PaymentMethod>CC</PaymentMethod><SenderName>Kate M DeHaven</SenderName><CallerName>Timothy P. Freund</CallerName><RecipientName>Timothy P. Freund</RecipientName><Fees><CurrencyCode>USD</CurrencyCode><Amount>0.100000</Amount></Fees><Balance><CurrencyCode>USD</CurrencyCode><Amount>32.000000</Amount></Balance><CallerTokenId>Z34XMGF4GCILGV7EV2D45DDO4Q6WXEJZ9175UNR5I9LFEC1H8MMX3R6NBJUJH8MQ</CallerTokenId><SenderTokenId>2446UQQZ1KJ6RPCB7CM774RH1TCAP7GA2VU9ATJ345N7JFGLXLEP3Y2HTDBRXRGR</SenderTokenId><RecipientTokenId>ZS4X4GK4GDIFGVDED2DF54DOTQAWX8JC91I5UNR7I4LFFCUH8KM53RKNDJUMHFM3</RecipientTokenId></Transactions><Transactions><TransactionId>135AHMQA9H3NEFJL73GQ33873PLPNGLQZP1</TransactionId><CallerTransactionDate>2008-04-15T19:43:01.000-07:00</CallerTransactionDate><DateReceived>2008-04-15T19:41:09.000-07:00</DateReceived><DateCompleted>2008-04-15T19:41:10.000-07:00</DateCompleted><TransactionAmount><CurrencyCode>USD</CurrencyCode><Amount>1.000000</Amount></TransactionAmount><Operation>Pay</Operation><Status>Initiated</Status><ErrorCode /><TransactionParts><AccountId>JMXHWUQJONDR53DM28EHVCGFILGI4RGNX541Z9</AccountId><Role>Recipient</Role><Name>Timothy P. Freund</Name><Reference /><Description /><FeePaid><CurrencyCode>USD</CurrencyCode><Amount>0.100000</Amount></FeePaid></TransactionParts><TransactionParts><AccountId>JMXHWUQJONDR53DM28EHVCGFILGI4RGNX541Z9</AccountId><Role>Caller</Role><Name>Timothy P. Freund</Name><Reference>FPeS Invoice #10</Reference><Description /><FeePaid><CurrencyCode>USD</CurrencyCode><Amount>0.000000</Amount></FeePaid></TransactionParts><PaymentMethod>CC</PaymentMethod><SenderName>Kate M DeHaven</SenderName><CallerName>Timothy P. Freund</CallerName><RecipientName>Timothy P. Freund</RecipientName><Fees><CurrencyCode>USD</CurrencyCode><Amount>0.100000</Amount></Fees><Balance><CurrencyCode>USD</CurrencyCode><Amount>31.100000</Amount></Balance><CallerTokenId>Z34XMGF4GCILGV7EV2D45DDO4Q6WXEJZ9175UNR5I9LFEC1H8MMX3R6NBJUJH8MQ</CallerTokenId><SenderTokenId>2446UQQZ1KJ6RPCB7CM774RH1TCAP7GA2VU9ATJ345N7JFGLXLEP3Y2HTDBRXRGR</SenderTokenId><RecipientTokenId>ZS4X4GK4GDIFGVDED2DF54DOTQAWX8JC91I5UNR7I4LFFCUH8KM53RKNDJUMHFM3</RecipientTokenId></Transactions><Transactions><TransactionId>135AHLZE376U9LN9H5U51LUNOFHZD93243A</TransactionId><CallerTransactionDate>2008-04-15T19:42:02.000-07:00</CallerTransactionDate><DateReceived>2008-04-15T19:40:10.000-07:00</DateReceived><DateCompleted>2008-04-15T19:40:11.000-07:00</DateCompleted><TransactionAmount><CurrencyCode>USD</CurrencyCode><Amount>1.000000</Amount></TransactionAmount><Operation>Pay</Operation><Status>Success</Status><ErrorCode /><TransactionParts><AccountId>JMXHWUQJONDR53DM28EHVCGFILGI4RGNX541Z9</AccountId><Role>Caller</Role><Name>Timothy P. Freund</Name><Reference>FPeS Invoice #9</Reference><Description /><FeePaid><CurrencyCode>USD</CurrencyCode><Amount>0.000000</Amount></FeePaid></TransactionParts><TransactionParts><AccountId>JMXHWUQJONDR53DM28EHVCGFILGI4RGNX541Z9</AccountId><Role>Recipient</Role><Name>Timothy P. Freund</Name><Reference /><Description /><FeePaid><CurrencyCode>USD</CurrencyCode><Amount>0.100000</Amount></FeePaid></TransactionParts><PaymentMethod>CC</PaymentMethod><SenderName>Kate M DeHaven</SenderName><CallerName>Timothy P. Freund</CallerName><RecipientName>Timothy P. Freund</RecipientName><Fees><CurrencyCode>USD</CurrencyCode><Amount>0.100000</Amount></Fees><Balance><CurrencyCode>USD</CurrencyCode><Amount>31.100000</Amount></Balance><CallerTokenId>Z34XMGF4GCILGV7EV2D45DDO4Q6WXEJZ9175UNR5I9LFEC1H8MMX3R6NBJUJH8MQ</CallerTokenId><SenderTokenId>2S46PQMZ1GJERPPBPCM47KRHETFAPJG42VR9UTJ34DN7SF3LXLEV3Y2HIDBEXXGQ</SenderTokenId><RecipientTokenId>Z64XUGL4G8IQGV3EE2DB5NDOAQSWXUJ591G5JNRAIPLF9C4H8PMM3RLNBJUTHEMF</RecipientTokenId></Transactions><Transactions><TransactionId>135AHLZE376U9LN9H5U51LUNOFHZD93243A</TransactionId><CallerTransactionDate>2008-04-15T19:42:02.000-07:00</CallerTransactionDate><DateReceived>2008-04-15T19:40:10.000-07:00</DateReceived><DateCompleted>2008-04-15T19:40:10.000-07:00</DateCompleted><TransactionAmount><CurrencyCode>USD</CurrencyCode><Amount>1.000000</Amount></TransactionAmount><Operation>Pay</Operation><Status>Initiated</Status><ErrorCode /><TransactionParts><AccountId>JMXHWUQJONDR53DM28EHVCGFILGI4RGNX541Z9</AccountId><Role>Recipient</Role><Name>Timothy P. Freund</Name><Reference /><Description /><FeePaid><CurrencyCode>USD</CurrencyCode><Amount>0.100000</Amount></FeePaid></TransactionParts><TransactionParts><AccountId>JMXHWUQJONDR53DM28EHVCGFILGI4RGNX541Z9</AccountId><Role>Caller</Role><Name>Timothy P. Freund</Name><Reference>FPeS Invoice #9</Reference><Description /><FeePaid><CurrencyCode>USD</CurrencyCode><Amount>0.000000</Amount></FeePaid></TransactionParts><PaymentMethod>CC</PaymentMethod><SenderName>Kate M DeHaven</SenderName><CallerName>Timothy P. Freund</CallerName><RecipientName>Timothy P. Freund</RecipientName><Fees><CurrencyCode>USD</CurrencyCode><Amount>0.100000</Amount></Fees><Balance><CurrencyCode>USD</CurrencyCode><Amount>30.200000</Amount></Balance><CallerTokenId>Z34XMGF4GCILGV7EV2D45DDO4Q6WXEJZ9175UNR5I9LFEC1H8MMX3R6NBJUJH8MQ</CallerTokenId><SenderTokenId>2S46PQMZ1GJERPPBPCM47KRHETFAPJG42VR9UTJ34DN7SF3LXLEV3Y2HIDBEXXGQ</SenderTokenId><RecipientTokenId>Z64XUGL4G8IQGV3EE2DB5NDOAQSWXUJ591G5JNRAIPLF9C4H8PMM3RLNBJUTHEMF</RecipientTokenId></Transactions><Transactions><TransactionId>135AGBRAU5BK1UG76DOTQVT7T7E9O521PNP</TransactionId><CallerTransactionDate>2008-04-15T19:19:33.000-07:00</CallerTransactionDate><DateReceived>2008-04-15T19:17:41.000-07:00</DateReceived><DateCompleted>2008-04-15T19:17:42.000-07:00</DateCompleted><TransactionAmount><CurrencyCode>USD</CurrencyCode><Amount>1.000000</Amount></TransactionAmount><Operation>Pay</Operation><Status>Success</Status><ErrorCode /><TransactionParts><AccountId>JMXHWUQJONDR53DM28EHVCGFILGI4RGNX541Z9</AccountId><Role>Caller</Role><Name>Timothy P. Freund</Name><Reference>FPeS Invoice #8</Reference><Description /><FeePaid><CurrencyCode>USD</CurrencyCode><Amount>0.000000</Amount></FeePaid></TransactionParts><TransactionParts><AccountId>JMXHWUQJONDR53DM28EHVCGFILGI4RGNX541Z9</AccountId><Role>Recipient</Role><Name>Timothy P. Freund</Name><Reference /><Description /><FeePaid><CurrencyCode>USD</CurrencyCode><Amount>0.100000</Amount></FeePaid></TransactionParts><PaymentMethod>CC</PaymentMethod><SenderName>Kate M DeHaven</SenderName><CallerName>Timothy P. Freund</CallerName><RecipientName>Timothy P. Freund</RecipientName><Fees><CurrencyCode>USD</CurrencyCode><Amount>0.100000</Amount></Fees><Balance><CurrencyCode>USD</CurrencyCode><Amount>30.200000</Amount></Balance><CallerTokenId>Z34XMGF4GCILGV7EV2D45DDO4Q6WXEJZ9175UNR5I9LFEC1H8MMX3R6NBJUJH8MQ</CallerTokenId><SenderTokenId>2646UQHZ1SJTRPPBRCM97GRH3TKAPAG22VA9BTJ64BN7RF9LXEEV3Y8H9DBTXUGQ</SenderTokenId><RecipientTokenId>Z24XLGL4G3IPGVKEB2DC5KDO4Q8WX6JZ91T5HNRIIPLFUCUH8RMU3RDNUJUCHSMT</RecipientTokenId></Transactions><Transactions><TransactionId>135AGBRAU5BK1UG76DOTQVT7T7E9O521PNP</TransactionId><CallerTransactionDate>2008-04-15T19:19:33.000-07:00</CallerTransactionDate><DateReceived>2008-04-15T19:17:41.000-07:00</DateReceived><DateCompleted>2008-04-15T19:17:42.000-07:00</DateCompleted><TransactionAmount><CurrencyCode>USD</CurrencyCode><Amount>1.000000</Amount></TransactionAmount><Operation>Pay</Operation><Status>Initiated</Status><ErrorCode /><TransactionParts><AccountId>JMXHWUQJONDR53DM28EHVCGFILGI4RGNX541Z9</AccountId><Role>Caller</Role><Name>Timothy P. Freund</Name><Reference>FPeS Invoice #8</Reference><Description /><FeePaid><CurrencyCode>USD</CurrencyCode><Amount>0.000000</Amount></FeePaid></TransactionParts><TransactionParts><AccountId>JMXHWUQJONDR53DM28EHVCGFILGI4RGNX541Z9</AccountId><Role>Recipient</Role><Name>Timothy P. Freund</Name><Reference /><Description /><FeePaid><CurrencyCode>USD</CurrencyCode><Amount>0.100000</Amount></FeePaid></TransactionParts><PaymentMethod>CC</PaymentMethod><SenderName>Kate M DeHaven</SenderName><CallerName>Timothy P. Freund</CallerName><RecipientName>Timothy P. Freund</RecipientName><Fees><CurrencyCode>USD</CurrencyCode><Amount>0.100000</Amount></Fees><Balance><CurrencyCode>USD</CurrencyCode><Amount>29.300000</Amount></Balance><CallerTokenId>Z34XMGF4GCILGV7EV2D45DDO4Q6WXEJZ9175UNR5I9LFEC1H8MMX3R6NBJUJH8MQ</CallerTokenId><SenderTokenId>2646UQHZ1SJTRPPBRCM97GRH3TKAPAG22VA9BTJ64BN7RF9LXEEV3Y8H9DBTXUGQ</SenderTokenId><RecipientTokenId>Z24XLGL4G3IPGVKEB2DC5KDO4Q8WX6JZ91T5HNRIIPLFUCUH8RMU3RDNUJUCHSMT</RecipientTokenId></Transactions><Transactions><TransactionId>135AG22NH61N3AKG7OQVRIRK3PB17338IRE</TransactionId><CallerTransactionDate>2008-04-15T19:15:00.000-07:00</CallerTransactionDate><DateReceived>2008-04-15T19:12:21.000-07:00</DateReceived><DateCompleted>2008-04-15T19:12:22.000-07:00</DateCompleted><TransactionAmount><CurrencyCode>USD</CurrencyCode><Amount>1.000000</Amount></TransactionAmount><Operation>Pay</Operation><Status>Success</Status><ErrorCode /><TransactionParts><AccountId>JMXHWUQJONDR53DM28EHVCGFILGI4RGNX541Z9</AccountId><Role>Recipient</Role><Name>Timothy P. Freund</Name><Reference /><Description /><FeePaid><CurrencyCode>USD</CurrencyCode><Amount>0.100000</Amount></FeePaid></TransactionParts><TransactionParts><AccountId>JMXHWUQJONDR53DM28EHVCGFILGI4RGNX541Z9</AccountId><Role>Caller</Role><Name>Timothy P. Freund</Name><Reference>FPeS Invoice #41</Reference><Description /><FeePaid><CurrencyCode>USD</CurrencyCode><Amount>0.000000</Amount></FeePaid></TransactionParts><PaymentMethod>CC</PaymentMethod><SenderName>Kate M DeHaven</SenderName><CallerName>Timothy P. Freund</CallerName><RecipientName>Timothy P. Freund</RecipientName><Fees><CurrencyCode>USD</CurrencyCode><Amount>0.100000</Amount></Fees><Balance><CurrencyCode>USD</CurrencyCode><Amount>29.300000</Amount></Balance><CallerTokenId>Z34XMGF4GCILGV7EV2D45DDO4Q6WXEJZ9175UNR5I9LFEC1H8MMX3R6NBJUJH8MQ</CallerTokenId><SenderTokenId>2646RQUZ1EJIRPBB1CMU74RHAT9AP5G32VG9DTJQ47N7JFSLXGE53YFH3DBDXLGG</SenderTokenId><RecipientTokenId>Z74X7GZ4G7ILGVIEC2DA5SDOTQCWX6J491D5BNR7IQLF7CAH8NMB3RZNIJUJHJME</RecipientTokenId></Transactions><Transactions><TransactionId>135AG22NH61N3AKG7OQVRIRK3PB17338IRE</TransactionId><CallerTransactionDate>2008-04-15T19:15:00.000-07:00</CallerTransactionDate><DateReceived>2008-04-15T19:12:21.000-07:00</DateReceived><DateCompleted>2008-04-15T19:12:21.000-07:00</DateCompleted><TransactionAmount><CurrencyCode>USD</CurrencyCode><Amount>1.000000</Amount></TransactionAmount><Operation>Pay</Operation><Status>Initiated</Status><ErrorCode /><TransactionParts><AccountId>JMXHWUQJONDR53DM28EHVCGFILGI4RGNX541Z9</AccountId><Role>Caller</Role><Name>Timothy P. Freund</Name><Reference>FPeS Invoice #41</Reference><Description /><FeePaid><CurrencyCode>USD</CurrencyCode><Amount>0.000000</Amount></FeePaid></TransactionParts><TransactionParts><AccountId>JMXHWUQJONDR53DM28EHVCGFILGI4RGNX541Z9</AccountId><Role>Recipient</Role><Name>Timothy P. Freund</Name><Reference /><Description /><FeePaid><CurrencyCode>USD</CurrencyCode><Amount>0.100000</Amount></FeePaid></TransactionParts><PaymentMethod>CC</PaymentMethod><SenderName>Kate M DeHaven</SenderName><CallerName>Timothy P. Freund</CallerName><RecipientName>Timothy P. Freund</RecipientName><Fees><CurrencyCode>USD</CurrencyCode><Amount>0.100000</Amount></Fees><Balance><CurrencyCode>USD</CurrencyCode><Amount>28.400000</Amount></Balance><CallerTokenId>Z34XMGF4GCILGV7EV2D45DDO4Q6WXEJZ9175UNR5I9LFEC1H8MMX3R6NBJUJH8MQ</CallerTokenId><SenderTokenId>2646RQUZ1EJIRPBB1CMU74RHAT9AP5G32VG9DTJQ47N7JFSLXGE53YFH3DBDXLGG</SenderTokenId><RecipientTokenId>Z74X7GZ4G7ILGVIEC2DA5SDOTQCWX6J491D5BNR7IQLF7CAH8NMB3RZNIJUJHJME</RecipientTokenId></Transactions><Status>Success</Status><RequestId>04e90391-43f1-4607-a09e-b2e3ee0121b2:0</RequestId></ns0:GetAccountActivityResponse>"""
         return [response]
 
@@ -105 +109 @@
     response_headers = [('Content-type', 'text/plain')]
     start_response(status, response_headers)
-    print "intercepted"
     print environ