Merge lp:~stefanor/ibid/exchange-minor-units into lp:ibid

[Stefano Rivera]

Use ISO-4217's minor-units data, to output currency in the correct formatting.

Seemed the obvious next step

[lp:~stefanor/ibid/exchange-minor-units]

1067. By Stefano Rivera on 2011-08-20

Change default minor_units to 2

1068. By Stefano Rivera on 2011-08-20

Use %.*f instead of two levels of string formatting

[Max Rabkin (max-rabkin)]

review: Approve

[lp:~stefanor/ibid/exchange-minor-units]

1069. By Stefano Rivera on 2011-10-16

Merged exchange-825217

[Jonathan Hitchcock (vhata)]

review: Approve

=== modified file 'ibid/plugins/conversions.py'
--- ibid/plugins/conversions.py	2011-10-16 08:32:24 +0000
+++ ibid/plugins/conversions.py	2011-10-16 08:32:24 +0000
@@ -316,7 +316,7 @@
                 'http://www.currency-iso.org/dl_iso_table_a1.xml',
                 'conversions/iso4217.xml')
         document = ElementTree.parse(iso4127_file)
-        # Code -> [Countries..., Currency Name]
+        # Code -> [Countries..., Currency Name, post-decimal digits]
         self.currencies = {}
         # Country -> Code
         self.country_currencies = {}
@@ -338,6 +338,10 @@
             code = currency.findtext('ALPHABETIC_CODE').strip()
             name = currency.findtext('CURRENCY').strip()
             place = currency.findtext('ENTITY').strip().title()
+            try:
+                minor_units = int(currency.findtext('MINOR_UNIT').strip())
+            except ValueError:
+                minor_units = 2
             if code == '' or code in non_currencies:
                 continue
             # Fund codes
@@ -346,7 +350,7 @@
             if code in self.currencies:
                 self.currencies[code][0].append(place)
             else:
-                self.currencies[code] = [[place], name]
+                self.currencies[code] = [[place], name, minor_units]
             if place in no_country_codes:
                 continue
             if (code[:2] in self.country_codes
@@ -411,7 +415,7 @@
             return "USD"
         if name == u'pound':
             return "GBP"
-        for code, (places, currency) in self.currencies.iteritems():
+        for code, (places, currency, units) in self.currencies.iteritems():
             if name == currency.lower():
                 return code
             if name.title() in places:
@@ -424,7 +428,7 @@
 
         # Second pass, not requiring exact match:
         if rough:
-            for code, (places, currency) in self.currencies.iteritems():
+            for code, (places, currency, units) in self.currencies.iteritems():
                 if name in currency.lower():
                     return code
                 if any(name in place.lower() for place in places):
@@ -473,12 +477,14 @@
                     u"Whoops, looks like I couldn't make that conversion")
             return
 
+        converted = float(amount) * float(last_trade_rate)
         event.addresponse(
             u'%(fresult)s %(fcode)s (%(fcurrency)s) = '
-            u'%(tresult)0.2f %(tcode)s (%(tcurrency)s) '
+            u'%(tresult)s %(tcode)s (%(tcurrency)s) '
             u'(Last trade rate: %(rate)s, Bid: %(bid)s, Ask: %(ask)s)', {
                 'fresult': amount,
-                'tresult': float(amount) * float(last_trade_rate),
+                'tresult': u'%0.*f' % (self.currencies[canonical_to][2],
+                                       converted),
                 'fcurrency': self.currencies[canonical_frm][1],
                 'tcurrency': self.currencies[canonical_to][1],
                 'fcode': canonical_frm,