You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2019/05/21 15:39:58 UTC
[allura] 01/09: [#8286] trivial upgrade TG to 2.3.4
This is an automated email from the ASF dual-hosted git repository.
brondsem pushed a commit to branch db/8286
in repository https://gitbox.apache.org/repos/asf/allura.git
commit aabbf82c0304bd07d4758b27e0d7d2656db3ae80
Author: Dave Brondsema <da...@brondsema.net>
AuthorDate: Fri May 17 14:41:41 2019 -0400
[#8286] trivial upgrade TG to 2.3.4
---
Allura/allura/ext/admin/admin_main.py | 2 +-
Allura/allura/lib/patches.py | 6 +++---
Allura/allura/lib/utils.py | 2 +-
ForgeBlog/forgeblog/main.py | 6 +++---
ForgeDiscussion/forgediscussion/forum_main.py | 6 +++---
ForgeLink/forgelink/link_main.py | 2 +-
ForgeTracker/forgetracker/tracker_main.py | 2 +-
ForgeWiki/forgewiki/wiki_main.py | 2 +-
requirements.txt | 2 +-
9 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/Allura/allura/ext/admin/admin_main.py b/Allura/allura/ext/admin/admin_main.py
index 6e49e6d..2319a24 100644
--- a/Allura/allura/ext/admin/admin_main.py
+++ b/Allura/allura/ext/admin/admin_main.py
@@ -186,7 +186,7 @@ class AdminApp(Application):
pass
def bulk_export(self, f, export_path='', with_attachments=False):
- json.dump(self.project, f, cls=jsonify.GenericJSON, indent=2)
+ json.dump(self.project, f, cls=jsonify.JSONEncoder, indent=2)
class AdminExtensionLookup(object):
diff --git a/Allura/allura/lib/patches.py b/Allura/allura/lib/patches.py
index 06ecb77..977f5d1 100644
--- a/Allura/allura/lib/patches.py
+++ b/Allura/allura/lib/patches.py
@@ -95,11 +95,11 @@ def apply():
# change < to its unicode escape when rendering JSON out of turbogears
# This is to avoid IE9 and earlier, which don't know the json content type
# and may attempt to render JSON data as HTML if the URL ends in .html
- original_tg_jsonify_GenericJSON_encode = tg.jsonify.GenericJSON.encode
+ original_tg_jsonify_JSONEncoder_encode = tg.jsonify.JSONEncoder.encode
escape_pattern_with_lt = re.compile(
json.encoder.ESCAPE.pattern.rstrip(']') + '<' + ']')
- @h.monkeypatch(tg.jsonify.GenericJSON)
+ @h.monkeypatch(tg.jsonify.JSONEncoder)
def encode(self, o):
# ensure_ascii=False forces encode_basestring() to be called instead of
# encode_basestring_ascii() and encode_basestring_ascii may likely be c-compiled
@@ -107,7 +107,7 @@ def apply():
with h.push_config(self, ensure_ascii=False), \
h.push_config(json.encoder, ESCAPE=escape_pattern_with_lt), \
mock.patch.dict(json.encoder.ESCAPE_DCT, {'<': r'\u003C'}):
- return original_tg_jsonify_GenericJSON_encode(self, o)
+ return original_tg_jsonify_JSONEncoder_encode(self, o)
old_controller_call = tg.controllers.DecoratedController._call
diff --git a/Allura/allura/lib/utils.py b/Allura/allura/lib/utils.py
index 91faac1..59f286f 100644
--- a/Allura/allura/lib/utils.py
+++ b/Allura/allura/lib/utils.py
@@ -752,7 +752,7 @@ def is_ajax(request):
return False
-class JSONForExport(tg.jsonify.GenericJSON):
+class JSONForExport(tg.jsonify.JSONEncoder):
def default(self, obj):
if hasattr(obj, '__json__') and callable(obj.__json__):
try:
diff --git a/ForgeBlog/forgeblog/main.py b/ForgeBlog/forgeblog/main.py
index 1cf9099..ccc4bbb 100644
--- a/ForgeBlog/forgeblog/main.py
+++ b/ForgeBlog/forgeblog/main.py
@@ -218,14 +218,14 @@ class ForgeBlogApp(Application):
f.write('{"posts": [')
posts = list(BM.BlogPost.query.find(dict(app_config_id=self.config._id)))
if with_attachments:
- GenericJSON = JSONForExport
+ JSONEncoder = JSONForExport
self.export_attachments(posts, export_path)
else:
- GenericJSON = jsonify.GenericJSON
+ JSONEncoder = jsonify.JSONEncoder
for i, post in enumerate(posts):
if i > 0:
f.write(',')
- json.dump(post, f, cls=GenericJSON, indent=2)
+ json.dump(post, f, cls=JSONEncoder, indent=2)
f.write(']}')
def export_attachments(self, articles, export_path):
diff --git a/ForgeDiscussion/forgediscussion/forum_main.py b/ForgeDiscussion/forgediscussion/forum_main.py
index 311886f..804d349 100644
--- a/ForgeDiscussion/forgediscussion/forum_main.py
+++ b/ForgeDiscussion/forgediscussion/forum_main.py
@@ -239,15 +239,15 @@ class ForgeDiscussionApp(Application):
f.write('{"forums": [')
forums = list(DM.Forum.query.find(dict(app_config_id=self.config._id)))
if with_attachments:
- GenericJSON = JSONForExport
+ JSONEncoder = JSONForExport
for forum in forums:
self.export_attachments(forum.threads, export_path)
else:
- GenericJSON = jsonify.GenericJSON
+ JSONEncoder = jsonify.JSONEncoder
for i, forum in enumerate(forums):
if i > 0:
f.write(',')
- json.dump(forum, f, cls=GenericJSON, indent=2)
+ json.dump(forum, f, cls=JSONEncoder, indent=2)
f.write(']}')
def export_attachments(self, threads, export_path):
diff --git a/ForgeLink/forgelink/link_main.py b/ForgeLink/forgelink/link_main.py
index cc00d00..dbe6858 100644
--- a/ForgeLink/forgelink/link_main.py
+++ b/ForgeLink/forgelink/link_main.py
@@ -108,7 +108,7 @@ class ForgeLinkApp(Application):
def bulk_export(self, f, export_path='', with_attachments=False):
json.dump(RootRestController(self).link_json(),
- f, cls=jsonify.GenericJSON, indent=2)
+ f, cls=jsonify.JSONEncoder, indent=2)
class RootController(BaseController):
diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py
index 1be5070..930df3a 100644
--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -487,7 +487,7 @@ class ForgeTrackerApp(Application):
GenericClass = utils.JSONForExport
self.export_attachments(tickets, export_path)
else:
- GenericClass = jsonify.GenericJSON
+ GenericClass = jsonify.JSONEncoder
for i, ticket in enumerate(tickets):
if i > 0:
diff --git a/ForgeWiki/forgewiki/wiki_main.py b/ForgeWiki/forgewiki/wiki_main.py
index ac60545..c7406d2 100644
--- a/ForgeWiki/forgewiki/wiki_main.py
+++ b/ForgeWiki/forgewiki/wiki_main.py
@@ -355,7 +355,7 @@ The wiki uses [Markdown](%s) syntax.
GenericClass = JSONForExport
self.export_attachments(pages, export_path)
else:
- GenericClass = jsonify.GenericJSON
+ GenericClass = jsonify.JSONEncoder
for i, page in enumerate(pages):
if i > 0:
f.write(',')
diff --git a/requirements.txt b/requirements.txt
index 94c6dde..eb19aeb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -49,7 +49,7 @@ textile==2.1.5
# dep of colander
translationstring==1.3
TimerMiddleware==0.4.4
-TurboGears2==2.3.2
+TurboGears2==2.3.4
# dep of html5lib
webencodings==0.5.1
WebOb==1.3.1