diff options
| author | Xavier Morel <xmo@openerp.com> | 2012-01-17 10:35:48 +0100 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2012-01-17 10:35:48 +0100 |
| commit | e4697c48a1373837890a2f7dabb82cffe98cb7f0 (patch) | |
| tree | 59be519f0f7253c1ccff927038e38b6768270c16 /addons/web | |
| parent | 20e0358e9ce18ab27d6ea7e57a29f32d60eb793d (diff) | |
| parent | 4d208734ec79a5d2fc8e9a3c4507c517d19fb8e2 (diff) | |
[IMP] cleanup code and missing imports
bzr revid: xmo@openerp.com-20120117093548-ict3fbm3pgw83fkb
Diffstat (limited to 'addons/web')
| -rw-r--r-- | addons/web/__init__.py | 1 | ||||
| -rw-r--r-- | addons/web/common/nonliterals.py | 2 | ||||
| -rw-r--r-- | addons/web/common/xml2json.py | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/addons/web/__init__.py b/addons/web/__init__.py index b09c8c213bc..36dead8ab74 100644 --- a/addons/web/__init__.py +++ b/addons/web/__init__.py @@ -1,7 +1,6 @@ import common import controllers import logging -import optparse _logger = logging.getLogger(__name__) diff --git a/addons/web/common/nonliterals.py b/addons/web/common/nonliterals.py index f6e81894a4c..0f5248edf33 100644 --- a/addons/web/common/nonliterals.py +++ b/addons/web/common/nonliterals.py @@ -8,7 +8,7 @@ import binascii import hashlib import simplejson.encoder -__all__ = ['Domain', 'Context', 'NonLiteralEncoder, non_literal_decoder', 'CompoundDomain', 'CompoundContext'] +__all__ = ['Domain', 'Context', 'NonLiteralEncoder', 'non_literal_decoder', 'CompoundDomain', 'CompoundContext'] #: 48 bits should be sufficient to have almost no chance of collision #: with a million hashes, according to hg@67081329d49a diff --git a/addons/web/common/xml2json.py b/addons/web/common/xml2json.py index 1f2e74691b9..ab134b09786 100644 --- a/addons/web/common/xml2json.py +++ b/addons/web/common/xml2json.py @@ -3,6 +3,8 @@ # New BSD Licensed # # URL: http://code.google.com/p/xml2json-direct/ +import simplejson +from xml.etree import ElementTree class Xml2Json(object): @staticmethod |