# HG changeset patch
# User Nicolas Chauvat <nicolas.chauvat@logilab.fr>
# Date 1369323176 -7200
# Node ID 8742f4bf029f5d39e552f815cb56affe33471744
# Parent  6cd9127022396a8cd41993cf6cc5d4d99be6ce41
import merge_options directly from logilab.common

diff -r 6cd912702239 -r 8742f4bf029f etwist/twconfig.py
--- a/etwist/twconfig.py	Fri May 24 15:10:50 2013 +0200
+++ b/etwist/twconfig.py	Thu May 23 17:32:56 2013 +0200
@@ -28,10 +28,10 @@
 
 from os.path import join
 
-from logilab.common.configuration import Method
+from logilab.common.configuration import Method, merge_options
 
 from cubicweb.cwconfig import CONFIGURATIONS
-from cubicweb.web.webconfig import WebConfiguration, merge_options
+from cubicweb.web.webconfig import WebConfiguration
 
 
 class TwistedConfiguration(WebConfiguration):
diff -r 6cd912702239 -r 8742f4bf029f server/serverconfig.py
--- a/server/serverconfig.py	Fri May 24 15:10:50 2013 +0200
+++ b/server/serverconfig.py	Thu May 23 17:32:56 2013 +0200
@@ -27,7 +27,7 @@
 from logilab.common.decorators import wproperty, cached
 
 from cubicweb.toolsutils import read_config, restrict_perms_to_user
-from cubicweb.cwconfig import CONFIGURATIONS, CubicWebConfiguration, merge_options
+from cubicweb.cwconfig import CONFIGURATIONS, CubicWebConfiguration
 from cubicweb.server import SOURCE_TYPES
 
 
@@ -96,7 +96,7 @@
     cubicweb_appobject_path = CubicWebConfiguration.cubicweb_appobject_path | set(['sobjects', 'hooks'])
     cube_appobject_path = CubicWebConfiguration.cube_appobject_path | set(['sobjects', 'hooks'])
 
-    options = merge_options((
+    options = lgconfig.merge_options((
         # ctl configuration
         ('host',
          {'type' : 'string',
diff -r 6cd912702239 -r 8742f4bf029f server/sources/ldapfeed.py
--- a/server/sources/ldapfeed.py	Fri May 24 15:10:50 2013 +0200
+++ b/server/sources/ldapfeed.py	Thu May 23 17:32:56 2013 +0200
@@ -20,7 +20,8 @@
 import ldap
 from ldap.filter import filter_format
 
-from cubicweb.cwconfig import merge_options
+from logilab.common.configuration import merge_options
+
 from cubicweb.server.sources import datafeed
 from cubicweb.server import ldaputils, utils
 from cubicweb import Binary
diff -r 6cd912702239 -r 8742f4bf029f web/webconfig.py
--- a/web/webconfig.py	Fri May 24 15:10:50 2013 +0200
+++ b/web/webconfig.py	Thu May 23 17:32:56 2013 +0200
@@ -28,10 +28,11 @@
 
 from logilab.common.decorators import cached, cachedproperty
 from logilab.common.deprecation import deprecated
+from logilab.common.configuration import merge_options
 
 from cubicweb import ConfigurationError
 from cubicweb.toolsutils import read_config
-from cubicweb.cwconfig import CubicWebConfiguration, register_persistent_options, merge_options
+from cubicweb.cwconfig import CubicWebConfiguration, register_persistent_options
 
 
 register_persistent_options( (