diff options
| author | Anand Patel (OpenERP) <pan@tinyerp.com> | 2012-12-10 11:44:20 +0530 |
|---|---|---|
| committer | Anand Patel (OpenERP) <pan@tinyerp.com> | 2012-12-10 11:44:20 +0530 |
| commit | 524da44d8e91bff2a06b3f66cf0e82b03aca3fd1 (patch) | |
| tree | 789ff0eb2076d8313e1e0334b94335a26cff2870 /addons/google_docs/google_docs.py | |
| parent | b47cf7f0ac71f6ab2fd66e206e9fb84100f1b26b (diff) | |
| parent | 7f1d5daf2f7a137a470a4a72779408edf7995910 (diff) | |
[MERGE]Merged with latest trunk
bzr revid: pan@tinyerp.com-20121210061420-38p68a9jg2u0vjrx
Diffstat (limited to 'addons/google_docs/google_docs.py')
| -rw-r--r-- | addons/google_docs/google_docs.py | 7 |
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): |