1
=== modified file 'ibid/plugins/lookup.py'
2
--- ibid/plugins/lookup.py	2009-05-12 07:13:41 +0000
3
+++ ibid/plugins/lookup.py	2009-05-30 16:43:53 +0000
4
@@ -7,6 +7,7 @@
5
7
from simplejson import loads
7
from simplejson import loads
6
8
from xml.dom.minidom import parse
8
from xml.dom.minidom import parse
7
9
import re
9
import re
8
10
import logging
9
10
11
10
11
import feedparser
12
import feedparser
11
12
13
12
@@ -14,6 +15,8 @@
13
14
from ibid.config import Option
15
from ibid.config import Option
14
15
from ibid.utils import ago, decode_htmlentities, get_html_parse_tree, cacheable_download
16
from ibid.utils import ago, decode_htmlentities, get_html_parse_tree, cacheable_download
15
16
17
16
18
log = logging.getLogger('plugins.lookup')
17
19
18
17
help = {}
20
help = {}
19
18
21
20
19
def get_country_codes():
22
def get_country_codes():
21
@@ -270,7 +273,6 @@
22
270
    headers = {'User-Agent': 'Mozilla/5.0', 'Referer': 'http://www.xe.com/'}
273
    headers = {'User-Agent': 'Mozilla/5.0', 'Referer': 'http://www.xe.com/'}
23
271
    currencies = {}
274
    currencies = {}
24
272
    country_codes = {}
275
    country_codes = {}
25
273
    strip_currency_re = re.compile(r'^[\.\s]*([\w\s]+?)s?$', re.UNICODE)
26
274
276
27
275
    def _load_currencies(self):
277
    def _load_currencies(self):
28
276
        etree = get_html_parse_tree('http://www.xe.com/iso4217.php', headers=self.headers, treetype='etree')
278
        etree = get_html_parse_tree('http://www.xe.com/iso4217.php', headers=self.headers, treetype='etree')
29
@@ -299,11 +301,13 @@
30
299
                            currency[0].append(place)
301
                            currency[0].append(place)
31
300
                    else:
302
                    else:
32
301
                        self.currencies[code] = [[place], name.strip()]
303
                        self.currencies[code] = [[place], name.strip()]
33
304
34
302
        # Special cases for shared currencies:
305
        # Special cases for shared currencies:
35
303
        self.currencies['EUR'][0].insert(0, u'Euro Member Countries')
306
        self.currencies['EUR'][0].insert(0, u'Euro Member Countries')
36
304
        self.currencies['XOF'][0].insert(0, u'Communaut\xe9 Financi\xe8re Africaine')
307
        self.currencies['XOF'][0].insert(0, u'Communaut\xe9 Financi\xe8re Africaine')
37
305
        self.currencies['XOF'][1] = u'Francs'
308
        self.currencies['XOF'][1] = u'Francs'
38
306
309
39
310
    strip_currency_re = re.compile(r'^[\.\s]*([\w\s]+?)s?$', re.UNICODE)
40
307
311
41
308
    def _resolve_currency(self, name, rough=True):
312
    def _resolve_currency(self, name, rough=True):
42
309
        "Return the canonical name for a currency"
313
        "Return the canonical name for a currency"
43
@@ -311,7 +315,12 @@
44
311
        if name.upper() in self.currencies:
315
        if name.upper() in self.currencies:
45
312
            return name.upper()
316
            return name.upper()
46
313
317
48
314
        name = self.strip_currency_re.match(name).group(1).lower()
318
        m = self.strip_currency_re.match(name)
49
319
        
50
320
        if m is None:
51
321
            return False
52
322
53
323
        name = m.group(1).lower()
54
315
324
55
316
        # TLD -> country name
325
        # TLD -> country name
56
317
        if rough and len(name) == 2 and name.upper() in self.country_codes:
326
        if rough and len(name) == 2 and name.upper() in self.country_codes:
Reviewer	Date Requested	Status
Jonathan Hitchcock		Approve on 2009-06-02
Michael Gorven	2009-05-30	Approve on 2009-05-30
Review via email: mp+6905@code.launchpad.net