etwist/twconfig.py
changeset 9252 01bca75ee8bd
parent 9251 e4d753c8b1c4
child 10224 996cf2c0ec99
child 10235 684215aca046
--- a/etwist/twconfig.py	Fri Jul 12 10:51:35 2013 +0200
+++ b/etwist/twconfig.py	Fri Jul 12 10:50:56 2013 +0200
@@ -34,7 +34,7 @@
 from cubicweb.web.webconfig import WebConfiguration
 
 
-class TwistedConfiguration(WebConfiguration):
+class WebConfigurationBase(WebConfiguration):
     """web instance (in a twisted web server) client of a RQL server"""
 
     options = merge_options((
@@ -109,14 +109,14 @@
 try:
     from cubicweb.server.serverconfig import ServerConfiguration
 
-    class AllInOneConfiguration(TwistedConfiguration, ServerConfiguration):
+    class AllInOneConfiguration(WebConfigurationBase, ServerConfiguration):
         """repository and web instance in the same twisted process"""
         name = 'all-in-one'
-        options = merge_options(TwistedConfiguration.options
+        options = merge_options(WebConfigurationBase.options
                                 + ServerConfiguration.options)
 
-        cubicweb_appobject_path = TwistedConfiguration.cubicweb_appobject_path | ServerConfiguration.cubicweb_appobject_path
-        cube_appobject_path = TwistedConfiguration.cube_appobject_path | ServerConfiguration.cube_appobject_path
+        cubicweb_appobject_path = WebConfigurationBase.cubicweb_appobject_path | ServerConfiguration.cubicweb_appobject_path
+        cube_appobject_path = WebConfigurationBase.cube_appobject_path | ServerConfiguration.cube_appobject_path
         def pyro_enabled(self):
             """tell if pyro is activated for the in memory repository"""
             return self['pyro-server']