Try to fix lol xpath in python 2.6 #2

Kozea · Jun 5, 2014 · 55e8f3d · 55e8f3d
1 parent 6e7e028
commit 55e8f3d
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 6 deletions.
diff --git a/pygal/graph/frenchmap.py b/pygal/graph/frenchmap.py
@@ -231,10 +231,12 @@ def _plot(self):
                 except SyntaxError:
                     # Python 2.6 (you'd better install lxml)
                     areae = []
-                    for e in map:
-                        if '%s%s' % (
-                                self.area_prefix, area_code) in e['class']:
-                            areae.append(e)
+                    for g in map:
+                        for e in g:
+                            if '%s%s' % (
+                                    self.area_prefix, area_code
+                            ) in e.attrib.get('class', ''):
+                                areae.append(e)
 
                 if not areae:
                     continue

diff --git a/pygal/graph/supranationalworldmap.py b/pygal/graph/supranationalworldmap.py
@@ -56,7 +56,16 @@ def _plot(self):
                     ratio = 1
                 else:
                     ratio = .3 + .7 * (value - min_) / (max_ - min_)
-                country = map.find('.//*[@id="%s"]' % country_code)
+
+                try:
+                    country = map.find('.//*[@id="%s"]' % country_code)
+                except SyntaxError:
+                    # Python 2.6 (you'd better install lxml)
+                    country = None
+                    for e in map:
+                        if e.attrib.get('id', '') == country_code:
+                            country = e
+
                 if country is None:
                     continue
                 cls = country.get('class', '').split(' ')

diff --git a/pygal/graph/worldmap.py b/pygal/graph/worldmap.py
@@ -74,7 +74,16 @@ def _plot(self):
                     ratio = 1
                 else:
                     ratio = .3 + .7 * (value - min_) / (max_ - min_)
-                country = map.find('.//*[@id="%s"]' % country_code)
+
+                try:
+                    country = map.find('.//*[@id="%s"]' % country_code)
+                except SyntaxError:
+                    # Python 2.6 (you'd better install lxml)
+                    country = None
+                    for e in map:
+                        if e.attrib.get('id', '') == country_code:
+                            country = e
+
                 if country is None:
                     continue
                 cls = country.get('class', '').split(' ')