Skip to content
Snippets Groups Projects
Commit f6585a70 authored by Jorrit Schaap's avatar Jorrit Schaap
Browse files

Task #10241: fixed import naming issue

parent d84341a2
No related branches found
No related tags found
No related merge requests found
...@@ -2693,7 +2693,7 @@ LCS/PyCommon/CMakeLists.txt -text ...@@ -2693,7 +2693,7 @@ LCS/PyCommon/CMakeLists.txt -text
LCS/PyCommon/__init__.py -text LCS/PyCommon/__init__.py -text
LCS/PyCommon/datetimeutils.py -text LCS/PyCommon/datetimeutils.py -text
LCS/PyCommon/factory.py -text LCS/PyCommon/factory.py -text
LCS/PyCommon/flask.py -text LCS/PyCommon/flask_utils.py -text
LCS/PyCommon/postgres.py -text LCS/PyCommon/postgres.py -text
LCS/PyCommon/subprocess.py -text LCS/PyCommon/subprocess.py -text
LCS/PyCommon/test/python-coverage.sh eol=lf LCS/PyCommon/test/python-coverage.sh eol=lf
......
...@@ -13,7 +13,7 @@ set(_py_files ...@@ -13,7 +13,7 @@ set(_py_files
util.py util.py
postgres.py postgres.py
datetimeutils.py datetimeutils.py
flask.py flask_utils.py
subprocess.py) subprocess.py)
python_install(${_py_files} DESTINATION lofar/common) python_install(${_py_files} DESTINATION lofar/common)
......
...@@ -19,17 +19,18 @@ ...@@ -19,17 +19,18 @@
# $Id$ # $Id$
import flask from flask import after_this_request, request
from cStringIO import StringIO as IO from cStringIO import StringIO as IO
import gzip import gzip
import functools import functools
from datetime import datetime
def gzipped(f): def gzipped(f):
@functools.wraps(f) @functools.wraps(f)
def view_func(*args, **kwargs): def view_func(*args, **kwargs):
@flask.after_this_request @after_this_request
def zipper(response): def zipper(response):
accept_encoding = flask.request.headers.get('Accept-Encoding', '') accept_encoding = request.headers.get('Accept-Encoding', '')
if 'gzip' not in accept_encoding.lower(): if 'gzip' not in accept_encoding.lower():
return response return response
......
...@@ -40,7 +40,7 @@ from flask import abort ...@@ -40,7 +40,7 @@ from flask import abort
from flask import url_for from flask import url_for
from flask.json import jsonify from flask.json import jsonify
from flask.json import JSONEncoder from flask.json import JSONEncoder
from lofar.common.flask import gzipped from lofar.common.flask_utils import gzipped
from lofar.sas.resourceassignment.resourceassignmenteditor.fakedata import * from lofar.sas.resourceassignment.resourceassignmenteditor.fakedata import *
from lofar.sas.resourceassignment.resourceassignmenteditor.changeshandler import ChangesHandler, CHANGE_DELETE_TYPE from lofar.sas.resourceassignment.resourceassignmenteditor.changeshandler import ChangesHandler, CHANGE_DELETE_TYPE
from lofar.sas.datamanagement.common.config import DEFAULT_DM_NOTIFICATION_BUSNAME, DEFAULT_DM_NOTIFICATION_SUBJECTS from lofar.sas.datamanagement.common.config import DEFAULT_DM_NOTIFICATION_BUSNAME, DEFAULT_DM_NOTIFICATION_SUBJECTS
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment