Philipp Hagemeister 65697b3bf3 Merge branch 'paged-lists' ...

Conflicts:
	test/test_utils.py
	youtube_dl/extractor/youtube.py

2014-01-22 20:00:16 +01:00

..

__init__.py

…

helper.py

[tests] Remove global_setup function

2013-11-25 03:47:32 +01:00

parameters.json

Make socket timeout configurable, and bump default to 10 minutes (#1862)

2013-12-01 11:42:02 +01:00

test_age_restriction.py

[tests] Remove global_setup function

2013-11-25 03:47:32 +01:00

test_all_urls.py

[vimeo] Fix playlist URL matching

2014-01-07 07:13:47 +01:00

test_download.py

[everyonesmixtape] Add support (Fixes #2161)

2014-01-17 02:56:13 +01:00

test_execution.py

…

test_playlists.py

[everyonesmixtape] Add support (Fixes #2161)

2014-01-17 02:56:13 +01:00

test_subtitles.py

[ted] Updated checksums

2014-01-17 03:54:54 +01:00

test_unicode_literals.py

[setup.py] Do not use unicode literals

2014-01-05 04:41:50 +01:00

test_utils.py

Merge branch 'paged-lists'

2014-01-22 20:00:16 +01:00

test_write_annotations.py

[tests] Remove global_setup function

2013-11-25 03:47:32 +01:00

test_write_info_json.py

Update description value for the write_info_json test (required after 27dcce19045670fc348ff1119c0d2283aaed3ae2)

2013-12-04 20:35:00 +01:00

test_youtube_lists.py

Lower number of expected entries in top list

2013-12-09 04:50:48 +01:00

test_youtube_signature.py

Remove youtube swf signature test

2014-01-17 03:49:59 +01:00

test_YoutubeDL.py

Use unicode_literals in test_YoutubeDL

2014-01-22 14:48:02 +01:00