From: Mike Bayer Date: Sat, 24 Jan 2009 19:37:41 +0000 (+0000) Subject: - 0.5.3 X-Git-Tag: rel_0_5_3~55 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=20132a9caa35f91359df373979d13fb1a16e3668;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git - 0.5.3 - add new directives to sphinx.sty. pdf output is still currently busted for other reasons, however. --- diff --git a/doc/build/texinputs/sphinx.sty b/doc/build/texinputs/sphinx.sty index 851b61af9b..219a400340 100644 --- a/doc/build/texinputs/sphinx.sty +++ b/doc/build/texinputs/sphinx.sty @@ -438,6 +438,36 @@ \fi }{\end{fulllineitems}} +% class method ---------------------------------------------------------- +% \begin{classmethoddesc}[classname]{methodname}{args} +\newcommand{\classmethodline}[3][\@undefined]{ + \classmethodlineni{#2}{#3} + \ifx\@undefined#1\relax + \index{#2@{\py@idxcode{#2()}} (\py@thisclass\ class method)} + \else + \index{#2@{\py@idxcode{#2()}} (#1 class method)} + \fi +} +\newenvironment{classmethoddesc}[3][\@undefined]{ + \begin{fulllineitems} + \ifx\@undefined#1\relax + \classmethodline{#2}{#3} + \else + \def\py@thisclass{#1} + \classmethodline{#2}{#3} + \fi +}{\end{fulllineitems}} + +% similar to {classmethoddesc}, but doesn't add to the index +% (never actually uses the optional argument) +\newcommand{\classmethodlineni}[3][\py@classbadkey]{% + \py@sigline{class \bfcode{#2}}{#3}} +\newenvironment{classmethoddescni}[3][\py@classbadkey]{ + \begin{fulllineitems} + \classmethodlineni{#2}{#3} +}{\end{fulllineitems}} + + % object data attribute -------------------------------------------------- % \begin{memberdesc}[classname]{membername} \newcommand{\memberline}[2][\py@classbadkey]{% diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py index 5ef4ff6d84..2dea27a041 100644 --- a/lib/sqlalchemy/__init__.py +++ b/lib/sqlalchemy/__init__.py @@ -107,6 +107,6 @@ from sqlalchemy.engine import create_engine, engine_from_config __all__ = sorted(name for name, obj in locals().items() if not (name.startswith('_') or inspect.ismodule(obj))) -__version__ = '0.5.2' +__version__ = '0.5.3' del inspect, sys