diff --git a/server_environment/__init__.py b/server_environment/__init__.py
index 765b02b..8e7cc35 100644
--- a/server_environment/__init__.py
+++ b/server_environment/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    Adapted by Nicolas Bessi. Copyright Camptocamp SA
diff --git a/server_environment/__manifest__.py b/server_environment/__manifest__.py
index 33cc3a9..9923ba9 100644
--- a/server_environment/__manifest__.py
+++ b/server_environment/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    Adapted by Nicolas Bessi. Copyright Camptocamp SA
@@ -21,7 +20,7 @@
 
 {
     "name": "server configuration environment files",
-    "version": "10.0.1.2.0",
+    "version": "11.0.1.0.0",
     "depends": ["base", "server_environment_files"],
     "author": "Camptocamp,Odoo Community Association (OCA)",
     "summary": "move some configurations out of the database",
diff --git a/server_environment/serv_config.py b/server_environment/serv_config.py
index ec49f99..c357149 100644
--- a/server_environment/serv_config.py
+++ b/server_environment/serv_config.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    Adapted by Nicolas Bessi. Copyright Camptocamp SA
@@ -20,7 +19,7 @@
 ##############################################################################
 
 import os
-import ConfigParser
+import configparser
 from lxml import etree
 from itertools import chain
 
@@ -91,7 +90,7 @@ def _load_config():
     else:
         conf_files = _listconf(running_env)
 
-    config_p = ConfigParser.SafeConfigParser()
+    config_p = configparser.SafeConfigParser()
     # options are case-sensitive
     config_p.optionxform = str
     try:
@@ -144,9 +143,9 @@ class ServerConfiguration(models.TransientModel):
     def _add_columns(cls):
         """Add columns to model dynamically"""
         cols = chain(
-            cls._get_base_cols().items(),
-            cls._get_env_cols().items(),
-            cls._get_system_cols().items()
+            list(cls._get_base_cols().items()),
+            list(cls._get_env_cols().items()),
+            list(cls._get_system_cols().items())
         )
         for col, value in cols:
             col_name = col.replace('.', '_')
@@ -159,7 +158,7 @@ class ServerConfiguration(models.TransientModel):
     def _get_base_cols(cls):
         """ Compute base fields"""
         res = {}
-        for col, item in system_base_config.options.items():
+        for col, item in list(system_base_config.options.items()):
             key = cls._format_key('odoo', col)
             res[key] = item
         return res
@@ -199,8 +198,7 @@ class ServerConfiguration(models.TransientModel):
     @classmethod
     def _build_osv(cls):
         """Build the view for the current configuration."""
-        arch = ('<?xml version="1.0" encoding="utf-8"?>'
-                '<form string="Configuration Form">'
+        arch = ('<form string="Configuration Form">'
                 '<notebook colspan="4">')
 
         # Odoo server configuration
diff --git a/server_environment/system_info.py b/server_environment/system_info.py
index 42362fb..9ccc5bc 100644
--- a/server_environment/system_info.py
+++ b/server_environment/system_info.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    Adapted by Nicolas Bessi. Copyright Camptocamp SA
diff --git a/server_environment/tests/__init__.py b/server_environment/tests/__init__.py
index 101c6e5..990f3cb 100644
--- a/server_environment/tests/__init__.py
+++ b/server_environment/tests/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    Author: Nicolas Bessi
diff --git a/server_environment/tests/test_server_environment.py b/server_environment/tests/test_server_environment.py
index 52eec34..012f93d 100644
--- a/server_environment/tests/test_server_environment.py
+++ b/server_environment/tests/test_server_environment.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    Author: Nicolas Bessi