equal
deleted
inserted
replaced
73 |
73 |
74 def recode(self, s, encoding=None): |
74 def recode(self, s, encoding=None): |
75 if not encoding: |
75 if not encoding: |
76 encoding = self.encoding or 'utf-8' |
76 encoding = self.encoding or 'utf-8' |
77 |
77 |
|
78 if isinstance(s, unicode): |
|
79 return s.encode("utf-8") |
78 try: |
80 try: |
79 return s.decode(encoding).encode("utf-8") |
81 return s.decode(encoding).encode("utf-8") |
80 except: |
82 except: |
81 try: |
83 try: |
82 return s.decode("latin-1").encode("utf-8") |
84 return s.decode("latin-1").encode("utf-8") |