rbnf: correct radix reading

Author: akx

babel/rbnf.py

@@ -619,16 +619,12 @@ def __init__(self, value, text, radix=None):
         if value in self.specials:
             self.value = value
         else:
-            try:
-                self.value = int(value)
-            except:
-                warnings.warn("Unknown rule value: [%s]" % value, SyntaxWarning)
+            self.value = int(value)
 
         self.text = text
-        self._radix = radix
-        
-        self._parse(text)
+        self.radix = int(radix or 10)
 
+        self._parse(text)
 
     def apply(self, number, context):
         """
@@ -685,14 +681,8 @@ def divisor(self):
         if isinstance(self.value, int):
             if self.value == 0:
                 return 1
-            exp = decimal.Decimal(self.value).ln()/decimal.Decimal(self.radix).ln()
-            return int(self.radix**math.floor(exp))
-
-    
-    @property
-    def radix(self):
-        return self._radix or 10
-
+            exp = decimal.Decimal(self.value).ln() / decimal.Decimal(self.radix).ln()
+            return int(self.radix ** math.floor(exp))
 
     @property
     def substitutions(self):

scripts/import_cldr.py

@@ -230,7 +230,6 @@ def parse_global(srcdir, sup):
     all_currencies = collections.defaultdict(set)
     currency_fractions = global_data.setdefault('currency_fractions', {})
     territory_languages = global_data.setdefault('territory_languages', {})
-    rbnf_locales = global_data.setdefault('rbnf_locales', [])
     bcp47_timezone = parse(os.path.join(srcdir, 'bcp47', 'timezone.xml'))
     sup_windows_zones = parse(os.path.join(sup_dir, 'windowsZones.xml'))
     sup_metadata = parse(os.path.join(sup_dir, 'supplementalMetadata.xml'))
@@ -1020,17 +1019,19 @@ def parse_rbnf_rules(data, tree):
             ruleset_obj = rbnf.Ruleset(ruleset_name, private)
             for rule in ruleset.findall('rbnfrule'):
                 radix = rule.attrib.get('radix')
+                if radix == "1,000":  # HACK: work around misspelled radix in mt.xml
+                    radix = "1000"
                 try:
                     rule_obj = rbnf.Rule(rule.attrib['value'], rule.text, radix)
+                    ruleset_obj.rules.append(rule_obj)
                 except rbnf.TokenizationError as e:
                     log('%s: Unable to parse rule "%s%s: %s "' % (
                         data['locale_id'],
                         rule.attrib['value'],
                         rule.text,
                         '' if radix is None else ('/%s' % radix),
                     ))
-                ruleset_obj.rules.append(rule_obj)
-            rbnf_rules[group_name].append(ruleset_obj)        
+            rbnf_rules[group_name].append(ruleset_obj)
 
 
 if __name__ == '__main__':