Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: cff9292f07d1318ce789bcfdab7dbf3e67c8d162 https://github.com/galaxyproject/galaxy/commit/cff9292f07d1318ce789bcfdab7db... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2017-08-18 (Fri, 18 Aug 2017) Changed paths: M lib/galaxy/util/__init__.py M lib/galaxy/util/pastescript/serve.py Log Message: ----------- Uniform indentation of multiline if conditionals Use 8-spaces indentation for the conditional continuation lines of an `if`-statement where the conditional part spans multiple lines. According to PEP-8, using 4-spaces "can produce a visual conflict with the indented suite of code nested inside the `if`-statement", but the PEP "takes no explicit position". There were only 2 places in the whole codebase where 8 spaces were not used, this will make it uniform. Commit: d2d1f857bbc2b7528e2e17cc8fcfdaad7d79fa75 https://github.com/galaxyproject/galaxy/commit/d2d1f857bbc2b7528e2e17cc8fcfd... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2017-08-18 (Fri, 18 Aug 2017) Changed paths: M lib/galaxy/util/pastescript/serve.py Log Message: ----------- Fix import order and Python3 compatibility for lib/galaxy/util/pastescript/serve.py Commit: 9c6fd670cf201b9b3fed67cd5f100d75a24cb5f6 https://github.com/galaxyproject/galaxy/commit/9c6fd670cf201b9b3fed67cd5f100... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-08-18 (Fri, 18 Aug 2017) Changed paths: M lib/galaxy/util/__init__.py M lib/galaxy/util/pastescript/serve.py Log Message: ----------- Merge pull request #4455 from nsoranzo/multiline_if_conditionals Uniform indentation of multiline if conditionals Compare: https://github.com/galaxyproject/galaxy/compare/e4924942825c...9c6fd670cf20