Fix issues with python3

The introduced way of printing things in python3 would work for byte arrays but not for simple strings. This patch fixes this issue. Signed-off-by: Lars Kiesow <[email protected]>
shon · May 11, 2014 · d6cbfdb · d6cbfdb
1 parent a787b22
commit d6cbfdb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/feedgen/__main__.py b/feedgen/__main__.py
@@ -11,13 +11,11 @@
 from feedgen.feed import FeedGenerator
 import sys
 
-def print_enc(string):
-	version = sys.version_info[0]
-
-	if version == 2:
-		print(string)
-	elif version == 3:
-		sys.stdout.buffer.write(string)
+def print_enc(s):
+	'''Print function compatible with both python2 and python3 accepting strings
+	and byte arrays.
+	'''
+	print(s.decode('utf-8') if type(s) == type(b'') else s)
 
 
 

diff --git a/setup.py b/setup.py
@@ -27,6 +27,7 @@
 			'Operating System :: OS Independent',
 			'Programming Language :: Python',
 			'Programming Language :: Python :: 2',
+			'Programming Language :: Python :: 3',
 			'Topic :: Communications',
 			'Topic :: Internet',
 			'Topic :: Text Processing',