Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
branch: pycon/feature.…
Commits on Mar 13, 2012
  1. @dianaclarke @reedobrien
  2. @ppaez @reedobrien

    Added links to Starting the Application

    ppaez authored reedobrien committed
    - Sections 'Viewing the Application in a Browser' in the
      'Defining the Domain Model' and 'Defining the Views'
      chapters now offer a quick link in both wiki tutorials,
      as suggested by Paulo.
  3. @dianaclarke @reedobrien

    working on removing: # pragma: no cover from pserve

    dianaclarke authored reedobrien committed
  4. @ppaez @reedobrien

    Added the Design chapter on both wiki tutorials

    ppaez authored reedobrien committed
  5. @mmerickel

    Merge pull request #475 from audreyr/master

    mmerickel authored
    Highlighting another line that the user should edit in the tutorial
  6. @reedobrien

    initial unlacing chameleon

    reedobrien authored
  7. @mcdonc
  8. @mcdonc

    py3 compat

    mcdonc authored
  9. @cguardia

    remove mako bindings

    cguardia authored
  10. @mcdonc
  11. @mcdonc
  12. @audreyr
  13. @audreyr
  14. @ppaez

    Clarify two steps in the SQL wiki tutorial

    ppaez authored
    - Highlight the added or changed lines
  15. @cguardia

    Merge pull request #473 from audreyr/master

    cguardia authored
    More clarification
  16. @audreyr
  17. @blaflamme

    Merge pull request #472 from audreyr/master

    blaflamme authored
    Clarified instructions in wiki2 tutorial
  18. @audreyr
Commits on Mar 12, 2012
  1. @dianaclarke

    monkey patch atexit, since it seems to be gernerating this error in same

    dianaclarke authored
    cases (but all the tests still pass)
    
    Ran 2083 tests in 8.913s
    
    OK
    Error in atexit._run_exitfuncs:
    Traceback (most recent call last):
    File "/usr/lib/python2.6/atexit.py", line 24, in _run_exitfuncs
    func(*targs, **kargs)
    File "/mnt/hgfs/workspace/pyramid/pyramid/scripts/pserve.py", line 400,
    in _remove_pid_file
    current_pid = os.getpid()
    AttributeError: 'NoneType' object has no attribute 'getpid'
  2. @cguardia

    Merge pull request #471 from ppaez/wiki-documentation

    cguardia authored
    Added links to 'Starting the Application'
  3. @cguardia

    Merge pull request #470 from audreyr/master

    cguardia authored
    Revision of __init__.py and views.py sections
  4. @audreyr

    More concise views.py section.

    audreyr authored
  5. @dianaclarke
  6. @ppaez

    Added links to Starting the Application

    ppaez authored
    - Sections 'Viewing the Application in a Browser' in the
      'Defining the Domain Model' and 'Defining the Views'
      chapters now offer a quick link in both wiki tutorials,
      as suggested by Paulo.
  7. @mcdonc

    Merge pull request #468 from ppaez/wiki-documentation

    mcdonc authored
    Added the Design chapter on both wiki tutorials
  8. @dianaclarke
  9. @ppaez
  10. @mcdonc
  11. @mmerickel

    Merge pull request #467 from rpatterson/master

    mmerickel authored
    Cleanup test `warnings` handling
  12. @rpatterson

    Use the warnings.catch_warnings context manager in more places.

    rpatterson authored
    Neither 2.7 nor 2.6 with "setup.py test" or "setup.py nosetests" show
    warnings that don't already appear for origin/master.  FYI, under 2.6
    with nosetests I see:
    
        nose/loader.py:303: DeprecationWarning: registerView
  13. @rpatterson

    Switch to the warnings.catch_warnings context manager for testing.

    rpatterson authored
    FYI, this test was failing only under 2.7, not 2.6.
  14. @mcdonc

    Merge branch '1.3-branch'

    mcdonc authored
  15. @mcdonc

    - ``config.add_view(<aninstancemethod>)`` raised AttributeError invol…

    mcdonc authored
    …ving
    
      ``__text__``.  See #461
    
    Fixes #461.
  16. @mcdonc
  17. @mcdonc
Something went wrong with that request. Please try again.