Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master
Commits on Feb 25, 2015
  1. Michael Merickel

    Merge pull request #1592 from davisagli/fix.reloader-non-tty

    mmerickel authored
    only reset terminal echo flag if stdin is a tty
Commits on Feb 24, 2015
  1. David Glick

    update changelog

    davisagli authored
  2. David Glick
Commits on Feb 22, 2015
  1. Michael Merickel
  2. Michael Merickel

    Merge pull request #1563 from Pylons/fix.idempotent-render-to-response

    mmerickel authored
    update render_to_response to prevent renderers from mutating request.response
Commits on Feb 20, 2015
  1. Michael Merickel

    Merge pull request #1587 from msabramo/fix_asset_override_with_package

    mmerickel authored
    Fix asset override with package
Commits on Feb 19, 2015
  1. Marc Abramowitz

    Fix asset override with package

    msabramo authored
    `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 Kotti/kotti_navigation#13
  2. Marc Abramowitz

    Enhance test_assets to expose #1580

    msabramo authored
    This enhances existing tests so that they detect the issue in #1580.
    Then I'm going to fix the issue in PR #1587.
    
    See #1580
Commits on Feb 18, 2015
  1. Michael Merickel
  2. Michael Merickel
  3. Michael Merickel

    grammar

    mmerickel authored
  4. Michael Merickel

    Merge branch 'pull.1483'

    mmerickel authored
  5. Michael Merickel
  6. Michael Merickel
  7. Michael Merickel

    fix typo on changes.rst

    mmerickel authored
  8. Chris McDonough
  9. Chris McDonough

    appease coverage

    mcdonc authored
  10. Michael Merickel
  11. Chris McDonough
  12. Michael Merickel

    fix syntax

    mmerickel authored
  13. Michael Merickel
  14. Michael Merickel

    fix odd sentence

    mmerickel authored
  15. Michael Merickel
  16. Chris McDonough

    fix merge conflicts

    mcdonc authored
Commits on Feb 17, 2015
  1. Chris McDonough
  2. Michael Merickel

    Merge pull request #1583 from Pylons/fix.remove-cachebust-tokens

    mmerickel authored
    remove the token from the ICacheBuster api
  3. Michael Merickel

    update changelog

    mmerickel authored
  4. Michael Merickel
  5. Michael Merickel

    remove the token from the ICacheBuster api

    mmerickel authored
    This exposes the QueryStringCacheBuster and PathSegmentCacheBuster
    public APIs alongside the md5-variants. These should be more cleanly
    subclassed by people wishing to extend their implementations.
  6. Michael Merickel

    Merge pull request #1581 from Pylons/feature.unittest-request-methods

    mmerickel authored
    add InstancePropertyHelper and apply_request_extensions
  7. Michael Merickel
  8. Michael Merickel

    update changelog for #1581

    mmerickel authored
  9. Michael Merickel
Commits on Feb 14, 2015
  1. Michael Merickel

    Merge pull request #1578 from davisagli/fix.docs

    mmerickel authored
    Fix a couple minor documentation issues
Commits on Feb 13, 2015
  1. Michael Merickel

    Merge pull request #1577 from davisagli/fix.reloader-pdb-echo

    mmerickel authored
    Add workaround to make sure echo is enabled after reload
Something went wrong with that request. Please try again.