1
0
Fork 0
mirror of https://github.com/veekun/pokedex.git synced 2024-08-20 18:16:34 +00:00

Make MarkdownString.as_html() accept an extension object, not class

No reason to instantiate every time as_html's called, is there?

Also, sessions use a markdown_extension attribute instead of
markdown_extension_class. The latter is only used to set the former when
the session is created (unless another markdown_extension_class is given,
of course).
This commit is contained in:
Petr Viktorin 2011-09-12 19:57:06 +03:00
parent 928eaca4a4
commit 719c32de0b
3 changed files with 32 additions and 25 deletions
pokedex/db

View file

@ -205,8 +205,10 @@ class MultilangSession(Session):
if 'default_language_id' in kwargs:
self.default_language_id = kwargs.pop('default_language_id')
if 'markdown_extension_class' in kwargs:
self.markdown_extension_class = kwargs.pop('markdown_extension_class')
markdown_extension_class = kwargs.pop('markdown_extension_class',
self.markdown_extension_class)
self.markdown_extension = markdown_extension_class(self)
kwargs.setdefault('query_cls', MultilangQuery)
@ -226,5 +228,5 @@ class MultilangScopedSession(ScopedSession):
self.registry().default_language_id = new
@property
def markdown_extension_class(self):
return self.registry().markdown_extension_class
def markdown_extension(self):
return self.registry().markdown_extension