Upgrade to itools 0.16

Author: J. David Ibanez

.gitignore

@@ -0,0 +1,2 @@
+*.pyc
+*.swp

LanguageManager.py

@@ -19,8 +19,8 @@
 # Import from the Standard Library
 from urlparse import urlparse
 
-# Import itools modules
-from itools import i18n
+# Import from itools
+from itools.i18n import Multilingual, get_language_name, get_languages
 
 # Import from Zope
 from Globals import InitializeClass
@@ -31,7 +31,7 @@
 from utils import lang_negotiator
 
 
-class LanguageManager(i18n.Multilingual):
+class LanguageManager(Multilingual):
     """ """
 
     security = ClassSecurityInfo()
@@ -61,7 +61,7 @@ def get_language_name(self, id=None):
         """
         if id is None:
             id = self.get_default_language()
-        return i18n.get_language_name(id)
+        return get_language_name(id)
 
 
     security.declarePublic('get_available_languages')
@@ -96,7 +96,7 @@ def get_all_languages(self):
         """
         Returns all ISO languages, used by 'manage_languages'.
         """
-        return i18n.get_languages()
+        return get_languages()
 
 
     security.declareProtected('Manage languages', 'manage_addLanguage')

LocalContent.py

@@ -34,10 +34,9 @@
 from utils import _
 
 # Import from itools
-from itools.tmx.TMX import TMX, Sentence, Message
-from itools.xliff.XLIFF import XLIFF, Translation, File as xliff_File
-from itools.datatypes.languages import LanguageTag
-from itools.resources.memory import File as mFile
+from itools.datatypes import LanguageTag
+from itools.tmx import TMX, Sentence, Message
+from itools.xliff import XLIFF, Translation, File as xliff_File
 
 # Import from Python
 import md5
@@ -199,8 +198,8 @@ def tmx_import(self, file, REQUEST=None, RESPONSE=None):
         """ Imports a TMX level 1 file.
         """
         try:
-            f = mFile(file.read())
-            tmx = TMX(f)
+            data = file.read()
+            tmx = TMX(string=data)
         except:
             return MessageDialog(title = 'Parse error',
                                message = _('impossible to parse the file') ,
@@ -294,8 +293,8 @@ def xliff_import(self, file, REQUEST=None):
             It is specified by www.oasis-open.org
         """
         try:
-            f = mFile(file.read())
-            xliff = XLIFF(f)
+            data = file.read()
+            xliff = XLIFF(string=data)
         except:
             return MessageDialog(title = 'Parse error',
                                  message = _('impossible to parse the file') ,

LocalFiles.py

@@ -30,7 +30,7 @@
 
 # Import from itools
 from itools import get_abspath
-from itools.gettext import domains
+from itools.gettext import register_domain
 
 # Import Zope modules
 from Globals import DTMLFile
@@ -47,7 +47,7 @@ def __init__(self, name, _prefix=None, **kw):
 
         domain = get_abspath(_prefix, 'locale')
         self.class_domain = domain
-        domains.register_domain(domain, domain)
+        register_domain(domain, domain)
 
 
     def _exec(self, bound_data, args, kw):
@@ -80,7 +80,7 @@ def __init__(self, name, _prefix=None, **kw):
 
             domain = get_abspath(_prefix, 'locale')
             self.class_domain = domain
-            domains.register_domain(domain, domain)
+            register_domain(domain, domain)
 
 
         def _exec(self, bound_data, args, kw):

Localizer.py

@@ -19,7 +19,7 @@
 from urllib import unquote
 
 # Import from itools
-from itools import i18n
+from itools.i18n import get_language_name
 
 # Import from Zope
 from AccessControl import ClassSecurityInfo
@@ -219,7 +219,7 @@ def get_languages_map(self):
 
         langs = []
         for x in ob_languages:
-            langs.append({'id': x, 'title': i18n.get_language_name(x),
+            langs.append({'id': x, 'title': get_language_name(x),
                           'selected': x == ob_language})
 
         return langs

MessageCatalog.py

@@ -17,14 +17,12 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-
 """
 This module provides the MessageCatalog base class, which
 provides message catalogs for the web.
 """
 
-
-# Import from Python
+# Import from the Standard Library
 import base64, md5
 import codecs
 import re
@@ -37,13 +35,11 @@
 from cgi import escape
 
 # Import from itools
-from itools.resources import memory, get_resource
+from itools.datatypes import LanguageTag
 from itools.gettext import PO
-from itools.tmx.TMX import TMX, Sentence, Message, Note
-from itools.xliff.XLIFF import XLIFF, Translation
-from itools.xliff.XLIFF import Note as xliff_Note, File as xliff_File
-from itools.resources.memory import File as mFile
-from itools.datatypes.languages import LanguageTag
+from itools.tmx import TMX, Sentence, Message, Note
+from itools.xliff import XLIFF, Translation, Note as xliff_Note, \
+    File as xliff_File
 
 # Import from Zope
 from AccessControl import ClassSecurityInfo
@@ -560,10 +556,8 @@ def po_import(self, lang, data):
         """ """
         messages = self._messages
 
-        resource = memory.File(data)
-        po = PO.PO(resource)
-
         # Load the data
+        po = PO(string=data)
         for msgid in po.get_msgids():
             if msgid:
                 msgstr = po.get_msgstr(msgid) or ''
@@ -672,8 +666,8 @@ def tmx_import(self, howmuch, file, REQUEST=None, RESPONSE=None):
         """ Imports a TMX level 1 file.
         """
         try:
-            f = mFile(file.read())
-            tmx = TMX(f)
+            data = file.read()
+            tmx = TMX(string=data)
         except:
             return MessageDialog(title = 'Parse error',
                                  message = _('impossible to parse the file') ,
@@ -794,8 +788,8 @@ def xliff_import(self, howmuch, file, REQUEST=None):
             It is specified by www.oasis-open.org
         """
         try:
-            f = mFile(file.read())
-            xliff = XLIFF(f)
+            data = file.read()
+            xliff = XLIFF(string=data)
         except:
             return MessageDialog(title = 'Parse error',
                                  message = _('impossible to parse the file') ,

README.txt

@@ -11,7 +11,7 @@ Requirements
 
   - Zope 2.9 or later
 
-  - itools 0.13.10 or later (download from http://www.ikaaro.org/itools)
+  - itools 0.16.10 or later (download from http://www.ikaaro.org/itools)
 
 
 Installation
@@ -55,7 +55,7 @@ Examples of sites powered by Localizer
 
 Author and License
 
-  Copyright 2001-2006  J. David Ib��ez ([email protected])
+  Copyright 2001-2007  J. David Ib��ez ([email protected])
             2001 Universitat Jaume I
 
   This program is free software; you can redistribute it and/or

TODO.txt

@@ -93,8 +93,6 @@ User Interface (ZMI)
 Standards Support
 -----------------
 
- - Move TMX and XLIFF code to itools.
-
  - Support fuzzy in "itools.handlers.PO".
 
  - Use the library libgettextpo introduced in gettext 0.12 to parse the

__init__.py

@@ -15,12 +15,16 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-# First check wether itools is installed
+# Check whether itools is installed
+msg = ('itools 0.16 or later is needed, download from '
+       'http://www.ikaaro.org/itools')
 try:
     import itools
 except ImportError:
-    raise ImportError, ('itools is not installed, download from'
-                        ' http://www.ikaaro.org/itools')
+    raise ImportError, msg
+# Check itools is version 0.16 or later
+if itools.__version__ < '0.16':
+    raise ImportError, msg
 
 # Import from the Standard Library
 import os.path

patches.py

@@ -27,7 +27,7 @@
 from thread import allocate_lock, get_ident
 
 # Import from itools
-from itools.i18n.accept import AcceptCharset, AcceptLanguage
+from itools.i18n import AcceptLanguageType
 
 # Import from Zope
 import Globals
@@ -155,20 +155,15 @@ def patchedStringIO(self):
 
 # PATCH 3: Accept
 #
-# Adds the variables AcceptLanguage and AcceptCharset to the REQUEST.
-# They provide a higher level interface than HTTP_ACCEPT_LANGUAGE and
-# HTTP_ACCEPT_CHARSET.
+# Adds the variable AcceptLanguage to the REQUEST.  It provides a higher
+# level interface than HTTP_ACCEPT_LANGUAGE.
 
 # Apply the patch
 def new_processInputs(self):
     HTTPRequest.old_processInputs(self)
 
     request = self
 
-    # Set the AcceptCharset variable
-##    accept = request['HTTP_ACCEPT_CHARSET']
-##    self.other['AcceptCharset'] = AcceptCharset(accept)
-
     # Set the AcceptLanguage variable
     # Initialize with the browser configuration
     accept_language = request['HTTP_ACCEPT_LANGUAGE']
@@ -183,8 +178,7 @@ def new_processInputs(self):
             q = q/2
         accept_language = ','.join(langs)
 
-    accept_language = AcceptLanguage(accept_language)
-
+    accept_language = AcceptLanguageType.decode(accept_language)
     self.other['AcceptLanguage'] = accept_language
 
 

utils.py

@@ -17,8 +17,8 @@
 
 # Import from itools
 from itools import get_abspath
-from itools.i18n.accept import AcceptLanguage
-from itools.gettext import domains
+from itools.i18n import AcceptLanguageType
+from itools.gettext import register_domain, DomainAware as BaseDomainAware
 
 # Import from Zope
 from Globals import package_home
@@ -65,12 +65,12 @@ def lang_negotiator(available_languages):
 # Provide an API to access translations stored as MO files in the 'locale'
 # directory. This code has been moved from Localizer.
 
-class DomainAware(domains.DomainAware):
+class DomainAware(BaseDomainAware):
 
     def select_language(cls, languages):
         request = get_request()
         accept = request.get_header('accept-language', default='')
-        accept = AcceptLanguage(accept)
+        accept = AcceptLanguageType.decode(accept)
         return accept.select_language(languages)
 
     select_language = classmethod(select_language)
@@ -81,7 +81,7 @@ class translation(DomainAware):
     def __init__(self, namespace):
         domain = get_abspath(namespace, 'locale')
         self.class_domain = domain
-        domains.register_domain(domain, domain)
+        register_domain(domain, domain)
 
 
     def __call__(self, message, language=None):

zgettext.py

@@ -42,7 +42,7 @@
 
 # Import from itools
 from itools.handlers import get_handler
-from itools.gettext.PO import PO
+from itools.gettext import PO