Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

1.2 branch #484

Closed
wants to merge 53 commits into from

10 participants

@devdob

I think there's error in docs. http://docs.pylonsproject.org/projects/pyramid/en/1.2-branch/tutorials/wiki2/authorization.html
I apologize if I mess here something. This is first time I commit in a large project.

wichert and others added some commits
@wichert wichert Accept unicode token instances with ascii content
This is required when reissueing cookies which include a token: WebOb
returns the tokens from a cookie as unicode instances, so remember()
must be able to deal with them when refreshing.

This is a backport of dd5a91e to the
1.2 branch.
64b121e
@mcdonc mcdonc prep for 1.2.1 1e2d59a
@mcdonc mcdonc note docs fixes 36119a3
@goodwillcoding goodwillcoding make sphinx compile strictly by turning all warnings into errors
and fix up existing warnings (1.2-branch)
4bc95db
@mcdonc mcdonc Merge pull request #305 from michr/1.2-branch
make sphinx compile strictly by turning all warnings into errors and fix up existing warnings (1.2-branch)
baa466e
Cameron Ring match_param was missing from the view_config decorator d1ff2ec
@mcdonc mcdonc garden 31938b4
@mcdonc mcdonc better deprecation warning 8c8b387
@blaflamme blaflamme updated docs for rtd 4963504
@mcdonc mcdonc - Backport fixes from master regarding URL decoding. URL segments are
  no-longer "double-decoded" during traversal and when encountered in a route
  subpath (or other star-arg pattern).  As a result, a new API named
  ``pyramid.traversal.traversal_path_info`` was added to the system.  This
  function accepts an already-URL-decoded string and returns a tuple of
  Unicode objects.  This API is used internally by Pyramid in all places that
  ``pyramid.traversal.traversal_path`` used to be used.  The
  ``traversal_path`` function remains for backwards compatibility, however,
  and can still be used when a path is encoded.  See
  Pylons#349 for more information.

Closes #349.
7fe36a3
@mcdonc mcdonc - Backport fix from master: ``request.static_url`` now generates URL-…
…quoted

  URLs when fed a ``path`` argument which contains characters that are
  unsuitable for URLs.  See Pylons#349 for
  more information.

- Backport from master: fix ``request.json_body`` to deal with alternate
  request charsets.

Ref: issue #349.
28f21cd
@mcdonc mcdonc - Backport from master: The AuthTktCookieHelper could potentially gen…
…erate

  Unicode headers inappropriately when the ``tokens`` argument to remember
  was used.  See Pylons#314.

References issue #314.
4791d7b
@rfk rfk Avoid timing attacks in AuthTktAutenticationPolicy
This factors out the timing-invariant string comparison code from
session.py and re-uses it for signature checking in AuthTkt code.
c8c9bc8
@mcdonc mcdonc - The AuthTktAuthenticationPolicy did not use a timing-attack-aware s…
…tring

  comparator.  See Pylons#320 for more info.

References issue#320.
e61ab86
@rbu rbu DummySession: Correctly implement ISession by generating CSRF token i…
…f it's missing
1f8a007
@mcdonc mcdonc - Backport from master: the DummySession in ``pyramid.testing`` now g…
…enerates

  a new CSRF token if one doesn't yet exist.
34859d5
@mcdonc mcdonc - A ``mako.directories`` setting is no longer required to use Mako te…
…mplates

  Rationale: Mako template renderers can be specified using an absolute asset
  spec.  An entire application can be written with such asset specs,
  requiring no ordered lookup path.
d28528c
@mcdonc mcdonc fix test failure on jython; fix traversal_path_info docstring ab128b8
@mcdonc mcdonc prep for 1.2.2 a5175c2
@jpcw jpcw add bpython support to pshell c28a03e
@mcdonc mcdonc prep for 1.2.3 4a572dc
@jpcw jpcw add bpython support to pshell with raydeo remarks and design 02b6046
@mmerickel mmerickel Merge branch '1.2-branch' of https://github.com/jpcw/pyramid into pul…
…l.356
cdc3b98
@mmerickel mmerickel backported changes from commits #ce1d0, 3808f and 99513. ebb663f
@mmerickel mmerickel updated changelog c5d4f02
@mcdonc mcdonc backport fixes for 32-bit platforms from master (datetime tests) bf72c55
@mmerickel mmerickel Merge branch 'pull.356' into 1.2-branch 415d082
@mmerickel mmerickel garden 044b029
@mcdonc mcdonc use correct github links for this branch 1ddae49
@blaflamme blaflamme updated doc theme workflow ebda7cd
@blaflamme blaflamme fixed version number 2b9f0e7
@blaflamme blaflamme fixed git ref 034812b
@cd34 cd34 https://docs.pylonsproject.org to http://docs.pylonsproject.org as re…
…adthedocs.org doesn't support https
c110694
@mcdonc mcdonc bad cherry-pick b566765
@mcdonc mcdonc prevent a scaffold rendering from being named site 9b4fb11
@mcdonc mcdonc garden 50a794b
@mcdonc mcdonc - Forward compatibility for ``pyramid_zcml`` >= 0.8 + ``zope.configur…
…ation``

  >= 3.8.0.
07cada3
@mcdonc mcdonc prep for 1.2.4 b5e035a
@mcdonc mcdonc try to protect against shell commands being invoked if imported durin…
…g installation
5ef72d3
@mcdonc mcdonc test f21398e
@mcdonc mcdonc - Backport the ``egg:pyramid#wsgiref`` and ``egg:pyramid#cherrypy`` s…
…erver

  runners from the 1.3 branch.  This change is to primarily allow scaffolding
  authors to rely on the wsgiref entry point for projects that are meant to
  work on both Pyramid 1.2.5 and 1.3.X.
210f7d6
@mcdonc mcdonc prep for 1.2.5 02ad73d
@mcdonc mcdonc backport pathinfogeddon from 1.3 branch 6833b5f
@mcdonc mcdonc coverage 980f0a3
@mcdonc mcdonc prep for 1.2.6 ab32ca0
@wichert wichert Prevent double quoting of paths in static urls. 4248344
@mcdonc mcdonc incoming merge fixes #407 ad60ff2
@mcdonc mcdonc backport fix for issue #404 d5fc07c
@mcdonc mcdonc prep for 1.2.7 dd52ac9
@mcdonc mcdonc - Internal: catch unhashable discriminators early (raise an error ins…
…tead of

  allowing them to find their way into resolveConflicts).
accd532
@mmerickel mmerickel Backported a test to reproduce #425. 42a8fb3
@mmerickel mmerickel Backported match_param to accept a tuple. Fixes #425. e86e2fc
@devdob devdob I guess that's the view for the route c0ba629
@mmerickel
Owner

You need to redo this pull request (close and open a new one) with the pull request pointing to the Pylons:1.2-branch of pyramid, not Pylons:master. That is why there are so many commits here.

@devdob devdob closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Sep 28, 2011
  1. @wichert

    Accept unicode token instances with ascii content

    wichert authored
    This is required when reissueing cookies which include a token: WebOb
    returns the tokens from a cookie as unicode instances, so remember()
    must be able to deal with them when refreshing.
    
    This is a backport of dd5a91e to the
    1.2 branch.
  2. @mcdonc

    prep for 1.2.1

    mcdonc authored
  3. @mcdonc

    note docs fixes

    mcdonc authored
Commits on Oct 1, 2011
  1. @goodwillcoding

    make sphinx compile strictly by turning all warnings into errors

    goodwillcoding authored
    and fix up existing warnings (1.2-branch)
  2. @mcdonc

    Merge pull request #305 from michr/1.2-branch

    mcdonc authored
    make sphinx compile strictly by turning all warnings into errors and fix up existing warnings (1.2-branch)
Commits on Oct 3, 2011
  1. @mcdonc

    match_param was missing from the view_config decorator

    Cameron Ring authored mcdonc committed
  2. @mcdonc

    garden

    mcdonc authored
Commits on Oct 12, 2011
  1. @mcdonc

    better deprecation warning

    mcdonc authored
Commits on Nov 15, 2011
  1. @blaflamme

    updated docs for rtd

    blaflamme authored
Commits on Nov 18, 2011
  1. @mcdonc

    - Backport fixes from master regarding URL decoding. URL segments are

    mcdonc authored
      no-longer "double-decoded" during traversal and when encountered in a route
      subpath (or other star-arg pattern).  As a result, a new API named
      ``pyramid.traversal.traversal_path_info`` was added to the system.  This
      function accepts an already-URL-decoded string and returns a tuple of
      Unicode objects.  This API is used internally by Pyramid in all places that
      ``pyramid.traversal.traversal_path`` used to be used.  The
      ``traversal_path`` function remains for backwards compatibility, however,
      and can still be used when a path is encoded.  See
      Pylons#349 for more information.
    
    Closes #349.
  2. @mcdonc

    - Backport fix from master: ``request.static_url`` now generates URL-…

    mcdonc authored
    …quoted
    
      URLs when fed a ``path`` argument which contains characters that are
      unsuitable for URLs.  See Pylons#349 for
      more information.
    
    - Backport from master: fix ``request.json_body`` to deal with alternate
      request charsets.
    
    Ref: issue #349.
Commits on Nov 20, 2011
  1. @mcdonc

    - Backport from master: The AuthTktCookieHelper could potentially gen…

    mcdonc authored
    …erate
    
      Unicode headers inappropriately when the ``tokens`` argument to remember
      was used.  See Pylons#314.
    
    References issue #314.
  2. @rfk @mcdonc

    Avoid timing attacks in AuthTktAutenticationPolicy

    rfk authored mcdonc committed
    This factors out the timing-invariant string comparison code from
    session.py and re-uses it for signature checking in AuthTkt code.
  3. @mcdonc

    - The AuthTktAuthenticationPolicy did not use a timing-attack-aware s…

    mcdonc authored
    …tring
    
      comparator.  See Pylons#320 for more info.
    
    References issue#320.
  4. @rbu @mcdonc

    DummySession: Correctly implement ISession by generating CSRF token i…

    rbu authored mcdonc committed
    …f it's missing
  5. @mcdonc

    - Backport from master: the DummySession in ``pyramid.testing`` now g…

    mcdonc authored
    …enerates
    
      a new CSRF token if one doesn't yet exist.
  6. @mcdonc

    - A ``mako.directories`` setting is no longer required to use Mako te…

    mcdonc authored
    …mplates
    
      Rationale: Mako template renderers can be specified using an absolute asset
      spec.  An entire application can be written with such asset specs,
      requiring no ordered lookup path.
  7. @mcdonc
  8. @mcdonc

    prep for 1.2.2

    mcdonc authored
  9. @jpcw

    add bpython support to pshell

    jpcw authored
Commits on Nov 21, 2011
  1. @mcdonc

    prep for 1.2.3

    mcdonc authored
  2. @jpcw
Commits on Nov 22, 2011
  1. @mmerickel
  2. @mmerickel
  3. @mmerickel

    updated changelog

    mmerickel authored
  4. @mcdonc
  5. @mmerickel
Commits on Nov 26, 2011
  1. @mmerickel

    garden

    mmerickel authored
Commits on Nov 27, 2011
  1. @mcdonc
  2. @blaflamme

    updated doc theme workflow

    blaflamme authored
  3. @blaflamme

    fixed version number

    blaflamme authored
  4. @blaflamme

    fixed git ref

    blaflamme authored
Commits on Dec 1, 2011
  1. @cd34 @mcdonc

    https://docs.pylonsproject.org to http://docs.pylonsproject.org as re…

    cd34 authored mcdonc committed
    …adthedocs.org doesn't support https
  2. @mcdonc

    bad cherry-pick

    mcdonc authored
Commits on Dec 2, 2011
  1. @mcdonc
  2. @mcdonc

    garden

    mcdonc authored
Commits on Dec 6, 2011
  1. @mcdonc
  2. @mcdonc

    prep for 1.2.4

    mcdonc authored
Commits on Dec 9, 2011
  1. @mcdonc
  2. @mcdonc

    test

    mcdonc authored
Commits on Dec 14, 2011
  1. @mcdonc

    - Backport the ``egg:pyramid#wsgiref`` and ``egg:pyramid#cherrypy`` s…

    mcdonc authored
    …erver
    
      runners from the 1.3 branch.  This change is to primarily allow scaffolding
      authors to rely on the wsgiref entry point for projects that are meant to
      work on both Pyramid 1.2.5 and 1.3.X.
Commits on Dec 15, 2011
  1. @mcdonc

    prep for 1.2.5

    mcdonc authored
Commits on Jan 5, 2012
  1. @mcdonc
  2. @mcdonc

    coverage

    mcdonc authored
  3. @mcdonc

    prep for 1.2.6

    mcdonc authored
Commits on Jan 19, 2012
  1. @wichert
Commits on Jan 20, 2012
  1. @mcdonc

    incoming merge fixes #407

    mcdonc authored
  2. @mcdonc

    backport fix for issue #404

    mcdonc authored
  3. @mcdonc

    prep for 1.2.7

    mcdonc authored
Commits on Feb 7, 2012
  1. @mcdonc

    - Internal: catch unhashable discriminators early (raise an error ins…

    mcdonc authored
    …tead of
    
      allowing them to find their way into resolveConflicts).
  2. @mmerickel
  3. @mmerickel
Commits on Mar 14, 2012
  1. @devdob
Something went wrong with that request. Please try again.