From 4d208734ec79a5d2fc8e9a3c4507c517d19fb8e2 Mon Sep 17 00:00:00 2001
From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Mon, 16 Jan 2012 19:33:28 +0100
Subject: [PATCH] =?UTF-8?q?[FIX]=C2=A0missing=20imports=20and=20typo=20in?=
 =?UTF-8?q?=20=5F=5Fall=5F=5F.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

bzr revid: florent.xicluna@gmail.com-20120116183328-m9isnoipj8taeke3
---
 addons/web/__init__.py           | 1 -
 addons/web/common/nonliterals.py | 2 +-
 addons/web/common/xml2json.py    | 3 +++
 3 files changed, 4 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..d67d78480d4 100644
--- a/addons/web/common/xml2json.py
+++ b/addons/web/common/xml2json.py
@@ -3,6 +3,9 @@
 # New BSD Licensed
 #
 # URL: http://code.google.com/p/xml2json-direct/
+import simplejson
+from xml.etree import ElementTree
+
 
 class Xml2Json(object):
     @staticmethod