summaryrefslogtreecommitdiff
path: root/pyramid
AgeCommit message (Collapse)Author
2010-12-15Merge branch 'master' of https://github.com/jkrebs/pyramid into jkrebs-masterChris McDonough
2010-12-15Made static tests pass on Windows.Joachim Krebs
2010-12-15- 1.0a5 introduced a bug when ``pyramid.config.Configurator.scan`` was used.Chris McDonough
The symptoms were: lots of deprecation warnings printed to the console about imports of deprecated Pyramid functions and classes and non-detection of views decorated with ``view_config`` decorators. This has now been fixed. Closes #68.
2010-12-14- Fix conflict exceptions so they have the right ``info`` when oneChris McDonough
configuration method is called from another.
2010-12-13- When creating a Configurator from within a ``paster pshell`` session, youChris McDonough
were required to pass a ``package`` argument although ``package`` is not actually required. If you didn't pass ``package``, you would receive an error something like ``KeyError: '__name__'`` emanating from the ``pyramid.path.caller_module`` function. This has now been fixed.
2010-12-09To avoid breaking people's expectations of how ZCML works, weChris McDonough
cannot autocommit ZCML actions incrementally. If we commit actions incrementally, configuration outcome will be controlled purely by ZCML directive execution order, which isn't what anyone who uses ZCML expects. So we don't autocommit each ZCML directive action while parsing is happening, but we do make sure to pass execute=self.autocommit to xmlconfig.file below, which will cause the actions implied by the ZCML that was parsed to be committed right away once parsing is finished if autocommit is True.
2010-12-09fix exampleChris McDonough
2010-12-09docs fixes; simplify include implementationChris McDonough
2010-12-09fix bug in zcml handler directiveChris McDonough
2010-12-09- Add a ``handler`` ZCML directive. This directive does the same thing asChris McDonough
``pyramid.configuration.add_handler``.
2010-12-09Merge branch 'twophase'Chris McDonough
Conflicts: pyramid/configuration.py
2010-12-09docs fixesChris McDonough
2010-12-09fix docs: pyramid.configuration -> pyramid.configChris McDonough
2010-12-09get rid of explicit call to commit in all paster templatesChris McDonough
2010-12-09get rid of config_method decorator; rename _action to actionChris McDonough
2010-12-09use pyramid.config.Configurator instead of pyramid.configuration.ConfiguratorChris McDonough
2010-12-08configuration.Config->config.ConfiguratorChris McDonough
2010-12-08create a context only as necessary (speed)Chris McDonough
2010-12-08deprecate Configurator, add ConfigChris McDonough
2010-12-08load_zcml and scan are also config methodsChris McDonough
2010-12-07commentChris McDonough
2010-12-07typoChris McDonough
2010-12-07better conflict error reportingChris McDonough
2010-12-07move with_context to APIChris McDonough
2010-12-07config_method -> maybe_autocommitChris McDonough
2010-12-07remove stray importChris McDonough
2010-12-07reenable autocommit supportChris McDonough
2010-12-07implement load_zcml in terms of a configuratorChris McDonough
2010-12-07make integration test check for non-cyclingChris McDonough
2010-12-07add an integration test for include, make sure the same callable is not ↵Chris McDonough
processed more than once
2010-12-07reimplement with_package in terms of with_contextChris McDonough
2010-12-07move lock closer to releaseChris McDonough
2010-12-07use with_context in .include, also remove bogus sort of filenamesChris McDonough
2010-12-07add a with_context method for use by ZCML directivesChris McDonough
2010-12-07ranging in on some sort of conflict detection solutionChris McDonough
2010-12-04add include methodChris McDonough
2010-12-03all tests passChris McDonough
2010-12-02make most tests pass (all but default permission bug integration test)Chris McDonough
2010-12-02Removed unnecessary whitespacesDanny Navarro
2010-12-02Removed unnecessary whitespaceDanny Navarro
2010-12-02Removed unnecessary whitespacesDanny Navarro
2010-12-02Removed unnecessary whitespacesDanny Navarro
2010-12-02Fixed doc typo and removed unnecessary whitespacesDanny Navarro
2010-12-01Merge branch 'master' into twophaseChris McDonough
2010-11-28Normalized paster starter template ini fileBlaise Laflamme
2010-11-27Merge branch 'master' into twophaseChris McDonough
2010-11-27Merge remote branch 'remotes/upstream/master'Atsushi Odagiri
2010-11-27::Atsushi Odagiri
InvalidRequestError: This Session's transaction has been rolled back due to a previous exception during flush. To begin a new transaction with this Session, first issue Session.rollback(). Original exception was: (IntegrityError) column name is not unique u'INSERT INTO models (name, value) VALUES (?, ?)' (u'root', 55)
2010-11-26Paster template css cleanupBlaise Laflamme
2010-11-26more zcml test flailingChris McDonough