Convert all tabs to 4 spaces (PEP8)

3 files changed, 256 insertions, 256 deletions

diff --git a/test/test_download.py b/test/test_download.py
index d1d6b119b..b3fd7d992 100644
--- a/test/test_download.py
+++ b/test/test_download.py
@@ -13,186 +13,186 @@ from youtube_dl.InfoExtractors import  CollegeHumorIE, XNXXIE
 
 
 class DownloadTest(unittest.TestCase):
-	PARAMETERS_FILE = "test/parameters.json"
-	#calculated with md5sum:
-	#md5sum (GNU coreutils) 8.19
-
-	YOUTUBE_SIZE = 1993883
-	YOUTUBE_URL = "http://www.youtube.com/watch?v=BaW_jenozKc"
-	YOUTUBE_FILE = "BaW_jenozKc.mp4"
-
-	DAILYMOTION_MD5 = "d363a50e9eb4f22ce90d08d15695bb47"
-	DAILYMOTION_URL = "http://www.dailymotion.com/video/x33vw9_tutoriel-de-youtubeur-dl-des-video_tech"
-	DAILYMOTION_FILE = "x33vw9.mp4"
-
-	METACAFE_SIZE = 5754305
-	METACAFE_URL = "http://www.metacafe.com/watch/yt-_aUehQsCQtM/the_electric_company_short_i_pbs_kids_go/"
-	METACAFE_FILE = "_aUehQsCQtM.flv"
-
-	BLIP_MD5 = "93c24d2f4e0782af13b8a7606ea97ba7"
-	BLIP_URL = "http://blip.tv/cbr/cbr-exclusive-gotham-city-imposters-bats-vs-jokerz-short-3-5796352"
-	BLIP_FILE = "5779306.m4v"
-
-	XVIDEO_MD5 = "1ab4dedc01f771cb2a65e91caa801aaf"
-	XVIDEO_URL = "http://www.xvideos.com/video939581/funny_porns_by_s_-1"
-	XVIDEO_FILE = "939581.flv"
-
-	VIMEO_MD5 = "1ab4dedc01f771cb2a65e91caa801aaf"
-	VIMEO_URL = "http://vimeo.com/14160053"
-	VIMEO_FILE = ""
-
-	VIMEO2_MD5 = ""
-	VIMEO2_URL = "http://player.vimeo.com/video/47019590"
-	VIMEO2_FILE = ""
-
-	SOUNDCLOUD_MD5 = "ce3775768ebb6432fa8495d446a078ed"
-	SOUNDCLOUD_URL = "http://soundcloud.com/ethmusic/lostin-powers-she-so-heavy"
-	SOUNDCLOUD_FILE = "n6FLbx6ZzMiu.mp3"
-
-	STANDFORD_MD5 = "22c8206291368c4e2c9c1a307f0ea0f4"
-	STANDFORD_URL = "http://openclassroom.stanford.edu/MainFolder/VideoPage.php?course=PracticalUnix&video=intro-environment&speed=100"
-	STANDFORD_FILE = "PracticalUnix_intro-environment.mp4"
-
-	COLLEGEHUMOR_MD5 = ""
-	COLLEGEHUMOR_URL = "http://www.collegehumor.com/video/6830834/mitt-romney-style-gangnam-style-parody"
-	COLLEGEHUMOR_FILE = ""
-
-	XNXX_MD5 = "5f0469c8d1dfd1bc38c8e6deb5e0a21d"
-	XNXX_URL = "http://video.xnxx.com/video1135332/lida_naked_funny_actress_5_"
-	XNXX_FILE = "1135332.flv"
-
-	def test_youtube(self):
-		#let's download a file from youtube
-		with open(DownloadTest.PARAMETERS_FILE) as f:
-			fd = FileDownloader(json.load(f))
-		fd.add_info_extractor(YoutubeIE())
-		fd.download([DownloadTest.YOUTUBE_URL])
-		self.assertTrue(os.path.exists(DownloadTest.YOUTUBE_FILE))
-		self.assertEqual(os.path.getsize(DownloadTest.YOUTUBE_FILE), DownloadTest.YOUTUBE_SIZE)
-
-	def test_dailymotion(self):
-		with open(DownloadTest.PARAMETERS_FILE) as f:
-			fd = FileDownloader(json.load(f))
-		fd.add_info_extractor(DailymotionIE())
-		fd.download([DownloadTest.DAILYMOTION_URL])
-		self.assertTrue(os.path.exists(DownloadTest.DAILYMOTION_FILE))
-		md5_down_file = md5_for_file(DownloadTest.DAILYMOTION_FILE)
-		self.assertEqual(md5_down_file, DownloadTest.DAILYMOTION_MD5)
-
-	def test_metacafe(self):
-		#this emulate a skip,to be 2.6 compatible
-		with open(DownloadTest.PARAMETERS_FILE) as f:
-			fd = FileDownloader(json.load(f))
-		fd.add_info_extractor(MetacafeIE())
-		fd.add_info_extractor(YoutubeIE())
-		fd.download([DownloadTest.METACAFE_URL])
-		self.assertTrue(os.path.exists(DownloadTest.METACAFE_FILE))
-		self.assertEqual(os.path.getsize(DownloadTest.METACAFE_FILE), DownloadTest.METACAFE_SIZE)
-
-	def test_blip(self):
-		with open(DownloadTest.PARAMETERS_FILE) as f:
-			fd = FileDownloader(json.load(f))
-		fd.add_info_extractor(BlipTVIE())
-		fd.download([DownloadTest.BLIP_URL])
-		self.assertTrue(os.path.exists(DownloadTest.BLIP_FILE))
-		md5_down_file = md5_for_file(DownloadTest.BLIP_FILE)
-		self.assertEqual(md5_down_file, DownloadTest.BLIP_MD5)
-
-	def test_xvideo(self):
-		with open(DownloadTest.PARAMETERS_FILE) as f:
-			fd = FileDownloader(json.load(f))
-		fd.add_info_extractor(XVideosIE())
-		fd.download([DownloadTest.XVIDEO_URL])
-		self.assertTrue(os.path.exists(DownloadTest.XVIDEO_FILE))
-		md5_down_file = md5_for_file(DownloadTest.XVIDEO_FILE)
-		self.assertEqual(md5_down_file, DownloadTest.XVIDEO_MD5)
-
-	def test_vimeo(self):
-		#skipped for the moment produce an error
-		return
-		with open(DownloadTest.PARAMETERS_FILE) as f:
-			fd = FileDownloader(json.load(f))
-		fd.add_info_extractor(VimeoIE())
-		fd.download([DownloadTest.VIMEO_URL])
-		self.assertTrue(os.path.exists(DownloadTest.VIMEO_FILE))
-		md5_down_file = md5_for_file(DownloadTest.VIMEO_FILE)
-		self.assertEqual(md5_down_file, DownloadTest.VIMEO_MD5)
-
-	def test_vimeo2(self):
-		#skipped for the moment produce an error
-		return
-		with open(DownloadTest.PARAMETERS_FILE) as f:
-			fd = FileDownloader(json.load(f))
-		fd.add_info_extractor(VimeoIE())
-		fd.download([DownloadTest.VIMEO2_URL])
-		self.assertTrue(os.path.exists(DownloadTest.VIMEO2_FILE))
-		md5_down_file = md5_for_file(DownloadTest.VIMEO2_FILE)
-		self.assertEqual(md5_down_file, DownloadTest.VIMEO2_MD5)
-
-	def test_soundcloud(self):
-		with open(DownloadTest.PARAMETERS_FILE) as f:
-			fd = FileDownloader(json.load(f))
-		fd.add_info_extractor(SoundcloudIE())
-		fd.download([DownloadTest.SOUNDCLOUD_URL])
-		self.assertTrue(os.path.exists(DownloadTest.SOUNDCLOUD_FILE))
-		md5_down_file = md5_for_file(DownloadTest.SOUNDCLOUD_FILE)
-		self.assertEqual(md5_down_file, DownloadTest.SOUNDCLOUD_MD5)
-
-	def test_standford(self):
-		with open(DownloadTest.PARAMETERS_FILE) as f:
-			fd = FileDownloader(json.load(f))
-		fd.add_info_extractor(StanfordOpenClassroomIE())
-		fd.download([DownloadTest.STANDFORD_URL])
-		self.assertTrue(os.path.exists(DownloadTest.STANDFORD_FILE))
-		md5_down_file = md5_for_file(DownloadTest.STANDFORD_FILE)
-		self.assertEqual(md5_down_file, DownloadTest.STANDFORD_MD5)
-
-	def test_collegehumor(self):
-		with open(DownloadTest.PARAMETERS_FILE) as f:
-			fd = FileDownloader(json.load(f))
-		fd.add_info_extractor(CollegeHumorIE())
-		fd.download([DownloadTest.COLLEGEHUMOR_URL])
-		self.assertTrue(os.path.exists(DownloadTest.COLLEGEHUMOR_FILE))
-		md5_down_file = md5_for_file(DownloadTest.COLLEGEHUMOR_FILE)
-		self.assertEqual(md5_down_file, DownloadTest.COLLEGEHUMOR_MD5)
-
-	def test_xnxx(self):
-		with open(DownloadTest.PARAMETERS_FILE) as f:
-			fd = FileDownloader(json.load(f))
-		fd.add_info_extractor(XNXXIE())
-		fd.download([DownloadTest.XNXX_URL])
-		self.assertTrue(os.path.exists(DownloadTest.XNXX_FILE))
-		md5_down_file = md5_for_file(DownloadTest.XNXX_FILE)
-		self.assertEqual(md5_down_file, DownloadTest.XNXX_MD5)
-
-	def tearDown(self):
-		if os.path.exists(DownloadTest.YOUTUBE_FILE):
-			os.remove(DownloadTest.YOUTUBE_FILE)
-		if os.path.exists(DownloadTest.DAILYMOTION_FILE):
-			os.remove(DownloadTest.DAILYMOTION_FILE)
-		if os.path.exists(DownloadTest.METACAFE_FILE):
-			os.remove(DownloadTest.METACAFE_FILE)
-		if os.path.exists(DownloadTest.BLIP_FILE):
-			os.remove(DownloadTest.BLIP_FILE)
-		if os.path.exists(DownloadTest.XVIDEO_FILE):
-			os.remove(DownloadTest.XVIDEO_FILE)
-		if os.path.exists(DownloadTest.VIMEO_FILE):
-			os.remove(DownloadTest.VIMEO_FILE)
-		if os.path.exists(DownloadTest.SOUNDCLOUD_FILE):
-			os.remove(DownloadTest.SOUNDCLOUD_FILE)
-		if os.path.exists(DownloadTest.STANDFORD_FILE):
-			os.remove(DownloadTest.STANDFORD_FILE)
-		if os.path.exists(DownloadTest.COLLEGEHUMOR_FILE):
-			os.remove(DownloadTest.COLLEGEHUMOR_FILE)
-		if os.path.exists(DownloadTest.XNXX_FILE):
-			os.remove(DownloadTest.XNXX_FILE)
+    PARAMETERS_FILE = "test/parameters.json"
+    #calculated with md5sum:
+    #md5sum (GNU coreutils) 8.19
+
+    YOUTUBE_SIZE = 1993883
+    YOUTUBE_URL = "http://www.youtube.com/watch?v=BaW_jenozKc"
+    YOUTUBE_FILE = "BaW_jenozKc.mp4"
+
+    DAILYMOTION_MD5 = "d363a50e9eb4f22ce90d08d15695bb47"
+    DAILYMOTION_URL = "http://www.dailymotion.com/video/x33vw9_tutoriel-de-youtubeur-dl-des-video_tech"
+    DAILYMOTION_FILE = "x33vw9.mp4"
+
+    METACAFE_SIZE = 5754305
+    METACAFE_URL = "http://www.metacafe.com/watch/yt-_aUehQsCQtM/the_electric_company_short_i_pbs_kids_go/"
+    METACAFE_FILE = "_aUehQsCQtM.flv"
+
+    BLIP_MD5 = "93c24d2f4e0782af13b8a7606ea97ba7"
+    BLIP_URL = "http://blip.tv/cbr/cbr-exclusive-gotham-city-imposters-bats-vs-jokerz-short-3-5796352"
+    BLIP_FILE = "5779306.m4v"
+
+    XVIDEO_MD5 = "1ab4dedc01f771cb2a65e91caa801aaf"
+    XVIDEO_URL = "http://www.xvideos.com/video939581/funny_porns_by_s_-1"
+    XVIDEO_FILE = "939581.flv"
+
+    VIMEO_MD5 = "1ab4dedc01f771cb2a65e91caa801aaf"
+    VIMEO_URL = "http://vimeo.com/14160053"
+    VIMEO_FILE = ""
+
+    VIMEO2_MD5 = ""
+    VIMEO2_URL = "http://player.vimeo.com/video/47019590"
+    VIMEO2_FILE = ""
+
+    SOUNDCLOUD_MD5 = "ce3775768ebb6432fa8495d446a078ed"
+    SOUNDCLOUD_URL = "http://soundcloud.com/ethmusic/lostin-powers-she-so-heavy"
+    SOUNDCLOUD_FILE = "n6FLbx6ZzMiu.mp3"
+
+    STANDFORD_MD5 = "22c8206291368c4e2c9c1a307f0ea0f4"
+    STANDFORD_URL = "http://openclassroom.stanford.edu/MainFolder/VideoPage.php?course=PracticalUnix&video=intro-environment&speed=100"
+    STANDFORD_FILE = "PracticalUnix_intro-environment.mp4"
+
+    COLLEGEHUMOR_MD5 = ""
+    COLLEGEHUMOR_URL = "http://www.collegehumor.com/video/6830834/mitt-romney-style-gangnam-style-parody"
+    COLLEGEHUMOR_FILE = ""
+
+    XNXX_MD5 = "5f0469c8d1dfd1bc38c8e6deb5e0a21d"
+    XNXX_URL = "http://video.xnxx.com/video1135332/lida_naked_funny_actress_5_"
+    XNXX_FILE = "1135332.flv"
+
+    def test_youtube(self):
+        #let's download a file from youtube
+        with open(DownloadTest.PARAMETERS_FILE) as f:
+            fd = FileDownloader(json.load(f))
+        fd.add_info_extractor(YoutubeIE())
+        fd.download([DownloadTest.YOUTUBE_URL])
+        self.assertTrue(os.path.exists(DownloadTest.YOUTUBE_FILE))
+        self.assertEqual(os.path.getsize(DownloadTest.YOUTUBE_FILE), DownloadTest.YOUTUBE_SIZE)
+
+    def test_dailymotion(self):
+        with open(DownloadTest.PARAMETERS_FILE) as f:
+            fd = FileDownloader(json.load(f))
+        fd.add_info_extractor(DailymotionIE())
+        fd.download([DownloadTest.DAILYMOTION_URL])
+        self.assertTrue(os.path.exists(DownloadTest.DAILYMOTION_FILE))
+        md5_down_file = md5_for_file(DownloadTest.DAILYMOTION_FILE)
+        self.assertEqual(md5_down_file, DownloadTest.DAILYMOTION_MD5)
+
+    def test_metacafe(self):
+        #this emulate a skip,to be 2.6 compatible
+        with open(DownloadTest.PARAMETERS_FILE) as f:
+            fd = FileDownloader(json.load(f))
+        fd.add_info_extractor(MetacafeIE())
+        fd.add_info_extractor(YoutubeIE())
+        fd.download([DownloadTest.METACAFE_URL])
+        self.assertTrue(os.path.exists(DownloadTest.METACAFE_FILE))
+        self.assertEqual(os.path.getsize(DownloadTest.METACAFE_FILE), DownloadTest.METACAFE_SIZE)
+
+    def test_blip(self):
+        with open(DownloadTest.PARAMETERS_FILE) as f:
+            fd = FileDownloader(json.load(f))
+        fd.add_info_extractor(BlipTVIE())
+        fd.download([DownloadTest.BLIP_URL])
+        self.assertTrue(os.path.exists(DownloadTest.BLIP_FILE))
+        md5_down_file = md5_for_file(DownloadTest.BLIP_FILE)
+        self.assertEqual(md5_down_file, DownloadTest.BLIP_MD5)
+
+    def test_xvideo(self):
+        with open(DownloadTest.PARAMETERS_FILE) as f:
+            fd = FileDownloader(json.load(f))
+        fd.add_info_extractor(XVideosIE())
+        fd.download([DownloadTest.XVIDEO_URL])
+        self.assertTrue(os.path.exists(DownloadTest.XVIDEO_FILE))
+        md5_down_file = md5_for_file(DownloadTest.XVIDEO_FILE)
+        self.assertEqual(md5_down_file, DownloadTest.XVIDEO_MD5)
+
+    def test_vimeo(self):
+        #skipped for the moment produce an error
+        return
+        with open(DownloadTest.PARAMETERS_FILE) as f:
+            fd = FileDownloader(json.load(f))
+        fd.add_info_extractor(VimeoIE())
+        fd.download([DownloadTest.VIMEO_URL])
+        self.assertTrue(os.path.exists(DownloadTest.VIMEO_FILE))
+        md5_down_file = md5_for_file(DownloadTest.VIMEO_FILE)
+        self.assertEqual(md5_down_file, DownloadTest.VIMEO_MD5)
+
+    def test_vimeo2(self):
+        #skipped for the moment produce an error
+        return
+        with open(DownloadTest.PARAMETERS_FILE) as f:
+            fd = FileDownloader(json.load(f))
+        fd.add_info_extractor(VimeoIE())
+        fd.download([DownloadTest.VIMEO2_URL])
+        self.assertTrue(os.path.exists(DownloadTest.VIMEO2_FILE))
+        md5_down_file = md5_for_file(DownloadTest.VIMEO2_FILE)
+        self.assertEqual(md5_down_file, DownloadTest.VIMEO2_MD5)
+
+    def test_soundcloud(self):
+        with open(DownloadTest.PARAMETERS_FILE) as f:
+            fd = FileDownloader(json.load(f))
+        fd.add_info_extractor(SoundcloudIE())
+        fd.download([DownloadTest.SOUNDCLOUD_URL])
+        self.assertTrue(os.path.exists(DownloadTest.SOUNDCLOUD_FILE))
+        md5_down_file = md5_for_file(DownloadTest.SOUNDCLOUD_FILE)
+        self.assertEqual(md5_down_file, DownloadTest.SOUNDCLOUD_MD5)
+
+    def test_standford(self):
+        with open(DownloadTest.PARAMETERS_FILE) as f:
+            fd = FileDownloader(json.load(f))
+        fd.add_info_extractor(StanfordOpenClassroomIE())
+        fd.download([DownloadTest.STANDFORD_URL])
+        self.assertTrue(os.path.exists(DownloadTest.STANDFORD_FILE))
+        md5_down_file = md5_for_file(DownloadTest.STANDFORD_FILE)
+        self.assertEqual(md5_down_file, DownloadTest.STANDFORD_MD5)
+
+    def test_collegehumor(self):
+        with open(DownloadTest.PARAMETERS_FILE) as f:
+            fd = FileDownloader(json.load(f))
+        fd.add_info_extractor(CollegeHumorIE())
+        fd.download([DownloadTest.COLLEGEHUMOR_URL])
+        self.assertTrue(os.path.exists(DownloadTest.COLLEGEHUMOR_FILE))
+        md5_down_file = md5_for_file(DownloadTest.COLLEGEHUMOR_FILE)
+        self.assertEqual(md5_down_file, DownloadTest.COLLEGEHUMOR_MD5)
+
+    def test_xnxx(self):
+        with open(DownloadTest.PARAMETERS_FILE) as f:
+            fd = FileDownloader(json.load(f))
+        fd.add_info_extractor(XNXXIE())
+        fd.download([DownloadTest.XNXX_URL])
+        self.assertTrue(os.path.exists(DownloadTest.XNXX_FILE))
+        md5_down_file = md5_for_file(DownloadTest.XNXX_FILE)
+        self.assertEqual(md5_down_file, DownloadTest.XNXX_MD5)
+
+    def tearDown(self):
+        if os.path.exists(DownloadTest.YOUTUBE_FILE):
+            os.remove(DownloadTest.YOUTUBE_FILE)
+        if os.path.exists(DownloadTest.DAILYMOTION_FILE):
+            os.remove(DownloadTest.DAILYMOTION_FILE)
+        if os.path.exists(DownloadTest.METACAFE_FILE):
+            os.remove(DownloadTest.METACAFE_FILE)
+        if os.path.exists(DownloadTest.BLIP_FILE):
+            os.remove(DownloadTest.BLIP_FILE)
+        if os.path.exists(DownloadTest.XVIDEO_FILE):
+            os.remove(DownloadTest.XVIDEO_FILE)
+        if os.path.exists(DownloadTest.VIMEO_FILE):
+            os.remove(DownloadTest.VIMEO_FILE)
+        if os.path.exists(DownloadTest.SOUNDCLOUD_FILE):
+            os.remove(DownloadTest.SOUNDCLOUD_FILE)
+        if os.path.exists(DownloadTest.STANDFORD_FILE):
+            os.remove(DownloadTest.STANDFORD_FILE)
+        if os.path.exists(DownloadTest.COLLEGEHUMOR_FILE):
+            os.remove(DownloadTest.COLLEGEHUMOR_FILE)
+        if os.path.exists(DownloadTest.XNXX_FILE):
+            os.remove(DownloadTest.XNXX_FILE)
 
 def md5_for_file(filename, block_size=2**20):
-	with open(filename) as f:
-		md5 = hashlib.md5()
-		while True:
-			data = f.read(block_size)
-			if not data:
-				break
-			md5.update(data)
-			return md5.hexdigest()
+    with open(filename) as f:
+        md5 = hashlib.md5()
+        while True:
+            data = f.read(block_size)
+            if not data:
+                break
+            md5.update(data)
+            return md5.hexdigest()
diff --git a/test/test_import.py b/test/test_import.py
index 6c5d0bcc1..acf95444d 100644
--- a/test/test_import.py
+++ b/test/test_import.py
@@ -5,9 +5,9 @@ import os.path
 import subprocess
 
 class TestImport(unittest.TestCase):
-	def test_import(self):
-		rootDir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-		subprocess.check_call([sys.executable, '-c', 'import youtube_dl'], cwd=rootDir)
+    def test_import(self):
+        rootDir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+        subprocess.check_call([sys.executable, '-c', 'import youtube_dl'], cwd=rootDir)
 
 if __name__ == '__main__':
-	unittest.main()
+    unittest.main()
diff --git a/test/test_utils.py b/test/test_utils.py
index e2f226bf1..ceefabefc 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -14,79 +14,79 @@ from youtube_dl.utils import unescapeHTML
 from youtube_dl.utils import orderedSet
 
 if sys.version_info < (3,0):
-	_compat_str = lambda b: b.decode('unicode-escape')
+    _compat_str = lambda b: b.decode('unicode-escape')
 else:
-	_compat_str = lambda s: s
+    _compat_str = lambda s: s
 
 class TestUtil(unittest.TestCase):
-	def test_timeconvert(self):
-		self.assertTrue(timeconvert('') is None)
-		self.assertTrue(timeconvert('bougrg') is None)
-
-	def test_sanitize_filename(self):
-		self.assertEqual(sanitize_filename('abc'), 'abc')
-		self.assertEqual(sanitize_filename('abc_d-e'), 'abc_d-e')
-
-		self.assertEqual(sanitize_filename('123'), '123')
-
-		self.assertEqual('abc_de', sanitize_filename('abc/de'))
-		self.assertFalse('/' in sanitize_filename('abc/de///'))
-
-		self.assertEqual('abc_de', sanitize_filename('abc/<>\\*|de'))
-		self.assertEqual('xxx', sanitize_filename('xxx/<>\\*|'))
-		self.assertEqual('yes no', sanitize_filename('yes? no'))
-		self.assertEqual('this - that', sanitize_filename('this: that'))
-
-		self.assertEqual(sanitize_filename('AT&T'), 'AT&T')
-		aumlaut = _compat_str('\xe4')
-		self.assertEqual(sanitize_filename(aumlaut), aumlaut)
-		tests = _compat_str('\u043a\u0438\u0440\u0438\u043b\u043b\u0438\u0446\u0430')
-		self.assertEqual(sanitize_filename(tests), tests)
-
-		forbidden = '"\0\\/'
-		for fc in forbidden:
-			for fbc in forbidden:
-				self.assertTrue(fbc not in sanitize_filename(fc))
-
-	def test_sanitize_filename_restricted(self):
-		self.assertEqual(sanitize_filename('abc', restricted=True), 'abc')
-		self.assertEqual(sanitize_filename('abc_d-e', restricted=True), 'abc_d-e')
-
-		self.assertEqual(sanitize_filename('123', restricted=True), '123')
-
-		self.assertEqual('abc_de', sanitize_filename('abc/de', restricted=True))
-		self.assertFalse('/' in sanitize_filename('abc/de///', restricted=True))
-
-		self.assertEqual('abc_de', sanitize_filename('abc/<>\\*|de', restricted=True))
-		self.assertEqual('xxx', sanitize_filename('xxx/<>\\*|', restricted=True))
-		self.assertEqual('yes_no', sanitize_filename('yes? no', restricted=True))
-		self.assertEqual('this_-_that', sanitize_filename('this: that', restricted=True))
-
-		tests =_compat_str('a\xe4b\u4e2d\u56fd\u7684c')
-		self.assertEqual(sanitize_filename(tests, restricted=True), 'a_b_c')
-		self.assertTrue(sanitize_filename(_compat_str('\xf6'), restricted=True) != '') # No empty filename
-
-		forbidden = '"\0\\/&!: \'\t\n'
-		for fc in forbidden:
-			for fbc in forbidden:
-				self.assertTrue(fbc not in sanitize_filename(fc, restricted=True))
-
-		# Handle a common case more neatly
-		self.assertEqual(sanitize_filename(_compat_str('\u5927\u58f0\u5e26 - Song'), restricted=True), 'Song')
-		self.assertEqual(sanitize_filename(_compat_str('\u603b\u7edf: Speech'), restricted=True), 'Speech')
-		# .. but make sure the file name is never empty
-		self.assertTrue(sanitize_filename('-', restricted=True) != '')
-		self.assertTrue(sanitize_filename(':', restricted=True) != '')
-
-	def test_ordered_set(self):
-		self.assertEqual(orderedSet([1,1,2,3,4,4,5,6,7,3,5]), [1,2,3,4,5,6,7])
-		self.assertEqual(orderedSet([]), [])
-		self.assertEqual(orderedSet([1]), [1])
-		#keep the list ordered
-		self.assertEqual(orderedSet([135,1,1,1]), [135,1])
-
-	def test_unescape_html(self):
-		self.assertEqual(unescapeHTML(_compat_str('%20;')), _compat_str('%20;'))
+    def test_timeconvert(self):
+        self.assertTrue(timeconvert('') is None)
+        self.assertTrue(timeconvert('bougrg') is None)
+
+    def test_sanitize_filename(self):
+        self.assertEqual(sanitize_filename('abc'), 'abc')
+        self.assertEqual(sanitize_filename('abc_d-e'), 'abc_d-e')
+
+        self.assertEqual(sanitize_filename('123'), '123')
+
+        self.assertEqual('abc_de', sanitize_filename('abc/de'))
+        self.assertFalse('/' in sanitize_filename('abc/de///'))
+
+        self.assertEqual('abc_de', sanitize_filename('abc/<>\\*|de'))
+        self.assertEqual('xxx', sanitize_filename('xxx/<>\\*|'))
+        self.assertEqual('yes no', sanitize_filename('yes? no'))
+        self.assertEqual('this - that', sanitize_filename('this: that'))
+
+        self.assertEqual(sanitize_filename('AT&T'), 'AT&T')
+        aumlaut = _compat_str('\xe4')
+        self.assertEqual(sanitize_filename(aumlaut), aumlaut)
+        tests = _compat_str('\u043a\u0438\u0440\u0438\u043b\u043b\u0438\u0446\u0430')
+        self.assertEqual(sanitize_filename(tests), tests)
+
+        forbidden = '"\0\\/'
+        for fc in forbidden:
+            for fbc in forbidden:
+                self.assertTrue(fbc not in sanitize_filename(fc))
+
+    def test_sanitize_filename_restricted(self):
+        self.assertEqual(sanitize_filename('abc', restricted=True), 'abc')
+        self.assertEqual(sanitize_filename('abc_d-e', restricted=True), 'abc_d-e')
+
+        self.assertEqual(sanitize_filename('123', restricted=True), '123')
+
+        self.assertEqual('abc_de', sanitize_filename('abc/de', restricted=True))
+        self.assertFalse('/' in sanitize_filename('abc/de///', restricted=True))
+
+        self.assertEqual('abc_de', sanitize_filename('abc/<>\\*|de', restricted=True))
+        self.assertEqual('xxx', sanitize_filename('xxx/<>\\*|', restricted=True))
+        self.assertEqual('yes_no', sanitize_filename('yes? no', restricted=True))
+        self.assertEqual('this_-_that', sanitize_filename('this: that', restricted=True))
+
+        tests =_compat_str('a\xe4b\u4e2d\u56fd\u7684c')
+        self.assertEqual(sanitize_filename(tests, restricted=True), 'a_b_c')
+        self.assertTrue(sanitize_filename(_compat_str('\xf6'), restricted=True) != '') # No empty filename
+
+        forbidden = '"\0\\/&!: \'\t\n'
+        for fc in forbidden:
+            for fbc in forbidden:
+                self.assertTrue(fbc not in sanitize_filename(fc, restricted=True))
+
+        # Handle a common case more neatly
+        self.assertEqual(sanitize_filename(_compat_str('\u5927\u58f0\u5e26 - Song'), restricted=True), 'Song')
+        self.assertEqual(sanitize_filename(_compat_str('\u603b\u7edf: Speech'), restricted=True), 'Speech')
+        # .. but make sure the file name is never empty
+        self.assertTrue(sanitize_filename('-', restricted=True) != '')
+        self.assertTrue(sanitize_filename(':', restricted=True) != '')
+
+    def test_ordered_set(self):
+        self.assertEqual(orderedSet([1,1,2,3,4,4,5,6,7,3,5]), [1,2,3,4,5,6,7])
+        self.assertEqual(orderedSet([]), [])
+        self.assertEqual(orderedSet([1]), [1])
+        #keep the list ordered
+        self.assertEqual(orderedSet([135,1,1,1]), [135,1])
+
+    def test_unescape_html(self):
+        self.assertEqual(unescapeHTML(_compat_str('%20;')), _compat_str('%20;'))
 
 if __name__ == '__main__':
-	unittest.main()
+    unittest.main()