equal
deleted
inserted
replaced
229 key. |
229 key. |
230 """ |
230 """ |
231 cwconfig = config.registry.get('cubicweb.config') |
231 cwconfig = config.registry.get('cubicweb.config') |
232 repo = config.registry.get('cubicweb.repository') |
232 repo = config.registry.get('cubicweb.repository') |
233 |
233 |
|
234 config.include('cubicweb.pyramid.rest_api') |
|
235 |
234 if repo is not None: |
236 if repo is not None: |
235 if cwconfig is None: |
237 if cwconfig is None: |
236 config.registry['cubicweb.config'] = cwconfig = repo.config |
238 config.registry['cubicweb.config'] = cwconfig = repo.config |
237 elif cwconfig is not repo.config: |
239 elif cwconfig is not repo.config: |
238 raise ConfigurationError( |
240 raise ConfigurationError( |