[IMP] cleanup code and missing imports

bzr revid: xmo@openerp.com-20120117093548-ict3fbm3pgw83fkb

addons/web/__init__.py

@@ -1,7 +1,6 @@
 import common
 import controllers
 import logging
-import optparse
 
 _logger = logging.getLogger(__name__)
 

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

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