[ckan-changes] [ckan/ckan] 85d5d0: Pep8 - BugFixing

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: 85d5d0cc164f7812774d8cdf12c5ba0c06fffb6a
      https://github.com/ckan/ckan/commit/85d5d0cc164f7812774d8cdf12c5ba0c06fffb6a
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-11-16 (Wed, 16 Nov 2016)

  Changed paths:
    M ckan/common.py
    M ckan/config/environment.py
    M ckan/config/middleware/__init__.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/auth_tkt.py
    M ckan/lib/base.py
    M ckan/lib/celery_app.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/munge.py
    M ckan/lib/search/common.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/model/core.py
    M ckan/plugins/toolkit_sphinx_extension.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/helpers.py
    M ckan/tests/legacy/logic/test_tag_vocab.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/lib/test_cli.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_update.py
    M ckan/tests/logic/auth/test_update.py
    M ckan/tests/logic/test_validators.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/example_idatasetform/plugin_v1.py
    M ckanext/example_idatasetform/plugin_v2.py
    M ckanext/example_idatasetform/plugin_v4.py
    M ckanext/example_igroupform/plugin.py
    M dev-requirements.txt

  Log Message:
  -----------
  Pep8 - BugFixing


  Commit: e396257fe558c752bd71925dfce2e3200aad09cc
      https://github.com/ckan/ckan/commit/e396257fe558c752bd71925dfce2e3200aad09cc
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-11-17 (Thu, 17 Nov 2016)

  Changed paths:
    M ckan/config/environment.py
    M ckan/lib/cli.py
    M ckan/lib/i18n.py
    M ckan/plugins/interfaces.py
    A ckan/tests/lib/_i18n_build_js_translations/ckanext-test_js_translations.pot
    A ckan/tests/lib/_i18n_build_js_translations/de/LC_MESSAGES/ckanext-test_js_translations.po
    A ckan/tests/lib/test_i18n.py
    M dev-requirements.txt
    M doc/contributing/string-i18n.rst
    M doc/extensions/translating-extensions.rst
    M doc/maintaining/paster.rst
    M setup.py

  Log Message:
  -----------
  Merge remote-tracking branch 'refs/remotes/ckan/master' into pep8

# Conflicts:
#	ckan/config/environment.py
#	dev-requirements.txt


  Commit: 2f3a07fcb6b9d4c9e5f2a52b072be9a3b63c1a5f
      https://github.com/ckan/ckan/commit/2f3a07fcb6b9d4c9e5f2a52b072be9a3b63c1a5f
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-11-17 (Thu, 17 Nov 2016)

  Changed paths:
    M ckan/config/environment.py
    M dev-requirements.txt

  Log Message:
  -----------
  Fix Merge Issue


  Commit: 35aee1ac3e52840fb18ecfdf5adcbbd3e35c99c8
      https://github.com/ckan/ckan/commit/35aee1ac3e52840fb18ecfdf5adcbbd3e35c99c8
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-11-17 (Thu, 17 Nov 2016)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  ES305 On environment.py


  Commit: 9b5bf5d3accc147c90348f210a261cace00f8199
      https://github.com/ckan/ckan/commit/9b5bf5d3accc147c90348f210a261cace00f8199
  Author: Ian Ward <ian at excess.org>
  Date:   2016-11-17 (Thu, 17 Nov 2016)

  Changed paths:
    M ckan/common.py
    M ckan/config/middleware/__init__.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/auth_tkt.py
    M ckan/lib/base.py
    M ckan/lib/celery_app.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/munge.py
    M ckan/lib/search/common.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/model/core.py
    M ckan/plugins/toolkit_sphinx_extension.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/helpers.py
    M ckan/tests/legacy/logic/test_tag_vocab.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/lib/test_cli.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_update.py
    M ckan/tests/logic/auth/test_update.py
    M ckan/tests/logic/test_validators.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/example_idatasetform/plugin_v1.py
    M ckanext/example_idatasetform/plugin_v2.py
    M ckanext/example_idatasetform/plugin_v4.py
    M ckanext/example_igroupform/plugin.py
    M dev-requirements.txt

  Log Message:
  -----------
  Merge pull request #3314 from deinok/pep8

Pep8 - BugFixing


Compare: https://github.com/ckan/ckan/compare/7a976fe6189b...9b5bf5d3accc