From 3077b0f53e5c84c7d7c1d3d30a319219d9542826 Mon Sep 17 00:00:00 2001 From: aph Date: Tue, 19 Nov 2013 19:47:58 +0000 Subject: [PATCH] fix for py3.x --- clint/textui/colored.py | 1 + clint/textui/prompt.py | 4 ++-- clint/utils.py | 2 +- examples/args.py | 6 ++++-- tox.ini | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/clint/textui/colored.py b/clint/textui/colored.py index 2c18b75..fd80bbe 100644 --- a/clint/textui/colored.py +++ b/clint/textui/colored.py @@ -17,6 +17,7 @@ import sys PY3 = sys.version_info[0] >= 3 from ..packages import colorama +from ..utils import basestring __all__ = ( 'red', 'green', 'yellow', 'blue', diff --git a/clint/textui/prompt.py b/clint/textui/prompt.py index 7c4bbdd..64d60bf 100644 --- a/clint/textui/prompt.py +++ b/clint/textui/prompt.py @@ -8,7 +8,7 @@ Module for simple interactive prompts handling """ -from __future__ import absolute_import +from __future__ import absolute_import, print_function from re import match, I @@ -30,7 +30,7 @@ def yn(prompt, default='y', batch=False): if not batch: input = raw_input(prompt).strip() else: - print prompt + print(prompt) input = '' # If input is empty default choice is assumed diff --git a/clint/utils.py b/clint/utils.py index e84e851..8d391dd 100644 --- a/clint/utils.py +++ b/clint/utils.py @@ -17,7 +17,7 @@ from os import makedirs from glob import glob try: - basestring + basestring = basestring except NameError: basestring = str diff --git a/examples/args.py b/examples/args.py index 777aeda..6bee364 100644 --- a/examples/args.py +++ b/examples/args.py @@ -1,6 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- +from __future__ import print_function + import sys import os @@ -15,6 +17,6 @@ with indent(4, quote='>>>'): puts(colored.red('Files detected: ') + str(args.files)) puts(colored.red('NOT Files detected: ') + str(args.not_files)) puts(colored.red('Grouped Arguments: ') + str(dict(args.grouped))) - -print + +print() diff --git a/tox.ini b/tox.ini index 24c96a5..d8ca534 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py26,py27,py3 +envlist = py26,py27,py32,py33 [testenv] commands=py.test --junitxml=junit-{envname}.xml