[PATCH 0/6] V3 Improve compatibility with python < 2.7

Javier Jardón javier.jardon at codethink.co.uk
Fri Jan 18 18:30:52 GMT 2013


Repo: ssh://git@git.baserock.org/baserock/baserock/morph.git
Ref: jjardon/python_compatibility_fixes
SHA1: 053c0993bb62dd5e1a73d3367ea04c70874f3bd1

Current support for Python < 2.7 seems to be broken
Use the backported ordereddict in case we are using Python < 2.7
so we have the same code base for all Python versions

The python-ordereddict package doesnt seems packaged in Debian
squeeze, but Its available through pypi though.
Please, take this into acount before merge the patch


Javier Jardón (6):
  morph2: Improve compatibility with python < 2.7
  morph2_tests: checks for python2.7 are not needed anymore
  tests.as-root/*: Remove check to run only the teset with Python 2.7
  tests.branching/*: Remove check to run only the teset with Python 2.7
  tests.merging/*: Remove check to run only the teset with Python 2.7
  Remove unneded scripts/python-check script

 morphlib/morph2.py                                 | 29 ++++-------
 morphlib/morph2_tests.py                           | 60 ++++++++++------------
 scripts/python-check                               | 36 -------------
 .../build-handles-stratum-build-depends.script     |  3 --
 tests.as-root/build-with-external-strata.script    |  3 --
 tests.as-root/build-with-push.script               |  3 --
 ...iple-times-doesnt-generate-new-artifacts.script |  3 --
 ...stem-branch-picks-up-uncommitted-changes.script |  3 --
 .../building-a-system-branch-works-anywhere.script |  3 --
 .../rootfs-tarball-builds-rootfs-and-kernel.script |  2 -
 tests.as-root/tarball-image-is-sensible.script     |  2 -
 ...hology-contents-do-not-change-cache-keys.script |  3 --
 tests.branching/ambiguous-refs.script              |  3 --
 .../edit-updates-stratum-build-depends.script      |  3 --
 tests.branching/edit-updates-stratum.script        |  3 --
 tests.branching/petrify-no-double-petrify.script   |  3 --
 tests.branching/petrify.script                     |  3 --
 tests.branching/workflow-petrify.script            |  3 --
 tests.merging/basic.script                         |  3 --
 tests.merging/conflict-chunks.script               |  3 --
 .../conflict-stratum-field-ordering.script         |  3 --
 tests.merging/move-chunk-repo.script               |  3 --
 tests.merging/rename-chunk.script                  |  3 --
 tests.merging/rename-stratum.script                |  3 --
 24 files changed, 36 insertions(+), 150 deletions(-)
 delete mode 100644 scripts/python-check

-- 
1.8.0.2





More information about the baserock-dev mailing list