Skip to content

Commit

Permalink
Add stringfy for utility to implement __str__ depends on py version
Browse files Browse the repository at this point in the history
  • Loading branch information
chhsiao90 committed Sep 13, 2016
1 parent 3d3fb33 commit ac9995f
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 10 deletions.
10 changes: 10 additions & 0 deletions gviewer/util.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import sys

try:
import pygments
except: # pragma: no cover
Expand All @@ -24,3 +26,11 @@ def _join(markup_list, join_tag):
combined_list.append("")
markup_list = markup_list[index + 1:]
return combined_list


def stringfy(unicode_str): # pragma: no cover
"""Use to support py27 py35 __str__"""
if sys.version_info >= (3,):
return unicode_str
else:
return unicode_str.encode("utf8")
14 changes: 4 additions & 10 deletions gviewer/view/element.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import sys
import urwid
from urwid.util import decompose_tagmarkup

from gviewer.basic_widget import BasicWidget, SearchableText
from gviewer.action import Actions
from gviewer.basic_widget import BasicWidget, SearchableText
from gviewer.util import stringfy


class Base(object): # pragma: no cover
Expand All @@ -15,10 +15,7 @@ def __unicode__(self):
raise NotImplementedError

def __str__(self):
if sys.version_info >= (3,):
return self.__unicode__()
else:
return self.__unicode__().encode("utf8")
return stringfy(self.__unicode__())

def __bytes__(self):
return self.__unicode__().encode("utf8")
Expand Down Expand Up @@ -95,10 +92,7 @@ def __unicode__(self):
return text

def __str__(self):
if sys.version_info >= (3,):
return self.__unicode__()
else:
return self.__unicode__().encode("utf8")
return stringfy(self.__unicode__())

def __bytes__(self):
return self.__unicode__().encode("utf8")
Expand Down

0 comments on commit ac9995f

Please sign in to comment.