diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2009-02-13 01:05:42 +0100 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2009-02-13 01:05:42 +0100 |
| commit | c46312d7f5ce4113ece4c33595b7192eccadcb1d (patch) | |
| tree | e3319cfa0f7cf929f2c2d181f60bf80dc34a7361 /lib/python/Tools | |
| parent | aed27e79c07f8f2463ccefed5ba5c3e1b4352052 (diff) | |
| parent | c7cadfc8b46d1f6db38fac73624393873cae2ac7 (diff) | |
| download | enigma2-c46312d7f5ce4113ece4c33595b7192eccadcb1d.tar.gz enigma2-c46312d7f5ce4113ece4c33595b7192eccadcb1d.zip | |
Merge branch 'master' of git.opendreambox.org:/git/enigma2
Diffstat (limited to 'lib/python/Tools')
| -rw-r--r-- | lib/python/Tools/Directories.py | 2 | ||||
| -rw-r--r-- | lib/python/Tools/RedirectOutput.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/python/Tools/Directories.py b/lib/python/Tools/Directories.py index 0d238b30..7dcd5876 100644 --- a/lib/python/Tools/Directories.py +++ b/lib/python/Tools/Directories.py @@ -172,7 +172,7 @@ def getRecordingFilename(basename, dirname = None): filename += c if dirname is not None: - filename = ''.join([dirname, filename]) + filename = ''.join((dirname, filename)) i = 0 while True: diff --git a/lib/python/Tools/RedirectOutput.py b/lib/python/Tools/RedirectOutput.py index b4d4e401..d03a1d97 100644 --- a/lib/python/Tools/RedirectOutput.py +++ b/lib/python/Tools/RedirectOutput.py @@ -3,7 +3,7 @@ from enigma import ePythonOutput class EnigmaOutput: def write(self, data): - if type(data) is unicode: + if isinstance(data, unicode): data = data.encode("UTF-8") ePythonOutput(data) |