# HG changeset patch # User Christophe de Vienne # Date 1420469652 -3600 # Node ID ff581d66f682c9d6680af033395f17ea71f5207f # Parent c8f42c41f38c4cb1aea28e0e73e357e7f7f95c85 pep8 diff -r c8f42c41f38c -r ff581d66f682 docs/conf.py --- a/docs/conf.py Sun Jan 04 00:12:29 2015 +0100 +++ b/docs/conf.py Mon Jan 05 15:54:12 2015 +0100 @@ -12,9 +12,6 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys -import os - # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. @@ -193,22 +190,22 @@ # -- Options for LaTeX output --------------------------------------------- latex_elements = { -# The paper size ('letterpaper' or 'a4paper'). -#'papersize': 'letterpaper', + # The paper size ('letterpaper' or 'a4paper'). + 'papersize': 'a4paper', -# The font size ('10pt', '11pt' or '12pt'). -#'pointsize': '10pt', + # The font size ('10pt', '11pt' or '12pt'). + #'pointsize': '10pt', -# Additional stuff for the LaTeX preamble. -#'preamble': '', + # Additional stuff for the LaTeX preamble. + #'preamble': '', } # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - ('index', 'PyramidCubicweb.tex', u'Pyramid Cubicweb Documentation', - u'Christophe de Vienne', 'manual'), + ('index', 'PyramidCubicweb.tex', u'Pyramid Cubicweb Documentation', + u'Christophe de Vienne', 'manual'), ] # The name of an image file (relative to this directory) to place at the top of @@ -251,9 +248,9 @@ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - ('index', 'PyramidCubicweb', u'Pyramid Cubicweb Documentation', - u'Christophe de Vienne', 'PyramidCubicweb', 'One line description of project.', - 'Miscellaneous'), + ('index', 'PyramidCubicweb', u'Pyramid Cubicweb Documentation', + u'Christophe de Vienne', 'PyramidCubicweb', + 'One line description of project.', 'Miscellaneous'), ] # Documents to append as an appendix to all manuals. diff -r c8f42c41f38c -r ff581d66f682 pyramid_cubicweb/bwcompat.py --- a/pyramid_cubicweb/bwcompat.py Sun Jan 04 00:12:29 2015 +0100 +++ b/pyramid_cubicweb/bwcompat.py Mon Jan 05 15:54:12 2015 +0100 @@ -8,7 +8,7 @@ from cubicweb.web.application import CubicWebPublisher -from cubicweb.web import LogOut, cors +from cubicweb.web import LogOut from pyramid_cubicweb.core import cw_to_pyramid @@ -57,7 +57,8 @@ content = None try: with cw_to_pyramid(request): - ctrlid, rset = self.appli.url_resolver.process(req, req.path) + ctrlid, rset = self.appli.url_resolver.process(req, + req.path) try: controller = vreg['controllers'].select( @@ -69,8 +70,8 @@ req.update_search_state() content = controller.publish(rset=rset) - # XXX this auto-commit should be handled by the cw_request cleanup - # or the pyramid transaction manager. + # XXX this auto-commit should be handled by the cw_request + # cleanup or the pyramid transaction manager. # It is kept here to have the ValidationError handling bw # compatible if req.cnx: