Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master
Commits on Mar 30, 2015
  1. @stevepiercy

    Merge pull request #1622 from stevepiercy/master

    stevepiercy authored
    remove italics from internal references
  2. @stevepiercy
Commits on Mar 26, 2015
  1. @mmerickel
  2. @stevepiercy

    Merge pull request #1619 from stevepiercy/master

    stevepiercy authored
    Add a badge and link for latest documentation to complement master
  3. @stevepiercy
Commits on Mar 21, 2015
  1. @stevepiercy

    Merge pull request #1615 from stevepiercy/master

    stevepiercy authored
    update pylons sphinx theme on master branch, too
  2. @stevepiercy
Commits on Mar 15, 2015
  1. @mcdonc
  2. @mcdonc
  3. @mcdonc
  4. @mcdonc
  5. @mcdonc

    Merge branch 'custom-append-slash-redirect' of https://github.com/dst…

    mcdonc authored
    …ufft/pyramid into dstufft-custom-append-slash-redirect
  6. @dstufft

    Add myself to CONTRIBUTORS.txt

    dstufft authored
  7. @dstufft
Commits on Mar 13, 2015
  1. @tseaver

    Merge pull request #1607 from ledmonster/fix-forbidden_view_config-co…

    tseaver authored
    …mment
    
    fix comment in forbidden_view_config
  2. @ledmonster
  3. @stevepiercy

    Update code example

    stevepiercy authored
    Modify `lines` to include closing parens in source and update corresponding `emphasize-lines`. Closes #1606.
Commits on Mar 8, 2015
  1. @mcdonc
Commits on Mar 5, 2015
  1. @mmerickel

    Merge pull request #1471 from Pylons/feature.py3-coverage

    mmerickel authored
    update tox/travis to check code coverage on py3
  2. @mmerickel

    Merge pull request #1575 from Pylons/fix.shared-view-renderer

    mmerickel authored
    clone a new RendererHelper per request
  3. @mmerickel
  4. @mmerickel
Commits on Feb 25, 2015
  1. @mmerickel

    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. @davisagli

    update changelog

    davisagli authored
  2. @davisagli
Commits on Feb 22, 2015
  1. @mmerickel
  2. @mmerickel

    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 21, 2015
  1. @mmerickel
Commits on Feb 20, 2015
  1. @mmerickel
  2. @mmerickel
  3. @mmerickel

    Merge pull request #1587 from msabramo/fix_asset_override_with_package

    mmerickel authored
    Fix asset override with package
Commits on Feb 19, 2015
  1. @msabramo

    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. @msabramo

    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. @mmerickel
  2. @mmerickel
Something went wrong with that request. Please try again.