diff options
| author | Raphael Collet <rco@openerp.com> | 2012-12-18 09:59:14 +0100 |
|---|---|---|
| committer | Raphael Collet <rco@openerp.com> | 2012-12-18 09:59:14 +0100 |
| commit | 73980eba5f64c674b0bc366c714a9a38d3bb915a (patch) | |
| tree | fce41f64e3309f05aa0a33eae1395b445c389a41 /addons/document_webdav/webdav.py | |
| parent | 57acd22a0077feeae6261aae617ad9ad0a3be36d (diff) | |
| parent | 0cc0dfb8cf8d26c1029d02b7377226809821dc9b (diff) | |
[MERGE] trunk-import-openerp-thu (use strict naming convention when importing openerp stuff)
bzr revid: rco@openerp.com-20121218085914-qzr2upqfxmfbzfsx
Diffstat (limited to 'addons/document_webdav/webdav.py')
| -rw-r--r-- | addons/document_webdav/webdav.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/document_webdav/webdav.py b/addons/document_webdav/webdav.py index f7780883bda..aedad059c16 100644 --- a/addons/document_webdav/webdav.py +++ b/addons/document_webdav/webdav.py @@ -29,8 +29,8 @@ from xml.dom.minicompat import StringTypes import urlparse import urllib -from osv import osv -from tools.translate import _ +from openerp.osv import osv +from openerp.tools.translate import _ try: from pywebdav.lib import utils @@ -41,7 +41,7 @@ except ImportError: from DAV.propfind import PROPFIND from DAV.report import REPORT -import tools +from openerp import tools class Text2(xml.dom.minidom.Text): def writexml(self, writer, indent="", addindent="", newl=""): |