summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-04-12omg how embarrassing, forgot to run tests before merging the request ↵Chris McDonough
subclass fix branch
2015-04-12add change note related to #1529Chris McDonough
2015-04-12Merge branch 'bertjwregeer-bug/request_subclassing'Chris McDonough
2015-04-12merge master back into this PR branchChris McDonough
2015-04-06Merge branch 'fix.view-lookup'Chris McDonough
2015-04-06change excview_tween to use _call_view instead of adapters.lookup; ↵Chris McDonough
parameterize _call_view and _find_views to cope
2015-04-06add comment about not changing view_execution_permitted use of .lookup for ↵Chris McDonough
view finding
2015-04-06convert render_view_to_response to use _call_viewChris McDonough
2015-04-06break out _call_view into separate importable callable for use in scriptsChris McDonough
2015-04-06use _find_views instead of lookup in proutesChris McDonough
2015-04-06unused importsChris McDonough
2015-04-06use _find_views in pviewsChris McDonough
2015-04-03no need to iter() the resultChris McDonough
2015-04-03Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-04-03cache view lookups; see #1557Chris McDonough
2015-04-02Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-03-30Merge pull request #1622 from stevepiercy/masterSteve Piercy
remove italics from internal references
2015-03-30remove italics from internal referencesSteve Piercy
2015-03-26fix out of date match_param docsMichael Merickel
2015-03-25Merge pull request #1619 from stevepiercy/masterSteve Piercy
Add a badge and link for latest documentation to complement master
2015-03-25Add a badge and link for latest documentation to complement masterSteve Piercy
2015-03-21Merge pull request #1615 from stevepiercy/masterSteve Piercy
update pylons sphinx theme on master branch, too
2015-03-21update pylons sphinx theme on master branch, tooSteve Piercy
2015-03-15be more specific about the append_slash feature additionChris McDonough
2015-03-15Merge branch 'dstufft-custom-append-slash-redirect'Chris McDonough
2015-03-15Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-03-15add docs to notfound_view_config decorator code, expand docs to inlcude an ↵Chris McDonough
example
2015-03-15Merge branch 'custom-append-slash-redirect' of ↵Chris McDonough
https://github.com/dstufft/pyramid into dstufft-custom-append-slash-redirect
2015-03-15Add myself to CONTRIBUTORS.txtDonald Stufft
2015-03-15Allow passing a custom redirect class for appending slashesDonald Stufft
2015-03-13Merge pull request #1607 from ledmonster/fix-forbidden_view_config-commentTres Seaver
fix comment in forbidden_view_config
2015-03-13fix comment in forbidden_view_configJunya Hayashi
2015-03-13Update code exampleSteve Piercy
Modify `lines` to include closing parens in source and update corresponding `emphasize-lines`. Closes #1606.
2015-03-11fix merge conflicts after merging master to fix.view-lookup branch; do the ↵Chris McDonough
merge to see diffs more clearly
2015-03-08Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2015-03-05Merge pull request #1471 from Pylons/feature.py3-coverageMichael Merickel
update tox/travis to check code coverage on py3
2015-03-05Merge pull request #1575 from Pylons/fix.shared-view-rendererMichael Merickel
clone a new RendererHelper per request
2015-03-05add clone to the IRendererInfo interfaceMichael Merickel
2015-03-05Merge branch 'master' into fix.shared-view-rendererMichael Merickel
2015-02-24Merge pull request #1592 from davisagli/fix.reloader-non-ttyMichael Merickel
only reset terminal echo flag if stdin is a tty
2015-02-24update changelogDavid Glick
2015-02-24only reset terminal echo flag if stdin is a ttyDavid Glick
2015-02-22remove tuple creation from inner loopMichael Merickel
2015-02-22ignore new .eggs folder created by "setup.py test" depsMichael Merickel
2015-02-22Merge pull request #1563 from Pylons/fix.idempotent-render-to-responseMichael Merickel
update render_to_response to prevent renderers from mutating request.response
2015-02-20dump xunit for py2/py3 targetsMichael Merickel
2015-02-20split out targets for py2-cover and py3-cover and add docs buildingMichael Merickel
2015-02-20Merge branch 'master' into feature.py3-coverageMichael Merickel
2015-02-19Merge pull request #1587 from msabramo/fix_asset_override_with_packageMichael Merickel
Fix asset override with package
2015-02-19Fix asset override with packageMarc Abramowitz
`AssetsConfiguratorMixin.override_asset` does: ```python __import__(override_package) to_package = sys.modules[override_package] override_source = PackageAssetSource(to_package, override_prefix) ``` so it's assuming that the `package` argument to `PackageAssetSource.__init__` takes a module object. But then `PackageAssetSource` had a bunch of methods that did stuff like: - `pkg_resources.resource_exists(self.package, path)` - `pkg_resources.resource_filename(self.package, path)` - `pkg_resources.resource_stream(self.package, path)` and all these `pkg_resources` functions need their `package_or_requirement` argument to be a **string**; not a module - see https://pythonhosted.org/setuptools/pkg_resources.html#basic-resource-access, which says: > the `package_or_requirement argument` may be either a Python package/module > name (e.g. `foo.bar`) or a `Requirement` instance. This causes errors when overriding assets -- e.g.: I am using Kotti and Kotti has this code (https://github.com/Kotti/Kotti/blob/master/kotti/__init__.py#L251): ```python for override in [a.strip() for a in settings['kotti.asset_overrides'].split() if a.strip()]: config.override_asset(to_override='kotti', override_with=override) ``` A Kotti add-on called kotti_navigation does this (https://github.com/Kotti/kotti_navigation/blob/master/kotti_navigation/__init__.py#L12): ```python settings['kotti.asset_overrides'] += ' kotti_navigation:kotti-overrides/' ``` The above code is all legit as far as I can tell and it works fine in pyramid 1.5.2, but it fails with pyramid master with the following: ```pytb File "/Users/marca/python/virtualenvs/kotti_inventorysvc/lib/python2.7/site-packages/pkg_resources.py", line 959, in resource_filename self, resource_name File "/Users/marca/dev/git-repos/pyramid/pyramid/config/assets.py", line 31, in get_resource_filename filename = overrides.get_filename(resource_name) File "/Users/marca/dev/git-repos/pyramid/pyramid/config/assets.py", line 125, in get_filename result = source.get_filename(path) File "/Users/marca/dev/git-repos/pyramid/pyramid/config/assets.py", line 224, in get_filename if pkg_resources.resource_exists(self.package, path): File "/Users/marca/python/virtualenvs/kotti_inventorysvc/lib/python2.7/site-packages/pkg_resources.py", line 948, in resource_exists return get_provider(package_or_requirement).has_resource(resource_name) File "/Users/marca/python/virtualenvs/kotti_inventorysvc/lib/python2.7/site-packages/pkg_resources.py", line 225, in get_provider __import__(moduleOrReq) TypeError: __import__() argument 1 must be string, not module ``` This was a little tricky to resolve because the `override_asset` function wants to pass a module object to `PackageAssetSource.__init__`, but there are a number of tests in `pyramid/tests/test_config/test_assets.py` that assume that it takes a string. So I ended up making it legal to pass either one, so that I don't have to change as much calling code. See https://github.com/Kotti/kotti_navigation/issues/13
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-08 01:37:46 +0000