summaryrefslogtreecommitdiff
path: root/addons/google_docs/google_docs.py
diff options
context:
space:
mode:
authorVidhin Mehta (OpenERP) <vme@tinyerp.com>2012-12-13 16:48:30 +0530
committerVidhin Mehta (OpenERP) <vme@tinyerp.com>2012-12-13 16:48:30 +0530
commit672883fd608ae893e33ff5f63d572bf353b81bb5 (patch)
tree918390f7cba13156c96424d9cf87067f3322707e /addons/google_docs/google_docs.py
parentd4023e09337c93c8f763e5a5f701a409c8b4a48f (diff)
parent4f880230a9126c22d33e2167815a39fc6a2c6c33 (diff)
[MERGE]Trunk
bzr revid: vme@tinyerp.com-20121213111830-uxvy8c6ttrlsonyv
Diffstat (limited to 'addons/google_docs/google_docs.py')
-rw-r--r--addons/google_docs/google_docs.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 462c8240810..1f6af0378ca 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -17,10 +17,15 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
+import logging
from datetime import datetime
+
from tools import DEFAULT_SERVER_DATETIME_FORMAT
from osv import osv, fields
from tools.translate import _
+
+_logger = logging.getLogger(__name__)
+
try:
import gdata.docs.data
import gdata.docs.client
@@ -29,8 +34,6 @@ try:
import gdata.auth
from gdata.docs.data import Resource
except ImportError:
- import logging
- _logger = logging.getLogger(__name__)
_logger.warning("Please install latest gdata-python-client from http://code.google.com/p/gdata-python-client/downloads/list")
class google_docs_ir_attachment(osv.osv):