[ckan-changes] [ckan/ckan] b6aa80: [#2401] Cast string to unicode instead of str.

[GitHub]

  Branch: refs/heads/release-v2.3.1
  Home:   https://github.com/ckan/ckan
  Commit: b6aa80086dcfd1181491ecff8923743f0ef5845e
      https://github.com/ckan/ckan/commit/b6aa80086dcfd1181491ecff8923743f0ef5845e
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-06-22 (Mon, 22 Jun 2015)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/new_tests/lib/test_helpers.py

  Log Message:
  -----------
  [#2401] Cast string to unicode instead of str.

Casting the string to str caused an error for characters outside of the
ascii range. Notably, BOM at the beginning of documents.

Conflicts:
	ckan/tests/lib/test_helpers.py


  Commit: c059ab29d9ab72eba5f5b03f3d892caa0e9a9988
      https://github.com/ckan/ckan/commit/c059ab29d9ab72eba5f5b03f3d892caa0e9a9988
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-06-22 (Mon, 22 Jun 2015)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/new_tests/controllers/test_package.py
    M ckan/tests/functional/test_package.py

  Log Message:
  -----------
  Fix for /dataset?sort exception.


Compare: https://github.com/ckan/ckan/compare/508802f59236...c059ab29d9ab