Skip to content

Commit

Permalink
Merge pull request #2 from zopefoundation/less-dependencies
Browse files Browse the repository at this point in the history
Removing zope.app.appsetup as a dependency

There was no objections, so I'm merging.
  • Loading branch information
regebro committed Feb 18, 2016
2 parents 6974379 + 87cc36e commit 4c5157c
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CHANGES.txt
Expand Up @@ -7,7 +7,7 @@ CHANGES

- Added a test for the zcml_extraction.

- Remove the zope.app.applicationcontrol dependency.
- Remove zope.app.applicationcontrol and zope.app.appsetup dependencies.


3.7.4 (2012-05-14)
Expand Down
1 change: 0 additions & 1 deletion setup.py
Expand Up @@ -74,7 +74,6 @@ def read(*rnames):
],
extract=[
'zope.tal',
'zope.app.appsetup',
],
),
include_package_data = True,
Expand Down
10 changes: 8 additions & 2 deletions src/zope/app/locales/extract.py
Expand Up @@ -483,8 +483,14 @@ def py_strings(dir, domain="zope", exclude=(), verify_domain=False):
def zcml_strings(dir, domain="zope", site_zcml=None):
"""Retrieve all ZCML messages from `dir` that are in the `domain`.
"""
from zope.app.appsetup import config
context = config(site_zcml, features=("devmode",), execute=False)
from zope.configuration import xmlconfig, config

# Load server-independent site config
context = config.ConfigurationMachine()
xmlconfig.registerCommonDirectives(context)
context.provideFeature("devmode")
context = xmlconfig.file(site_zcml, context=context, execute=False)

return context.i18n_strings.get(domain, {})

def tal_strings(dir,
Expand Down

0 comments on commit 4c5157c

Please sign in to comment.