fixed plural rules with pkgutil

VERSION

@@ -1 +1 @@
-Version 2.0.3 (2012-08-30 23:07:46) stable
+Version 2.0.3 (2012-08-30 23:55:09) stable

applications/admin/languages/default.py

@@ -53,6 +53,7 @@
 'Exception instance attributes': 'Exception instance attributes',
 'exposes': 'exposes',
 'extends': 'extends',
+'file does not exist': 'file does not exist',
 'filter': 'filter',
 'Frames': 'Frames',
 'Get from URL:': 'Get from URL:',
@@ -72,8 +73,8 @@
 'Logout': 'Logout',
 'Models': 'Models',
 'models': 'models',
-'modules': 'modules',
 'Modules': 'Modules',
+'modules': 'modules',
 'New application wizard': 'New application wizard',
 'New simple application': 'New simple application',
 'Overwrite installed app': 'Overwrite installed app',

applications/admin/views/default/design.html

@@ -223,16 +223,12 @@ for c in controllers: controller_functions+=[c[:-3]+'/%s.html'%x for x in functi
             {{=editpluralsfile('languages',pfile,dict(nplurals=p[0]))}}
           </span>
           <span class="file">
-            {{=peekfile('languages',pfile,dict(id=id))}},
+            {{=peekfile('languages',pfile,dict(id=id))}}
           </span>
         {{else:}}
-          <b>{{=T("are not used yet")}}</b>,
+          <b>{{=T("are not used yet")}}</b>
         {{pass}}
       {{pass}}
-      {{=T("rules:")}}
-        <span class="file{{=' error' if p[3]!='ok' else ''}}">
-          {{=peekfile('gluon/contrib/rules', p[2], dict(app=app, id=id), p[3] if p[3]!='ok' else None)}}
-        </span>
     {{pass}}
     )
     </td>

gluon/contrib/rules/__init__.py

@@ -1 +0,0 @@
-

gluon/contrib/rules/plural_rules-af.py

@@ -1,17 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf8 -*-
-# Plural-Forms for af (Afrikaans (South Africa))
-
-nplurals=2  # Afrikaans language has 2 forms:
-            # 1 singular and 1 plural
-
-# Determine plural_id for number *n* as sequence of positive
-# integers: 0,1,...
-# NOTE! For singular form ALWAYS return plural_id = 0
-get_plural_id = lambda n: int(n != 1)
-
-# Construct and return plural form of *word* using
-# *plural_id* (which ALWAYS>0). This function will be executed
-# for words (or phrases) not found in plural_dict dictionary
-# construct_plural_form = lambda word, plural_id: (word + 'suffix')
-

gluon/contrib/rules/plural_rules-bg.py

@@ -1,17 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf8 -*-
-# Plural-Forms for bg (Bulgarian)
-
-nplurals=2  # Bulgarian language has 2 forms:
-            # 1 singular and 1 plural
-
-# Determine plural_id for number *n* as sequence of positive
-# integers: 0,1,...
-# NOTE! For singular form ALWAYS return plural_id = 0
-get_plural_id = lambda n: int(n != 1)
-
-# Construct and return plural form of *word* using
-# *plural_id* (which ALWAYS>0). This function will be executed
-# for words (or phrases) not found in plural_dict dictionary
-# construct_plural_form = lambda word, plural_id: (word + 'suffix')
-

gluon/contrib/rules/plural_rules-cs.py

@@ -1,19 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf8 -*-
-# Plural-Forms for cs (Czech)
-
-nplurals=3  # Czech language has 3 forms:
-            # 1 singular and 2 plurals
-
-# Determine plural_id for number *n* as sequence of positive
-# integers: 0,1,...
-# NOTE! For singular form ALWAYS return plural_id = 0
-get_plural_id = lambda n: ( 0 if n==1 else
-                            1 if 2<=n<=4 else
-                            2 )
-
-# Construct and return plural form of *word* using
-# *plural_id* (which ALWAYS>0). This function will be executed
-# for words (or phrases) not found in plural_dict dictionary
-# construct_plural_form = lambda word, plural_id: (word + 'suffix')
-

gluon/contrib/rules/plural_rules-de.py

@@ -1,17 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf8 -*-
-# Plural-Forms for de (Deutsch)
-
-nplurals=2  # German language has 2 forms:
-            # 1 singular and 1 plural
-
-# Determine plural_id for number *n* as sequence of positive
-# integers: 0,1,...
-# NOTE! For singular form ALWAYS return plural_id = 0
-get_plural_id = lambda n: int(n != 1)
-
-# Construct and return plural form of *word* using
-# *plural_id* (which ALWAYS>0). This function will be executed
-# for words (or phrases) not found in plural_dict dictionary
-# construct_plural_form = lambda word, plural_id: (word + 'suffix')
-

gluon/contrib/rules/plural_rules-en.py

@@ -1,20 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf8 -*-
-# Plural-Forms for en (English)
-
-nplurals=2  # English language has 2 forms:
-            # 1 singular and 1 plural
-
-# Determine plural_id for number *n* as sequence of positive
-# integers: 0,1,...
-# NOTE! For singular form ALWAYS return plural_id = 0
-get_plural_id = lambda n: int(n != 1)
-
-# Construct and return plural form of *word* using
-# *plural_id* (which ALWAYS>0). This function will be executed
-# for words (or phrases) not found in plural_dict dictionary
-construct_plural_form = lambda word, plural_id: (word +
-                        ('es' if word[-1:] in ('s','x','o') or
-                                 word[-2:] in ('sh','ch')
-                         else 's'))
-

gluon/contrib/rules/plural_rules-es.py

@@ -1,17 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf8 -*-
-# Plural-Forms for es (Spanish)
-
-nplurals=2  # Spanish language has 2 forms:
-            # 1 singular and 1 plural
-
-# Determine plural_id for number *n* as sequence of positive
-# integers: 0,1,...
-# NOTE! For singular form ALWAYS return plural_id = 0
-get_plural_id = lambda n: int(n != 1)
-
-# Construct and return plural form of *word* using
-# *plural_id* (which ALWAYS>0). This function will be executed
-# for words (or phrases) not found in plural_dict dictionary
-# construct_plural_form = lambda word, plural_id: (word + 'suffix')
-

gluon/contrib/rules/plural_rules-fr.py

@@ -1,17 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf8 -*-
-# Plural-Forms for fr (French))
-
-nplurals=2  # French language has 2 forms:
-            # 1 singular and 1 plural
-
-# Determine plural_id for number *n* as sequence of positive
-# integers: 0,1,...
-# NOTE! For singular form ALWAYS return plural_id = 0
-get_plural_id = lambda n: int(n != 1)
-
-# Construct and return plural form of *word* using
-# *plural_id* (which ALWAYS>0). This function will be executed
-# for words (or phrases) not found in plural_dict dictionary
-# construct_plural_form = lambda word, plural_id: (word + 'suffix')
-

gluon/contrib/rules/plural_rules-he.py

@@ -1,17 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf8 -*-
-# Plural-Forms for he (Hebrew)
-
-nplurals=2  # Hebrew language has 2 forms:
-            # 1 singular and 1 plural
-
-# Determine plural_id for number *n* as sequence of positive
-# integers: 0,1,...
-# NOTE! For singular form ALWAYS return plural_id = 0
-get_plural_id = lambda n: int(n != 1)
-
-# Construct and return plural form of *word* using
-# *plural_id* (which ALWAYS>0). This function will be executed
-# for words (or phrases) not found in plural_dict dictionary
-# construct_plural_form = lambda word, plural_id: (word + 'suffix')
-

gluon/contrib/rules/plural_rules-hi.py

@@ -1,17 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf8 -*-
-# Plural-Forms for he (Hindi)
-
-nplurals=2  # Hindi has 2 forms:
-            # 1 singular and 1 plural
-
-# Determine plural_id for number *n* as sequence of positive
-# integers: 0,1,...
-# NOTE! For singular form ALWAYS return plural_id = 0
-get_plural_id = lambda n: int(n != 1)
-
-# Construct and return plural form of *word* using
-# *plural_id* (which ALWAYS>0). This function will be executed
-# for words (or phrases) not found in plural_dict dictionary
-# construct_plural_form = lambda word, plural_id: (word + 'suffix')
-

gluon/contrib/rules/plural_rules-hu.py

@@ -1,17 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf8 -*-
-# Plural-Forms for hu (Hungarian)
-
-nplurals=2  # Hungarian language has 2 forms:
-            # 1 singular and 1 plural
-
-# Determine plural_id for number *n* as sequence of positive
-# integers: 0,1,...
-# NOTE! For singular form ALWAYS return plural_id = 0
-get_plural_id = lambda n: int(n != 1)
-
-# Construct and return plural form of *word* using
-# *plural_id* (which ALWAYS>0). This function will be executed
-# for words (or phrases) not found in plural_dict dictionary
-# construct_plural_form = lambda word, plural_id: (word + 'suffix')
-

gluon/contrib/rules/plural_rules-it.py

@@ -1,17 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf8 -*-
-# Plural-Forms for it (Italian)
-
-nplurals=2  # Italian language has 2 forms:
-            # 1 singular and 1 plural
-
-# Determine plural_id for number *n* as sequence of positive
-# integers: 0,1,...
-# NOTE! For singular form ALWAYS return plural_id = 0
-get_plural_id = lambda n: int(n != 1)
-
-# Construct and return plural form of *word* using
-# *plural_id* (which ALWAYS>0). This function will be executed
-# for words (or phrases) not found in plural_dict dictionary
-# construct_plural_form = lambda word, plural_id: (word + 'suffix')
-

gluon/contrib/rules/plural_rules-ja.py

@@ -1,14 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf8 -*-
-# Plural-Forms for ja (Japanese)
-
-nplurals=1  # Japanese language has ONE form!
-
-# Always returns 0:
-get_plural_id = lambda n: 0
-
-# Construct and return plural form of *word* using
-# *plural_id* (which ALWAYS>0). This function will be executed
-# for words (or phrases) not found in plural_dict dictionary
-# construct_plural_form = lambda word, plural_id: word
-

gluon/contrib/rules/plural_rules-lt.py

@@ -1,19 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf8 -*-
-# Plural-Forms for lt (Lithuanian)
-
-nplurals=3 # Lithuanian language has 3 forms:
-           # 1 singular and 2 plurals
-
-# Determine plural_id for number *n* as sequence of positive
-# integers: 0,1,...
-# NOTE! For singular form ALWAYS return plural_id = 0
-get_plural_id = lambda n: (0 if n % 10 == 1 and n % 100 != 11 else
-                           1 if n % 10 >= 2 and (n % 100 < 10 or n % 100 >= 20) else
-                           2)
-
-# Construct and return plural form of *word* using
-# *plural_id* (which ALWAYS>0). This function will be executed
-# for words (or phrases) not found in plural_dict dictionary
-# construct_plural_form = lambda word, plural_id: (word + 'suffix')
-

gluon/contrib/rules/plural_rules-pl.py

@@ -1,19 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf8 -*-
-# Plural-Forms for pl (Polish)
-
-nplurals=3 # Polish language has 3 forms:
-           # 1 singular and 2 plurals
-
-# Determine plural_id for number *n* as sequence of positive
-# integers: 0,1,...
-# NOTE! For singular form ALWAYS return plural_id = 0
-get_plural_id = lambda n: (0 if n==1 else
-                           1 if 2<=n<=4 else
-                           2)
-
-# Construct and return plural form of *word* using
-# *plural_id* (which ALWAYS>0). This function will be executed
-# for words (or phrases) not found in plural_dict dictionary
-# construct_plural_form = lambda word, plural_id: (word + 'suffix')
-

gluon/contrib/rules/plural_rules-pt.py

@@ -1,17 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf8 -*-
-# Plural-Forms for pt (Portuguese)
-
-nplurals=2  # Portuguese has 2 forms:
-            # 1 singular and 1 plural
-
-# Determine plural_id for number *n* as sequence of positive
-# integers: 0,1,...
-# NOTE! For singular form ALWAYS return plural_id = 0
-get_plural_id = lambda n: int(n != 1)
-
-# Construct and return plural form of *word* using
-# *plural_id* (which ALWAYS>0). This function will be executed
-# for words (or phrases) not found in plural_dict dictionary
-# construct_plural_form = lambda word, plural_id: (word + 'suffix')
-

gluon/contrib/rules/plural_rules-ro.py

@@ -1,17 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf8 -*-
-# Plural-Forms for ro (Romanian)
-
-nplurals=2  # Romanian has 2 forms:
-            # 1 singular and 1 plural
-
-# Determine plural_id for number *n* as sequence of positive
-# integers: 0,1,...
-# NOTE! For singular form ALWAYS return plural_id = 0
-get_plural_id = lambda n: int(n != 1)
-
-# Construct and return plural form of *word* using
-# *plural_id* (which ALWAYS>0). This function will be executed
-# for words (or phrases) not found in plural_dict dictionary
-# construct_plural_form = lambda word, plural_id: (word + 'suffix')
-

gluon/contrib/rules/plural_rules-ru.py

@@ -1,20 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf8 -*-
-# Plural-Forms for ru (Russian)
-
-nplurals=3 # Russian language has 3 forms:
-           # 1 singular and 2 plurals
-
-# Determine plural_id for number *n* as sequence of positive
-# integers: 0,1,...
-# NOTE! For singular form ALWAYS return plural_id = 0
-get_plural_id = lambda n: (0 if n % 10 == 1 and n % 100 != 11 else
-                           1 if n % 10 >= 2 and n % 10 <= 4 and
-                               (n % 100 < 10 or n % 100 >= 20) else
-                           2)
-
-# construct_plural_form() is not used now because of complex
-# rules of Russian language. Default version of
-# this function is used to simple insert new words into
-# plural_dict dictionary)
-# construct_plural_form = lambda word, plural_id: word

gluon/contrib/rules/plural_rules-sk.py

@@ -1,20 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf8 -*-
-# Plural-Forms for sk (Slovak (Slovakia))
-
-nplurals=3 # Slovak language has 3 forms:
-           # 1 singular and 2 plurals
-
-# Determine plural_id for number *n* as sequence of positive
-# integers: 0,1,...
-# NOTE! For singular form ALWAYS return plural_id = 0
-get_plural_id = lambda n: (0 if n % 10 == 1 and n % 100 != 11 else
-                           1 if n % 10 >= 2 and n % 10 <= 4 and
-                               (n % 100 < 10 or n % 100 >= 20) else
-                           2)
-
-# construct_plural_form() is not used now because of complex
-# rules of Slovak language. Default version of this function
-# is used to simple insert new words into plural_dict dictionary)
-# construct_plural_form = lambda word, plural_id: word
-

gluon/contrib/rules/plural_rules-sl.py

@@ -1,20 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf8 -*-
-# Plural-Forms for sl (Slovenian)
-
-nplurals=4 # Slovenian language has 4 forms:
-           # 1 singular and 3 plurals
-
-# Determine plural_id for number *n* as sequence of positive
-# integers: 0,1,...
-# NOTE! For singular form ALWAYS return plural_id = 0
-get_plural_id = lambda n: (0 if n % 100 == 1 else
-                           1 if n % 100 == 2 else
-                           2 if n % 100 in (3,4) else
-                           3)
-
-# Construct and return plural form of *word* using
-# *plural_id* (which ALWAYS>0). This function will be executed
-# for words (or phrases) not found in plural_dict dictionary
-# construct_plural_form = lambda word, plural_id: (word + 'suffix')
-

gluon/contrib/rules/plural_rules-tr.py

@@ -1,14 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf8 -*-
-# Plural-Forms for tr (Turkish)
-
-nplurals=1  # Turkish language has ONE form!
-
-# Always returns 0:
-get_plural_id = lambda n: 0
-
-# Construct and return plural form of *word* using
-# *plural_id* (which ALWAYS>0). This function will be executed
-# for words (or phrases) not found in plural_dict dictionary
-# construct_plural_form = lambda word, plural_id: word
-

gluon/contrib/rules/plural_rules-uk.py

@@ -1,21 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf8 -*-
-# Plural-Forms for uk (Ukrainian)
-
-nplurals=3 # Ukrainian language has 3 forms:
-           # 1 singular and 2 plurals
-
-# Determine plural_id for number *n* as sequence of positive
-# integers: 0,1,...
-# NOTE! For singular form ALWAYS return plural_id = 0
-get_plural_id = lambda n: (0 if n % 10 == 1 and n % 100 != 11 else
-                           1 if n % 10 >= 2 and n % 10 <= 4 and
-                               (n % 100 < 10 or n % 100 >= 20) else
-                           2)
-
-# construct_plural_form() is not used now because of complex
-# rules of Ukrainian language. Default version of
-# this function is used to simple insert new words into
-# plural_dict dictionary)
-# construct_plural_form = lambda word, plural_id: word
-

gluon/contrib/rules/plural_rules-zh.py

@@ -1,14 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf8 -*-
-# Plural-Forms for zh (Chinese)
-
-nplurals=1  # Chinese language has ONE form!
-
-# Always returns 0:
-get_plural_id = lambda n: 0
-
-# Construct and return plural form of *word* using
-# *plural_id* (which ALWAYS>0). This function will be executed
-# for words (or phrases) not found in plural_dict dictionary
-# construct_plural_form = lambda word, plural_id: word
-

gluon/languages.py

@@ -12,6 +12,7 @@ Plural subsystem is created by Vladyslav Kozlovskyy (Ukraine)
 
 import os
 import re
+import pkgutil
 from utf8 import Utf8
 from cgi import escape
 import portalocker
@@ -82,7 +83,6 @@ regex_backslash = re.compile(r"\\([\\{}%])")
 regex_plural = re.compile('%({.+?})')
 regex_plural_dict = re.compile('^{(?P<w>[^()[\]][^()[\]]*?)\((?P<n>[^()\[\]]+)\)}$')  # %%{word(varname or number)}
 regex_plural_tuple = re.compile('^{(?P<w>[^[\]()]+)(?:\[(?P<i>\d+)\])?}$') # %%{word[index]} or %%{word}
-regex_plural_rules = re.compile('^plural_rules-[a-zA-Z]{2}(-[a-zA-Z]{2})?\.py$')
 
 # UTF8 helper functions
 def upper_fun(s):
@@ -215,48 +215,23 @@ def read_possible_languages(appdir):
         langs['en'] = ('en', 'English', 0)
     return langs
 
-def read_global_plural_rules(filename):
-    """
-    retrieve plural rules from rules/*plural_rules-lang*.py file.
-
-    args:
-        filename (str): plural_rules filename
-
-    returns:
-        (nplurals, get_plural_id, construct_plural_form, status)
-        e.g.: (3, <function>, <function>, ok)
-    """
-    env = {}
-    data = portalocker.read_locked(filename)
-    try:
-        exec(data) in env
-        status='ok'
-    except Exception, e:
-        status='Syntax error in %s (%s)' % (filename, e)
-        logging.error(status)
-    nplurals = env.get('nplurals', DEFAULT_NPLURALS)
-    get_plural_id = env.get('get_plural_id', DEFAULT_GET_PLURAL_ID)
-    construct_plural_form = env.get('construct_plural_form',
-                                    DEFAULT_CONSTRUCTOR_PLURAL_FORM)
-    return (nplurals, get_plural_id, construct_plural_form, status)
-
-
 def read_possible_plurals():
     """
     create list of all possible plural rules files
     result is cached to increase speed
     """
-    pdir = pjoin(pdirname(__file__),'contrib','rules')
+    import gluon.contrib.plural_rules as package
     plurals = {}
-    # scan rules directory for plural_rules-*.py files:
+    for importer, modname, ispkg in pkgutil.iter_modules(package.__path__):
-    if os.path.exists(pdir):
+        if len(modname)==2:
-        for pname in os.listdir(pdir):
+            module = __import__(package.__name__+'.'+modname)
-            if not isdir(pname) and regex_plural_rules.match(pname):
+            lang = modname
-                lang = pname[13:-3]
+            pname = modname+'.py'
-                fname = ospath.join(pdir, pname)
+            nplurals = getattr(module,'nplurals', DEFAULT_NPLURALS)
-                n, f1, f2, status = read_global_plural_rules(fname)
+            get_plural_id = getattr(module,'get_plural_id', DEFAULT_GET_PLURAL_ID)
-                if status == 'ok':
+            construct_plural_form = getattr(module,'construct_plural_form',
-                    plurals[lang] = (lang, n, f1, f2, pname)
+                                            DEFAULT_CONSTRUCTOR_PLURAL_FORM)
+            plurals[lang] = (lang, nplurals, get_plural_id, construct_plural_form, pname)
     plurals['default'] = ('default',
                           DEFAULT_NPLURALS,
                           DEFAULT_GET_PLURAL_ID,