Merge pull request #1 from katyukha/dev

Release 0.8.1
=============

- Fix local connector for odoo-9.0 when odoo.py is on python path

.travis.yml

@@ -61,31 +61,32 @@ matrix:
                ODOO_PACKAGE="openerp"
                ODOO_TEST_PROTOCOL='local'
                WITH_SUDO="sudo"
-               ODOO_TEST_LOCAL_ARGS="['-c', '/etc/openerp/openerp-server.conf']"
+               OPENERP_SERVER='/etc/openerp/openerp-server.conf'
 
         - python: 2.7
           env: ODOO_VERSION="8.0"
                ODOO_RELEASE="8.0"
                ODOO_PACKAGE="odoo"
                ODOO_TEST_PROTOCOL='local'
                WITH_SUDO="sudo"
-               ODOO_TEST_LOCAL_ARGS="['-c', '/etc/odoo/openerp-server.conf']"
+               OPENERP_SERVER='/etc/odoo/openerp-server.conf'
 
         - python: 2.7
           env: ODOO_VERSION="9.0"
                ODOO_RELEASE="9.0"
                ODOO_PACKAGE="odoo"
                ODOO_TEST_PROTOCOL='local'
                WITH_SUDO="sudo"
-               ODOO_TEST_LOCAL_ARGS="['-c', '/etc/odoo/openerp-server.conf']"
+               OPENERP_SERVER='/etc/odoo/openerp-server.conf'
 
         - python: 2.7
           env: ODOO_VERSION="10.0"
                ODOO_RELEASE="10.0"
                ODOO_PACKAGE="odoo"
                ODOO_TEST_PROTOCOL='local'
                WITH_SUDO="sudo"
-               ODOO_TEST_LOCAL_ARGS="['-c', '/etc/odoo/odoo.conf']"
+               OPENERP_SERVER='/etc/odoo/odoo.conf'
+               ODOO_RC='/etc/odoo/odoo.conf'
 
 
 install:

CHANGELOG.rst

@@ -1,6 +1,12 @@
 Last changes
 ============
 
+Release 0.8.1
+=============
+
+- Fix local connector for odoo-9.0 when odoo.py is on python path
+
+
 Big split: odoo_rpc_client 0.8.0
 =============================
 

odoo_rpc_client/connection/local.py

@@ -114,6 +114,7 @@ def _start_odoo_services(self):
         try:
             # Odoo 10.0+
             import odoo
+            import odoo.release  # to avoid 9.0 with odoo.py on path
         except ImportError:
             try:
                 # Odoo 9.0 and less versions

odoo_rpc_client/utils.py

@@ -1,5 +1,4 @@
 # -*- encoding: utf-8 -*-
-import os
 import six
 import functools
 
@@ -8,17 +7,8 @@
            'DirMixIn',
            'UConverter',
            'wpartial',
-           'makedirs',
-           'xinput',
            )
 
-
-# Python 2/3 workaround in raw_input
-try:
-    xinput = raw_input
-except NameError:
-    xinput = input
-
 # Check if anyfield is installed
 # and import function which converts SField instances to functions
 try:
@@ -28,17 +18,6 @@ def normalizeSField(fn):
         return fn
 
 
-def makedirs(path):
-    """ os.makedirs wrapper. No errors raised if directory already exists
-
-        :param str path: directory path to create
-    """
-    try:
-        os.makedirs(path)
-    except os.error:
-        pass
-
-
 def wpartial(func, *args, **kwargs):
     """Wrapped partial, same as functools.partial decorator,
        but also calls functools.wrap on its result thus shwing correct

odoo_rpc_client/version.py

@@ -1 +1 @@
-version = "0.8.0"  # pragma: no cover
+version = "0.8.1"  # pragma: no cover