From 4ce87b1b589e6241553d20c72716954cdb415210 Mon Sep 17 00:00:00 2001 From: Fred Wright Date: Sat, 9 Apr 2016 19:57:16 -0700 Subject: Makes "future imports" and Python version comments consistent. This makes the "future import" statements consistently specify absolute_import, print_function, and division, for maximum consistency between Python 2 and Python 3. Although absolute_import is probably a don't care for top-level programs, if unit tests were ever implemented for the programs they would be imported as modules, making the module import behavior relevant. Note that previous Python 3 fixes are a prerequisite for this change. Also makes the "polyglot comment" consistent across sources. TESTED: Using a version of SConstruct patched to use the target Python for build helpers, ran "scons build-all check valgrind-audit www/hardware.html" with all six supported Python versions. Also ran gegps, gpscat, gpsprof, xgps, and xgpsspeed with both Python 2 and Python 3. --- gegps | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gegps') diff --git a/gegps b/gegps index 8ded4c95..2378cfce 100755 --- a/gegps +++ b/gegps @@ -20,8 +20,9 @@ # Modified by Chen Wei for use with gpsd # Cleaned up and adapted for the GPSD project by Eric S. Raymond. -# This code runs under both Python 2 and Python 3. Preserve this property! -from __future__ import print_function, division +# This code runs compatibly under Python 2 and 3.x for x >= 2. +# Preserve this property! +from __future__ import absolute_import, print_function, division import sys, os, getopt import gps -- cgit v1.2.1