From 6fdf5f208a0e084f7d22c7e15bf7ea8278e22f39 Mon Sep 17 00:00:00 2001 From: Daniel Narvaez Date: Sat, 28 Sep 2013 11:33:40 +0200 Subject: [PATCH] Use python2 shebang Some distributions have switched to python3 as default and our code breaks because it's python2 specific. Follow the PEP 394 recommendation. --- bin/sugar-activity | 2 +- configure.ac | 1 + tests/data/sample.activity/setup.py | 2 +- tests/test_mime.py | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/sugar-activity b/bin/sugar-activity index 00e9063c..18a69558 100644 --- a/bin/sugar-activity +++ b/bin/sugar-activity @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright (C) 2006-2008, Red Hat, Inc. # diff --git a/configure.ac b/configure.ac index 64650aed..d809b88e 100644 --- a/configure.ac +++ b/configure.ac @@ -15,6 +15,7 @@ GNOME_COMPILE_WARNINGS(maximum) AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal]) +PYTHON=python2 AM_PATH_PYTHON AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) diff --git a/tests/data/sample.activity/setup.py b/tests/data/sample.activity/setup.py index ad218b21..9483050b 100755 --- a/tests/data/sample.activity/setup.py +++ b/tests/data/sample.activity/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 from sugar3.activity import bundlebuilder diff --git a/tests/test_mime.py b/tests/test_mime.py index 68fca5a2..4ca74728 100644 --- a/tests/test_mime.py +++ b/tests/test_mime.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright (C) 2006, Red Hat, Inc. # Copyright (C) 2007, One Laptop Per Child