Merge branch 'jjardon/python_compatibility_fixes' of ssh://git.baserock.org/baserock/baserock/morph

This includes the following fixups:
  - altering the bootstrap script to install ordereddict and simplejson.
  - Adding a comment to clarify that it is intentional to use simplejson
    if collections does not have OrderedDict
  - Amending the copyright years to include 2013

1 files changed, 0 insertions, 36 deletions

diff --git a/scripts/python-check b/scripts/python-check
deleted file mode 100644
index 6b79897f..00000000
--- a/scripts/python-check
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2012  Codethink Limited
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-# When sourced by scripts, if the python version is too old
-# fake the output and exit.
-
-if ! python --version 2>&1 | grep '^Python 2\.[78]' > /dev/null
-then
-    outpath="$(dirname "$0")/$(basename "$0" .script).stdout"
-    errpath="$(dirname "$0")/$(basename "$0" .script).stderr"
-    exitpath="$(dirname "$0")/$(basename "$0" .script).exit"
-    if [ -r "$outpath" ]; then
-        cat "$outpath"
-    fi
-    if [ -r "$errpath" ]; then
-        cat "$errpath" >&2
-    fi
-    if [ -r "$exitpath" ]; then
-        exit "$(cat "$exitpath")"
-    else
-        exit 0
-    fi
-fi