odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Corrected indentation. 

bzr revid: nicolas.vanhoren@openerp.com-20110308145530-rdy43672n558kq5s
This commit is contained in:
niv-openerp 2011-03-08 15:55:30 +01:00
parent adc6decdb5
commit 747783efea
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/base/controllers/main.py
View File

@ -41,7 +41,7 @@ class Xml2Json:
for kid in el:
kids.append(Xml2Json.convert_element(kid))
if kid.tail and (not skip_whitespaces or kid.tail.strip() != ''):
kids.append(kid.tail)
kids.append(kid.tail)
if len(kids):
res["children"] = kids
return res

12
openerpweb/xmlrpctimeout.py
View File

@ -3,14 +3,14 @@ import httplib
import socket
class TimeoutHTTPConnection(httplib.HTTPConnection):
def connect(self):
httplib.HTTPConnection.connect(self)
self.sock.settimeout(self.timeout)
def connect(self):
httplib.HTTPConnection.connect(self)
self.sock.settimeout(self.timeout)
class TimeoutHTTP(httplib.HTTP):
_connection_class = TimeoutHTTPConnection
def set_timeout(self, timeout):
self._conn.timeout = timeout
_connection_class = TimeoutHTTPConnection
def set_timeout(self, timeout):
self._conn.timeout = timeout
class TimeoutTransport(xmlrpclib.Transport):
def __init__(self, timeout=10, *l, **kw):