Ticket #83 (closed defect: fixed)
export of changes to pluginsystem.py application.py and database.py
| Reported by: | marchon | Owned by: | |
|---|---|---|---|
| Priority: | major | Milestone: | |
| Component: | admin | Version: | dev |
| Keywords: | Cc: |
Description (last modified by mitsuhiko) (diff)
# HG changeset patch
# User admin@launchpad.inav2.com
# Date 1218612034 14400
# Node ID 6c9f6e1d56d454be98d9dd8313081aff921bfeba
# Parent beb93e89fc904a9ffd34330186063d3c9e56a9e1
asdf
diff -r beb93e89fc90 -r 6c9f6e1d56d4 textpress/application.py
--- a/textpress/application.py Wed Aug 06 20:19:18 2008 +0100
+++ b/textpress/application.py Wed Aug 13 03:20:34 2008 -0400
@@ -375,7 +375,7 @@
if not url:
if not email:
return escape(name)
- url = 'mailto:%s' % quote(email)
+ url = 'mailto:%s' % url_quote(email)
return u'<a href="%s">%s</a>' % (
escape(url),
escape(name)
diff -r beb93e89fc90 -r 6c9f6e1d56d4 textpress/database.py
--- a/textpress/database.py Wed Aug 06 20:19:18 2008 +0100
+++ b/textpress/database.py Wed Aug 13 03:20:34 2008 -0400
@@ -100,7 +100,7 @@
session = self.get_session()
if not kwargs.pop('_tp_no_save', False):
entity = kwargs.pop('_sa_entity_name', None)
- session._save_without_cascade(instance, entity_name=entity)
+ session._save_without_cascade(instance)
return orm.EXT_CONTINUE
def init_failed(self, mapper, class_, oldinit, instance, args, kwargs):
diff -r beb93e89fc90 -r 6c9f6e1d56d4 textpress/pluginsystem.py
--- a/textpress/pluginsystem.py Wed Aug 06 20:19:18 2008 +0100
+++ b/textpress/pluginsystem.py Wed Aug 13 03:20:34 2008 -0400
@@ -128,7 +128,10 @@
app = get_application()
if app is not None:
name = 'textpress._space.%s%s' % (app.iid, name[17:])
- return _py_import(name, *args)
+ try:
+ return _py_import(name, *args)
+ except:
+ pass
def register_application(app):
Change History
Note: See
TracTickets for help on using
tickets.