Issue 2196 - [cms] Drop depencency on Flask for test server

Issue 2196 - [cms] Drop depencency on Flask for test server

[Sebastian Noack, 2015-03-21 12:50:17]

http://codereview.adblockplus.org/6451712864813056/diff/5741031244955648/cms/...
File cms/bin/test_server.py (right):

http://codereview.adblockplus.org/6451712864813056/diff/5741031244955648/cms/...
cms/bin/test_server.py:61: path = environ.get("REQUEST_URI") or
environ.get("PATH_INFO")
Do we need that hack? As far as I know PATH_INFO is WSGI and REQUEST_URI is
mod_python.

http://codereview.adblockplus.org/6451712864813056/diff/5741031244955648/cms/...
cms/bin/test_server.py:69: if isinstance(data, unicode):
How about following?

  import mimetypes
  mime = mimtypes.guess_type(path)[0]

  if isinstance(data, unicode):
    data = data.encode("utf-8")
    mime = (mime or "text/plain") + "; charset=utf-8"
  elif not mime:
    mime = "application/octet-stream"

* No need for maintaining an own hard-coded mapping of mime types.
* Plus we only add the charset if we actually know it.

[Sebastian Noack, 2015-03-23 11:31:10]

http://codereview.adblockplus.org/6451712864813056/diff/5741031244955648/cms/...
File cms/bin/test_server.py (right):

http://codereview.adblockplus.org/6451712864813056/diff/5741031244955648/cms/...
cms/bin/test_server.py:61: path = environ.get("REQUEST_URI") or
environ.get("PATH_INFO")
On 2015/03/21 12:50:18, Sebastian Noack wrote:
> Do we need that hack? As far as I know PATH_INFO is WSGI and REQUEST_URI is
> mod_python.

We might actually want to use wsgiref.util.request_uri() here.

[Wladimir Palant, 2015-03-23 11:51:07]

http://codereview.adblockplus.org/6451712864813056/diff/5741031244955648/cms/...
File cms/bin/test_server.py (right):

http://codereview.adblockplus.org/6451712864813056/diff/5741031244955648/cms/...
cms/bin/test_server.py:61: path = environ.get("REQUEST_URI") or
environ.get("PATH_INFO")
On 2015/03/21 12:50:18, Sebastian Noack wrote:
> Do we need that hack? As far as I know PATH_INFO is WSGI and REQUEST_URI is
> mod_python.

Done.

http://codereview.adblockplus.org/6451712864813056/diff/5741031244955648/cms/...
cms/bin/test_server.py:69: if isinstance(data, unicode):
On 2015/03/21 12:50:18, Sebastian Noack wrote:
> How about following?

Normally, I would delegate that to a separate issue. But we are refactoring
anyway...

Side-effect of this change: we only support Unicode in pages now, not in
JavaScript or CSS files.

[Sebastian Noack, 2015-03-23 12:06:46]

http://codereview.adblockplus.org/6451712864813056/diff/5733935958982656/cms/...
File cms/bin/test_server.py (right):

http://codereview.adblockplus.org/6451712864813056/diff/5733935958982656/cms/...
cms/bin/test_server.py:41: ERROR_500 = """
How about using a common template for both error pages, removing duplication?

http://codereview.adblockplus.org/6451712864813056/diff/5733935958982656/cms/...
cms/bin/test_server.py:83: return [template.render(**kwargs).encode("utf-8")]
How about this?

  for fragment in template.stream(**kwargs):
    yield fragment.encode("utf-8")

http://codereview.adblockplus.org/6451712864813056/diff/5733935958982656/cms/...
cms/bin/test_server.py:96: mime += "; charset=utf-8"
Maybe we should add a (global) variable for the encoding to don't hard-code it
multiple times.

  ENCODING = "utf-8"

  ...

  def show_template(start_response, status, template_data, **kwargs):
    ...

    start_response(status, [("Content-Type", "text/html; encoding=" +
ENCODING)])
    for fragment in template.stream(**kwargs):
      yield fragment.encode(ENCODING)

  ...

  def handler(envion, start_response):
    ...

    data = data.encode(ENCODING)
    mime = "%s; %s" % (mime, ENCODING)

[Wladimir Palant, 2015-03-23 12:27:26]

http://codereview.adblockplus.org/6451712864813056/diff/5733935958982656/cms/...
File cms/bin/test_server.py (right):

http://codereview.adblockplus.org/6451712864813056/diff/5733935958982656/cms/...
cms/bin/test_server.py:41: ERROR_500 = """
On 2015/03/23 12:06:47, Sebastian Noack wrote:
> How about using a common template for both error pages, removing duplication?

Done.

http://codereview.adblockplus.org/6451712864813056/diff/5733935958982656/cms/...
cms/bin/test_server.py:83: return [template.render(**kwargs).encode("utf-8")]
On 2015/03/23 12:06:47, Sebastian Noack wrote:
> How about this?
> 
>   for fragment in template.stream(**kwargs):
>     yield fragment.encode("utf-8")

Done.

http://codereview.adblockplus.org/6451712864813056/diff/5733935958982656/cms/...
cms/bin/test_server.py:96: mime += "; charset=utf-8"
On 2015/03/23 12:06:47, Sebastian Noack wrote:
> Maybe we should add a (global) variable for the encoding to don't hard-code it
> multiple times.
> 
>   ENCODING = "utf-8"
> 
>   ...
> 
>   def show_template(start_response, status, template_data, **kwargs):
>     ...
> 
>     start_response(status, [("Content-Type", "text/html; encoding=" +
> ENCODING)])
>     for fragment in template.stream(**kwargs):
>       yield fragment.encode(ENCODING)
> 
>   ...
> 
>   def handler(envion, start_response):
>     ...
> 
>     data = data.encode(ENCODING)
>     mime = "%s; %s" % (mime, ENCODING)

Done.

[Sebastian Noack, 2015-03-23 12:40:56]

LGTM