From 069d4b2a8fc2beca36ba21c28ae893b18e05663b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jean-Michel=20Nirgal=20Vourg=C3=A8re?= Date: Tue, 11 Feb 2014 16:28:46 +0000 Subject: [PATCH 1/1] Fix for older version of six --- decoratedstr.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/decoratedstr.py b/decoratedstr.py index d226d42..0672138 100755 --- a/decoratedstr.py +++ b/decoratedstr.py @@ -125,20 +125,20 @@ if __name__ == '__main__': if not args: print('Missing required parameter. Try "Œuf"', file=sys.stderr) sys.exit(1) - if six.PY2: - input = unicode(b' '.join(args), options.charset) - else: + if six.PY3: input = ' '.join(args) + else: + input = unicode(b' '.join(args), options.charset) #print("input:", input) # Œuf #print("undecorated:", remove_decoration(input)) # Oeuf #print("regex:", decorated_match(input)) # (œ|Œ|[oòóôöøōŏőOÒÓÔÖØŌŎŐ][eèéêëēĕėęěEÈÉÊËĒĔĖĘĚ])[uùúûüũūŭůűųUÙÚÛÜŨŪŬŮŰŲ][fF] if options.regexp: - if six.PY2: - print(decorated_match(input, options.casesensitive).encode(options.charset)) - else: + if six.PY3: print(decorated_match(input, options.casesensitive)) - else: - if six.PY2: - print(remove_decoration(input).encode(options.charset)) else: + print(decorated_match(input, options.casesensitive).encode(options.charset)) + else: + if six.PY3: print(remove_decoration(input)) + else: + print(remove_decoration(input).encode(options.charset)) -- 2.30.2