From cd299435e926c1a48fe5bbf0eb305f751fce1b7e Mon Sep 17 00:00:00 2001
From: Mathias <Mathias@DESKTOP-9Q8GLHR.local>
Date: Thu, 14 Dec 2017 10:21:26 +0100
Subject: [PATCH] Python 3.6

---
 .travis.yml                                  | 2 +-
 muk_web_preview_mail/__init__.py             | 2 +-
 muk_web_preview_mail/controllers/main.py     | 4 +---
 muk_web_preview_msoffice/__init__.py         | 2 +-
 muk_web_preview_msoffice/controllers/main.py | 4 +---
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ae46418..aed564b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: python
 
 python:
-  - "2.7"
+  - "3.6"
  
 notifications:
   email: false
diff --git a/muk_web_preview_mail/__init__.py b/muk_web_preview_mail/__init__.py
index 3c3d6e6..8cfb4c9 100644
--- a/muk_web_preview_mail/__init__.py
+++ b/muk_web_preview_mail/__init__.py
@@ -19,4 +19,4 @@
 #
 ###################################################################################
 
-import controllers
\ No newline at end of file
+from . import controllers
\ No newline at end of file
diff --git a/muk_web_preview_mail/controllers/main.py b/muk_web_preview_mail/controllers/main.py
index 58179a9..61833b6 100644
--- a/muk_web_preview_mail/controllers/main.py
+++ b/muk_web_preview_mail/controllers/main.py
@@ -24,14 +24,12 @@ import json
 import email
 import base64
 import urllib
-import urllib2
 import logging
-import urlparse
-import cStringIO
 import mimetypes
 import collections
 
 import werkzeug.exceptions
+from urllib.parse import urlparse
 
 from odoo import _
 from odoo import tools
diff --git a/muk_web_preview_msoffice/__init__.py b/muk_web_preview_msoffice/__init__.py
index 3c3d6e6..8cfb4c9 100644
--- a/muk_web_preview_msoffice/__init__.py
+++ b/muk_web_preview_msoffice/__init__.py
@@ -19,4 +19,4 @@
 #
 ###################################################################################
 
-import controllers
\ No newline at end of file
+from . import controllers
\ No newline at end of file
diff --git a/muk_web_preview_msoffice/controllers/main.py b/muk_web_preview_msoffice/controllers/main.py
index f8ff0e3..ba84534 100644
--- a/muk_web_preview_msoffice/controllers/main.py
+++ b/muk_web_preview_msoffice/controllers/main.py
@@ -25,16 +25,14 @@ import json
 import uuid
 import base64
 import urllib
-import urllib2
 import logging
 import tempfile
-import urlparse
-import cStringIO
 import mimetypes
 import collections
 
 import werkzeug.exceptions
 from contextlib import closing
+from urllib.parse import urlparse
 
 from odoo import _
 from odoo import tools