[galaxy-commits] [galaxyproject/galaxy] a22af1: For python2/3 compatibility, replace basestring wi...

22 Feb 2016


      Branch: refs/heads/dev
  Home:   https://github.com/galaxyproject/galaxy
  Commit: a22af161ade4f2bccf81f9b009947a8b6c7ec579
      https://github.com/galaxyproject/galaxy/commit/a22af161ade4f2bccf81f9b009947...
  Author: Marius van den Beek <m.vandenbeek@gmail.com>
  Date:   2016-02-20 (Sat, 20 Feb 2016)

  Changed paths:
    M lib/galaxy/config.py
    M lib/galaxy/datatypes/data.py
    M lib/galaxy/datatypes/display_applications/application.py
    M lib/galaxy/datatypes/sniff.py
    M lib/galaxy/managers/datasets.py
    M lib/galaxy/managers/taggable.py
    M lib/galaxy/managers/tags.py
    M lib/galaxy/model/__init__.py
    M lib/galaxy/model/metadata.py
    M lib/galaxy/tools/__init__.py
    M lib/galaxy/tools/actions/__init__.py
    M lib/galaxy/tools/data_manager/manager.py
    M lib/galaxy/tools/evaluation.py
    M lib/galaxy/tools/parameters/basic.py
    M lib/galaxy/tools/parameters/grouping.py
    M lib/galaxy/tools/parameters/sanitize.py
    M lib/galaxy/tools/parameters/validation.py
    M lib/galaxy/tools/test.py
    M lib/galaxy/util/__init__.py
    M lib/galaxy/util/sanitize_html.py
    M lib/galaxy/visualization/data_providers/registry.py
    M lib/galaxy/visualization/plugins/config_parser.py
    M lib/galaxy/web/base/controller.py
    M lib/galaxy/web/base/controllers/admin.py
    M lib/galaxy/web/form_builder.py
    M lib/galaxy/web/framework/base.py
    M lib/galaxy/web/framework/decorators.py
    M lib/galaxy/web/framework/helpers/__init__.py
    M lib/galaxy/web/framework/helpers/grids.py
    M lib/galaxy/web/framework/middleware/translogger.py
    M lib/galaxy/web/framework/webapp.py
    M lib/galaxy/webapps/galaxy/api/datasets.py
    M lib/galaxy/webapps/galaxy/api/jobs.py
    M lib/galaxy/webapps/galaxy/api/lda_datasets.py
    M lib/galaxy/webapps/galaxy/api/visualizations.py
    M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
    M lib/galaxy/webapps/galaxy/controllers/data_manager.py
    M lib/galaxy/webapps/galaxy/controllers/dataset.py
    M lib/galaxy/webapps/galaxy/controllers/history.py
    M lib/galaxy/webapps/galaxy/controllers/library_common.py
    M lib/galaxy/webapps/galaxy/controllers/page.py
    M lib/galaxy/webapps/galaxy/controllers/requests_admin.py
    M lib/galaxy/webapps/galaxy/controllers/requests_common.py
    M lib/galaxy/webapps/galaxy/controllers/tag.py
    M lib/galaxy/webapps/galaxy/controllers/visualization.py
    M lib/galaxy/webapps/galaxy/controllers/workflow.py
    M lib/galaxy/webapps/tool_shed/framework/middleware/hg.py
    M lib/galaxy_utils/sequence/fasta.py
    M lib/galaxy_utils/sequence/fastq.py
    M lib/pulsar/client/manager.py
    M lib/tool_shed/galaxy_install/install_manager.py
    M lib/tool_shed/galaxy_install/tool_dependencies/recipe/env_file_builder.py
    M lib/tool_shed/util/basic_util.py
    M lib/tool_shed/util/common_util.py
    M lib/tool_shed/util/tool_util.py

  Log Message:
  -----------
  For python2/3 compatibility, replace basestring with six's string_types, unicode with six's text_type.


  Commit: fbc40f69f68f4e5d547019b561429fd958c237f8
      https://github.com/galaxyproject/galaxy/commit/fbc40f69f68f4e5d547019b561429...
  Author: Marius van den Beek <m.vandenbeek@gmail.com>
  Date:   2016-02-20 (Sat, 20 Feb 2016)

  Changed paths:
    M lib/pulsar/client/interface.py

  Log Message:
  -----------
  use six's text_type


  Commit: da9cd12ae69d584be222f7979f2b5c4567106a99
      https://github.com/galaxyproject/galaxy/commit/da9cd12ae69d584be222f7979f2b5...
  Author: Marius van den Beek <m.vandenbeek@gmail.com>
  Date:   2016-02-20 (Sat, 20 Feb 2016)

  Changed paths:
    M lib/galaxy/datatypes/data.py
    M lib/galaxy/datatypes/sniff.py
    M lib/galaxy/managers/taggable.py
    M lib/galaxy/managers/tags.py
    M lib/galaxy/model/__init__.py
    M lib/galaxy/tools/__init__.py
    M lib/galaxy/util/__init__.py
    M lib/galaxy/util/sanitize_html.py
    M lib/galaxy/web/framework/helpers/__init__.py
    M lib/galaxy/web/framework/helpers/grids.py
    M lib/galaxy/webapps/galaxy/controllers/library_common.py
    M lib/galaxy/webapps/galaxy/controllers/page.py
    M lib/galaxy/webapps/galaxy/controllers/requests_common.py
    M lib/galaxy/webapps/galaxy/controllers/workflow.py
    M lib/tool_shed/util/tool_util.py

  Log Message:
  -----------
  Use unicodify


  Commit: 0028ac263634ee846b0fb9e0e134f6b771f50e1e
      https://github.com/galaxyproject/galaxy/commit/0028ac263634ee846b0fb9e0e134f...
  Author: Marius van den Beek <m.vandenbeek@gmail.com>
  Date:   2016-02-20 (Sat, 20 Feb 2016)

  Changed paths:
    M lib/galaxy/util/__init__.py

  Log Message:
  -----------
  need binary type


  Commit: 8ee38f64f33305753aa96fc230d97a8fabda4885
      https://github.com/galaxyproject/galaxy/commit/8ee38f64f33305753aa96fc230d97...
  Author: Marius van den Beek <m.vandenbeek@gmail.com>
  Date:   2016-02-20 (Sat, 20 Feb 2016)

  Changed paths:
    M lib/galaxy/datatypes/data.py
    M lib/galaxy/model/__init__.py
    M lib/galaxy/tools/__init__.py
    M lib/galaxy/util/sanitize_html.py
    M lib/galaxy/web/form_builder.py

  Log Message:
  -----------
  Do not test if text_type instance before calling unicodify()


  Commit: 6653bcb63bb36c450f4a3d0a6722b4a8c04a6ae8
      https://github.com/galaxyproject/galaxy/commit/6653bcb63bb36c450f4a3d0a6722b...
  Author: Marius van den Beek <m.vandenbeek@gmail.com>
  Date:   2016-02-20 (Sat, 20 Feb 2016)

  Changed paths:
    M lib/galaxy/model/__init__.py

  Log Message:
  -----------
  remove unncessary if statements


  Commit: 66bce36a4075a0b111fff9832f100bba3566447f
      https://github.com/galaxyproject/galaxy/commit/66bce36a4075a0b111fff9832f100...
  Author: mvdbeek <m.vandenbeek@gmail.com>
  Date:   2016-02-20 (Sat, 20 Feb 2016)

  Changed paths:
    M lib/galaxy/tools/__init__.py
    M lib/galaxy/web/framework/helpers/grids.py
    M lib/galaxy/webapps/galaxy/controllers/requests_common.py

  Log Message:
  -----------
  Indentation fixes, import json_fix from galaxy.util.json


  Commit: f706ed7e86244e183482ce18f68e71dcd6fcd5c3
      https://github.com/galaxyproject/galaxy/commit/f706ed7e86244e183482ce18f68e7...
  Author: mvdbeek <m.vandenbeek@gmail.com>
  Date:   2016-02-20 (Sat, 20 Feb 2016)

  Changed paths:
    M lib/galaxy/web/framework/helpers/grids.py

  Log Message:
  -----------
  properly encode column_filter


  Commit: 92fe009f965700f1a3b4e61d33c67c5348084d2a
      https://github.com/galaxyproject/galaxy/commit/92fe009f965700f1a3b4e61d33c67...
  Author: mvdbeek <m.vandenbeek@gmail.com>
  Date:   2016-02-20 (Sat, 20 Feb 2016)

  Changed paths:
    M lib/galaxy/tools/__init__.py

  Log Message:
  -----------
  fix bad rebase


  Commit: 1b25944a5d83bf8893d4969452db67a0b2e61ba0
      https://github.com/galaxyproject/galaxy/commit/1b25944a5d83bf8893d4969452db6...
  Author: Nicola Soranzo <nsoranzo@tiscali.it>
  Date:   2016-02-22 (Mon, 22 Feb 2016)

  Changed paths:
    M lib/galaxy/config.py
    M lib/galaxy/datatypes/data.py
    M lib/galaxy/datatypes/display_applications/application.py
    M lib/galaxy/datatypes/sniff.py
    M lib/galaxy/managers/datasets.py
    M lib/galaxy/managers/taggable.py
    M lib/galaxy/managers/tags.py
    M lib/galaxy/model/__init__.py
    M lib/galaxy/model/metadata.py
    M lib/galaxy/tools/__init__.py
    M lib/galaxy/tools/actions/__init__.py
    M lib/galaxy/tools/data_manager/manager.py
    M lib/galaxy/tools/evaluation.py
    M lib/galaxy/tools/parameters/basic.py
    M lib/galaxy/tools/parameters/grouping.py
    M lib/galaxy/tools/parameters/sanitize.py
    M lib/galaxy/tools/parameters/validation.py
    M lib/galaxy/tools/test.py
    M lib/galaxy/util/__init__.py
    M lib/galaxy/util/sanitize_html.py
    M lib/galaxy/visualization/data_providers/registry.py
    M lib/galaxy/visualization/plugins/config_parser.py
    M lib/galaxy/web/base/controller.py
    M lib/galaxy/web/base/controllers/admin.py
    M lib/galaxy/web/form_builder.py
    M lib/galaxy/web/framework/base.py
    M lib/galaxy/web/framework/decorators.py
    M lib/galaxy/web/framework/helpers/__init__.py
    M lib/galaxy/web/framework/helpers/grids.py
    M lib/galaxy/web/framework/middleware/translogger.py
    M lib/galaxy/web/framework/webapp.py
    M lib/galaxy/webapps/galaxy/api/datasets.py
    M lib/galaxy/webapps/galaxy/api/jobs.py
    M lib/galaxy/webapps/galaxy/api/lda_datasets.py
    M lib/galaxy/webapps/galaxy/api/visualizations.py
    M lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
    M lib/galaxy/webapps/galaxy/controllers/data_manager.py
    M lib/galaxy/webapps/galaxy/controllers/dataset.py
    M lib/galaxy/webapps/galaxy/controllers/history.py
    M lib/galaxy/webapps/galaxy/controllers/library_common.py
    M lib/galaxy/webapps/galaxy/controllers/page.py
    M lib/galaxy/webapps/galaxy/controllers/requests_admin.py
    M lib/galaxy/webapps/galaxy/controllers/requests_common.py
    M lib/galaxy/webapps/galaxy/controllers/tag.py
    M lib/galaxy/webapps/galaxy/controllers/visualization.py
    M lib/galaxy/webapps/galaxy/controllers/workflow.py
    M lib/galaxy/webapps/tool_shed/framework/middleware/hg.py
    M lib/galaxy_utils/sequence/fasta.py
    M lib/galaxy_utils/sequence/fastq.py
    M lib/pulsar/client/interface.py
    M lib/pulsar/client/manager.py
    M lib/tool_shed/galaxy_install/install_manager.py
    M lib/tool_shed/galaxy_install/tool_dependencies/recipe/env_file_builder.py
    M lib/tool_shed/util/basic_util.py
    M lib/tool_shed/util/common_util.py
    M lib/tool_shed/util/tool_util.py

  Log Message:
  -----------
  Merge pull request #1731 from mvdbeek/python_2_3_string_handling

Python 2/3 string handling


Compare: https://github.com/galaxyproject/galaxy/compare/4e73d56bf1dd...1b25944a5d83

[galaxy-commits] [galaxyproject/galaxy] a22af1: For python2/3 compatibility, replace basestring wi...

GitHub