#345 Support Flask 0.10
Merged 7 years ago by sayanchowdhury. Opened 7 years ago by abompard.
abompard/fedora-hubs flask-0.10  into  develop

@@ -17,7 +17,7 @@ 

              resp = self.app.get('/{}/notifications/'.format(name))

          self.assertEqual(resp.status_code, 200)

          data = json.loads(resp.get_data(as_text=True))

-         self.assertEqual(data, [])

+         self.assertEqual(data, {"notifications": []})

  

      def test_get_notifications_valid_name(self):

          with hubs.tests.auth_set(app, self.user):
@@ -26,9 +26,9 @@ 

  

          self.assertEqual(resp.status_code, 200)

          data = json.loads(resp.get_data(as_text=True))

-         self.assertEqual(len(data), 1)

+         self.assertEqual(len(data["notifications"]), 1)

  

-         for saved in data:

+         for saved in data["notifications"]:

              self.assertEqual(saved['markup'], 'foo')

              self.assertEqual(saved['link'], 'bar')

  

file modified
+1 -1
@@ -40,7 +40,7 @@ 

      if flask.request.method == 'GET':

          notifications = hubs.models.SavedNotification.by_username(user)

          notifications = [n.__json__() for n in notifications]

-         return flask.jsonify(notifications)

+         return flask.jsonify(dict(notifications=notifications))

  

      if flask.request.method == 'POST':

          data = flask.request.get_json()

file modified
+9 -3
@@ -4,7 +4,7 @@ 

  import time

  

  import flask

- from flask.signals import template_rendered, before_render_template

+ from flask.signals import template_rendered

  

  from hubs.models import Hub

  from hubs.views.utils import get_hub, require_hub_access
@@ -13,6 +13,11 @@ 

  from .functions import GetRequests

  from .utils import find_hubs_for_msg, paginate

  

+ try:

+     from flask.signals import before_render_template

+ except ImportError:

+     before_render_template = None  # Flask < 0.11

+ 

  

  class BaseView(WidgetView):

      """The base view to instantiate the widget."""
@@ -190,8 +195,9 @@ 

          )

      initial["hubs"] = [hub.name]

      context = dict(mode="add", url=post_url, initial=initial)

-     before_render_template.send(

-         flask.current_app, template=template, context=context)

+     if before_render_template is not None:

+         before_render_template.send(

+             flask.current_app, template=template, context=context)

      output = template.render(**context)

      template_rendered.send(

          flask.current_app, template=template, context=context)

file modified
+9 -3
@@ -1,9 +1,14 @@ 

  from __future__ import unicode_literals, absolute_import

  

  import flask

- from flask.signals import template_rendered, before_render_template

+ from flask.signals import template_rendered

  from flask.views import View

  

+ try:

+     from flask.signals import before_render_template

+ except ImportError:

+     before_render_template = None  # Flask < 0.11

+ 

  

  class WidgetView(View):

      """
@@ -120,8 +125,9 @@ 

          else:

              context.update(self.get_extra_context(instance, *args, **kwargs))

              template = self.get_template()

-             before_render_template.send(

-                 flask.current_app, template=template, context=context)

+             if before_render_template is not None:

+                 before_render_template.send(

+                     flask.current_app, template=template, context=context)

              output = template.render(**context)

              template_rendered.send(

                  flask.current_app, template=template, context=context)

file modified
+1 -1
@@ -1,5 +1,5 @@ 

  arrow

- bleach

+ bleach<2.0.0

  blinker

  datanommer.models

  decorator

file modified
+4 -2
@@ -1,12 +1,14 @@ 

  [tox]

- envlist = py{27,34,35},js,docs,lint

+ envlist = py{27,34,35}-flask01{0,1,2},js,docs,lint

  skipsdist = True

  

  

  [testenv]

  usedevelop = True

  deps =

-     -rrequirements.txt

+     flask010: flask>=0.10,<0.11

+     flask011: flask>=0.11,<0.12

+     flask012: flask>=0.12,<0.13

      -rtest-requirements.txt

  setenv =

      HUBS_CONFIG={toxinidir}/hubs/tests/hubs_test.cfg

This change adds testing with different versions of Flask and fix incompatibilities with Flask 0.10 (the version we have in EPEL).

Pull-Request has been merged by sayanchowdhury

7 years ago