From b16b2ce7237159c3764c5cc2a3e7292d31310d25 Mon Sep 17 00:00:00 2001 From: Thomas Kluyver Date: Fri, 6 Jan 2012 00:11:51 +0000 Subject: [PATCH] All examples work on Python 3. --- clint/eng.py | 5 +++++ clint/textui/colored.py | 18 +++++++++++++----- clint/utils.py | 4 ++++ examples/colors_all.py | 4 +++- examples/eng_join.py | 2 +- examples/resources.py | 12 +++++++----- examples/text_width.py | 5 +++-- 7 files changed, 36 insertions(+), 14 deletions(-) diff --git a/clint/eng.py b/clint/eng.py index 8d9f608..e903631 100644 --- a/clint/eng.py +++ b/clint/eng.py @@ -14,6 +14,11 @@ COMMA = ',' CONJUNCTION = 'and' SPACE = ' ' +try: + unicode +except NameError: + unicode = str + def join(l, conj=CONJUNCTION, im_a_moron=MORON_MODE, seperator=COMMA): """Joins lists of words. Oxford comma and all.""" diff --git a/clint/textui/colored.py b/clint/textui/colored.py index e7c0754..63d7593 100644 --- a/clint/textui/colored.py +++ b/clint/textui/colored.py @@ -14,6 +14,8 @@ from __future__ import absolute_import import re import sys +PY3 = sys.version_info[0] >= 3 + from ..packages import colorama __all__ = ( @@ -53,12 +55,18 @@ class ColoredString(object): def __repr__(self): return "<%s-string: '%s'>" % (self.color, self.s) - def __str__(self): - return self.__unicode__().encode('utf8') - def __unicode__(self): return self.color_str + if PY3: + __str__ = __unicode__ + else: + def __str__(self): + return unicode(self).encode('utf8') + + def __iter__(self): + return iter(self.color_str) + def __add__(self, other): return str(self.color_str) + str(other) @@ -68,8 +76,8 @@ class ColoredString(object): def __mul__(self, other): return (self.color_str * other) - def split(self, x=' '): - return map(self._new, self.s.split(x)) + def split(self, sep=None): + return [self._new(s) for s in self.s.split(sep)] def _new(self, s): return ColoredString(self.color, s) diff --git a/clint/utils.py b/clint/utils.py index fb41ff1..e84e851 100644 --- a/clint/utils.py +++ b/clint/utils.py @@ -16,6 +16,10 @@ import os.path from os import makedirs from glob import glob +try: + basestring +except NameError: + basestring = str def expand_path(path): """Expands directories and globs in given path.""" diff --git a/examples/colors_all.py b/examples/colors_all.py index 92dd779..79d09c5 100755 --- a/examples/colors_all.py +++ b/examples/colors_all.py @@ -1,6 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- +from __future__ import print_function + import sys import os @@ -13,4 +15,4 @@ text = 'THIS TEXT IS COLORED %s!' if __name__ == '__main__': for color in colored.COLORS: - print getattr(colored, color)(text % color.upper()) \ No newline at end of file + print(getattr(colored, color)(text % color.upper())) diff --git a/examples/eng_join.py b/examples/eng_join.py index c2736b1..12d3dee 100644 --- a/examples/eng_join.py +++ b/examples/eng_join.py @@ -17,7 +17,7 @@ colors = [ colored.magenta('magenta') ] -colors = map(str, colors) +colors = [str(cs) for cs in colors] puts('Smart:') diff --git a/examples/resources.py b/examples/resources.py index 7380c09..0ec65d0 100755 --- a/examples/resources.py +++ b/examples/resources.py @@ -1,6 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- +from __future__ import print_function + import sys import os @@ -13,16 +15,16 @@ resources.init('kennethreitz', 'clint') lorem = 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.' -print '%s created.' % resources.user.path +print('%s created.' % resources.user.path) resources.user.write('lorem.txt', lorem) -print 'lorem.txt created' +print('lorem.txt created') assert resources.user.read('lorem.txt') == lorem -print 'lorem.txt has correct contents' +print('lorem.txt has correct contents') resources.user.delete('lorem.txt') -print 'lorem.txt deleted' +print('lorem.txt deleted') assert resources.user.read('lorem.txt') == None -print 'lorem.txt deletion confirmed' \ No newline at end of file +print('lorem.txt deletion confirmed') diff --git a/examples/text_width.py b/examples/text_width.py index bfbfe15..ed37716 100755 --- a/examples/text_width.py +++ b/examples/text_width.py @@ -19,5 +19,6 @@ if __name__ == '__main__': col = 60 - puts(columns([(colored.red('Column 1')), col], [(colored.green('Column Two')), None], [(colored.magenta('Column III')), col])) - puts(columns(['hi there my name is kenneth and this is a columns', col], [lorem, None], ['kenneths', col])) \ No newline at end of file + puts(columns([(colored.red('Column 1')), col], [(colored.green('Column Two')), None], + [(colored.magenta('Column III')), col])) + puts(columns(['hi there my name is kenneth and this is a columns', col], [lorem, None], ['kenneths', col]))