Merge lp:~eridanus-developers/eridanus-std/yahoo-timestamp into lp:eridanus-std

[Tristan Seligmann]

[Jonathan Jacobs (jjacobs)]

Looks good.

review: Approve

=== modified file 'eridanusstd/plugindefs/currency.py'
--- eridanusstd/plugindefs/currency.py	2010-06-12 13:13:55 +0000
+++ eridanusstd/plugindefs/currency.py	2010-10-11 16:49:43 +0000
@@ -37,7 +37,7 @@
 
         def convert((rate, tradeTime)):
             convertedAmount = rate * amount
-            source.reply(unicode(convertedAmount))
+            source.reply(u'%s (at %s)' % (convertedAmount, tradeTime))
 
         return yahoo.currencyExchange(currencyFrom, currencyTo
             ).addCallback(convert)

=== modified file 'eridanusstd/yahoo.py'
--- eridanusstd/yahoo.py	2008-09-27 13:25:41 +0000
+++ eridanusstd/yahoo.py	2010-10-11 16:49:43 +0000
@@ -23,12 +23,7 @@
         if lastTradeRate == 0:
             raise errors.InvalidCurrency(u'One of the specified currency codes is invalid')
 
-        print d, d.split('/', 3)
-        month, day, year = map(int, d.split('/', 3))
-        d = date(year, month, day)
-        t = Time.fromHumanly(t).asDatetime().time()
-        tradeTime = Time.fromDatetime(datetime.combine(d, t))
-
+        tradeTime = u'%s %s' % (d, t)
         return Decimal(lastTradeRate), tradeTime
 
     url = CURRENCY_URL.add('s', '%s%s=X' % (currencyFrom, currencyTo))