Merge branch 'master' of https://github.com/nficano/pytube into video-metadata-#195

Pipfile

@@ -1,18 +1,11 @@
 [[source]]
-
 url = "https://pypi.python.org/simple"
 verify_ssl = true
 name = "pypi"
 
-
 [packages]
 
-"flake8" = "*"
-"enum34" = "*"
-
-
 [dev-packages]
-
 bumpversion = "*"
 coveralls = "*"
 "flake8" = "*"
@@ -26,3 +19,4 @@ sphinx-rtd-theme = "*"
 configparser = "*"
 "urllib3" = "*"
 pyopenssl = "*"
+"enum34" = "*"

Pipfile.lock

@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "e517b067af601141604f030b60fecfa67d34ff012465b87979a6baa106a56194"
+            "sha256": "c601d22d66227c0d7c54837b8aad349a5f578cf1cf540ab38f56b48fe1313cab"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -13,53 +13,7 @@
             }
         ]
     },
-    "default": {
-        "configparser": {
-            "hashes": [
-                "sha256:5308b47021bc2340965c371f0f058cc6971a04502638d4244225c49d80db273a"
-            ],
-            "markers": "python_version < '3.2'",
-            "version": "==3.5.0"
-        },
-        "enum34": {
-            "hashes": [
-                "sha256:2d81cbbe0e73112bdfe6ef8576f2238f2ba27dd0d55752a776c41d38b7da2850",
-                "sha256:644837f692e5f550741432dd3f223bbb9852018674981b1664e5dc339387588a",
-                "sha256:6bd0f6ad48ec2aa117d3d141940d484deccda84d4fcd884f5c3d93c23ecd8c79",
-                "sha256:8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1"
-            ],
-            "markers": "python_version < '3.4'",
-            "version": "==1.1.6"
-        },
-        "flake8": {
-            "hashes": [
-                "sha256:7253265f7abd8b313e3892944044a365e3f4ac3fcdcfb4298f55ee9ddf188ba0",
-                "sha256:c7841163e2b576d435799169b78703ad6ac1bbb0f199994fc05f700b2a90ea37"
-            ],
-            "version": "==3.5.0"
-        },
-        "mccabe": {
-            "hashes": [
-                "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42",
-                "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f"
-            ],
-            "version": "==0.6.1"
-        },
-        "pycodestyle": {
-            "hashes": [
-                "sha256:682256a5b318149ca0d2a9185d365d8864a768a28db66a84a2ea946bcc426766",
-                "sha256:6c4245ade1edfad79c3446fadfc96b0de2759662dc29d07d80a6f27ad1ca6ba9"
-            ],
-            "version": "==2.3.1"
-        },
-        "pyflakes": {
-            "hashes": [
-                "sha256:08bd6a50edf8cffa9fa09a463063c425ecaaf10d1eb0335a7e8b1401aef89e6f",
-                "sha256:8d616a382f243dbf19b54743f280b80198be0bca3a5396f1d2e1fca6223e8805"
-            ],
-            "version": "==1.6.0"
-        }
-    },
+    "default": {},
     "develop": {
         "alabaster": {
             "hashes": [
@@ -77,17 +31,17 @@
         },
         "aspy.yaml": {
             "hashes": [
-                "sha256:6215f44900ff65f27dbd00a36b06a7926276436ed377320cfd4febd69bbd4a94",
-                "sha256:be70cc0ccd1ee1d30f589f2403792eb2ffa7546470af0a17179541b13d8374df"
+                "sha256:c959530fab398e2391516bc8d5146489f9273b07d87dd8ba5e8b73406f7cc1fa",
+                "sha256:da95110d120a9168c9f43601b9cb732f006d8f193ee2c9b402c823026e4a9387"
             ],
-            "version": "==1.0.0"
+            "version": "==1.1.0"
         },
         "attrs": {
             "hashes": [
-                "sha256:1c7960ccfd6a005cd9f7ba884e6316b5e430a3f1a6c37c5f87d8b43f83b54ec9",
-                "sha256:a17a9573a6f475c99b551c0e0a812707ddda1ec9653bed04c13841404ed6f450"
+                "sha256:4b90b09eeeb9b88c35bc642cbac057e45a5fd85367b985bd2809c62b7b939265",
+                "sha256:e0d0eb91441a3b53dab4d9b743eafc1ac44476296a2053b6ca3af0b139faf87b"
             ],
-            "version": "==17.4.0"
+            "version": "==18.1.0"
         },
         "babel": {
             "hashes": [
@@ -101,21 +55,22 @@
                 "sha256:6744c873dd7aafc24453d8b6a1a0d6d109faf63cd0cd19cb78fd46e74932c77e",
                 "sha256:6753d9ff3552013e2130f7bc03c1007e24473b4835952679653fb132367bdd57"
             ],
+            "index": "pypi",
             "version": "==0.5.3"
         },
         "cached-property": {
             "hashes": [
-                "sha256:6e6935ec62567fbcbc346fad84fcea9bc77e3547b7267e62bc5b7ed8e5438ae8",
-                "sha256:a2fa0f89dd422f7e5dd992a4a3e0ce209d5d1e47a4db28fd0a7b5273ec8da3f0"
+                "sha256:67acb3ee8234245e8aea3784a492272239d9c4b487eba2fdcce9d75460d34520",
+                "sha256:bf093e640b7294303c7cc7ba3212f00b7a07d0416c1d923465995c9ef860a139"
             ],
-            "version": "==1.4.0"
+            "version": "==1.4.2"
         },
         "certifi": {
             "hashes": [
-                "sha256:14131608ad2fd56836d33a71ee60fa1c82bc9d2c8d98b7bdbc631fe1b3cd1296",
-                "sha256:edbc3f203427eef571f79a7692bb160a2b0f7ccaa31953e99bd17e307cf63f7d"
+                "sha256:13e698f54293db9f89122b0581843a782ad0934a4fe0172d2a980ba77fc61bb7",
+                "sha256:9fa520c1bacfb634fa7af20a76bcbd3d5fb390481724c597da32c719a7dca4b0"
             ],
-            "version": "==2018.1.18"
+            "version": "==2018.4.16"
         },
         "cffi": {
             "hashes": [
@@ -147,7 +102,7 @@
                 "sha256:edabd457cd23a02965166026fd9bfd196f4324fe6032e866d0f3bd0301cd486f",
                 "sha256:fdf1c1dc5bafc32bc5d08b054f94d659422b05aba244d6be4ddc1c72d9aa70fb"
             ],
-            "markers": "platform_python_implementation != 'PyPy'",
+            "markers": "platform_python_implementation != 'pypy'",
             "version": "==1.11.5"
         },
         "cfgv": {
@@ -168,7 +123,7 @@
             "hashes": [
                 "sha256:5308b47021bc2340965c371f0f058cc6971a04502638d4244225c49d80db273a"
             ],
-            "markers": "python_version < '3.2'",
+            "index": "pypi",
             "version": "==3.5.0"
         },
         "coverage": {
@@ -217,35 +172,30 @@
                 "sha256:32569a43c9dbc13fa8199247580a4ab182ef439f51f65bb7f8316d377a1340e8",
                 "sha256:664794748d2e5673e347ec476159a9d87f43e0d2d44950e98ed0e27b98da8346"
             ],
+            "index": "pypi",
             "version": "==1.3.0"
         },
         "cryptography": {
             "hashes": [
-                "sha256:0d39a93cf25edeae1f796bbc5960e587f34513a852564f6345ea4491a86c5997",
-                "sha256:18d0b0fc21f39b35ea469a82584f55eeecec1f65a92d85af712c425bdef627b3",
-                "sha256:27a208b9600166976182351174948e128818e7fc95cbdba18143f3106a211546",
-                "sha256:28e4e9a97713aa47b5ef9c5003def2eb58aec89781ef3ef82b1c2916a8b0639b",
-                "sha256:2cfcee8829c5dec55597826d52c26bc26e7ce39adb4771584459d0636b0b7108",
-                "sha256:33b564196dcd563e309a0b07444e31611368afe3a3822160c046f5e4c3b5cdd7",
-                "sha256:41f94194ae78f83fd94ca94fb8ad65f92210a76a2421169ffa5c33c3ec7605f4",
-                "sha256:4f385ee7d39ee1ed74f1d6b1da03d0734ea82855a7b28a9e6e88c4091bc58664",
-                "sha256:55555d784cfdf9033e81f044c0df04babed2aa141213765d960d233b0139e353",
-                "sha256:69285f5615507b6625f89ea1048addd1d9218585fb886eb90bdebb1d2b2d26f5",
-                "sha256:6cb1224da391fa90f1be524eafb375b62baf8d3df9690b32e8cc475ccfccee5e",
-                "sha256:6fb22f63e17813f3d1d8e30dd1e249e2c34233ba1d3de977fd31cb5db764c7d0",
-                "sha256:7a2409f1564c84bcf2563d379c9b6148c5bc6b0ae46e109f6a7b4bebadf551df",
-                "sha256:8487524a1212223ca6dc7e2c8913024618f7ff29855c98869088e3818d5f6733",
-                "sha256:9a2945efcff84830c8e237ab037d0269380d75d400a89cc9e5628e52647e21be",
-                "sha256:9a47a80f65f4feaaf8415a40c339806c7d7d867152ddccc6ca87f707c8b7b565",
-                "sha256:a3c180d12ffb1d8ee5b33a514a5bcb2a9cc06cc89aa74038015591170c82f55d",
-                "sha256:a5f2c681fd040ed648513939a1dd2242af19bd5e9e79e53b6dcfa33bdae61217",
-                "sha256:b984523d28737e373c7c35c8b6db6001537609d47534892de189bebebaa42a47",
-                "sha256:d18df9cf3f3212df28d445ea82ce702c4d7a35817ef7a38ee38879ffa8f7e857",
-                "sha256:e4d967371c5b6b2e67855066471d844c5d52d210c36c28d49a8507b96e2c5291",
-                "sha256:ee245f185fae723133511e2450be08a66c2eebb53ad27c0c19b228029f4748a5",
-                "sha256:fc2208d95d9ecc8032f5e38330d5ace2e3b0b998e42b08c30c35b2ab3a4a3bc8"
-            ],
-            "version": "==2.1.4"
+                "sha256:3f3b65d5a16e6b52fba63dc860b62ca9832f51f1a2ae5083c78b6840275f12dd",
+                "sha256:551a3abfe0c8c6833df4192a63371aa2ff43afd8f570ed345d31f251d78e7e04",
+                "sha256:5cb990056b7cadcca26813311187ad751ea644712022a3976443691168781b6f",
+                "sha256:60bda7f12ecb828358be53095fc9c6edda7de8f1ef571f96c00b2363643fa3cd",
+                "sha256:6fef51ec447fe9f8351894024e94736862900d3a9aa2961528e602eb65c92bdb",
+                "sha256:77d0ad229d47a6e0272d00f6bf8ac06ce14715a9fd02c9a97f5a2869aab3ccb2",
+                "sha256:808fe471b1a6b777f026f7dc7bd9a4959da4bfab64972f2bbe91e22527c1c037",
+                "sha256:9b62fb4d18529c84b961efd9187fecbb48e89aa1a0f9f4161c61b7fc42a101bd",
+                "sha256:9e5bed45ec6b4f828866ac6a6bedf08388ffcfa68abe9e94b34bb40977aba531",
+                "sha256:9fc295bf69130a342e7a19a39d7bbeb15c0bcaabc7382ec33ef3b2b7d18d2f63",
+                "sha256:abd070b5849ed64e6d349199bef955ee0ad99aefbad792f0c587f8effa681a5e",
+                "sha256:ba6a774749b6e510cffc2fb98535f717e0e5fd91c7c99a61d223293df79ab351",
+                "sha256:c332118647f084c983c6a3e1dba0f3bcb051f69d12baccac68db8d62d177eb8a",
+                "sha256:d6f46e862ee36df81e6342c2177ba84e70f722d9dc9c6c394f9f1f434c4a5563",
+                "sha256:db6013746f73bf8edd9c3d1d3f94db635b9422f503db3fc5ef105233d4c011ab",
+                "sha256:f57008eaff597c69cf692c3518f6d4800f0309253bb138b526a37fe9ef0c7471",
+                "sha256:f6c821ac253c19f2ad4c8691633ae1d1a17f120d5b01ea1d256d7b602bc59887"
+            ],
+            "version": "==2.2.2"
         },
         "docopt": {
             "hashes": [
@@ -268,7 +218,7 @@
                 "sha256:6bd0f6ad48ec2aa117d3d141940d484deccda84d4fcd884f5c3d93c23ecd8c79",
                 "sha256:8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1"
             ],
-            "markers": "python_version < '3.4'",
+            "index": "pypi",
             "version": "==1.1.6"
         },
         "flake8": {
@@ -276,22 +226,15 @@
                 "sha256:7253265f7abd8b313e3892944044a365e3f4ac3fcdcfb4298f55ee9ddf188ba0",
                 "sha256:c7841163e2b576d435799169b78703ad6ac1bbb0f199994fc05f700b2a90ea37"
             ],
+            "index": "pypi",
             "version": "==3.5.0"
         },
-        "funcsigs": {
-            "hashes": [
-                "sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca",
-                "sha256:a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50"
-            ],
-            "markers": "python_version < '3.3'",
-            "version": "==1.0.2"
-        },
         "identify": {
             "hashes": [
-                "sha256:53be6ea950a5f40e13be2dd87e67413eb6879527b831333196ab2a54de38f499",
-                "sha256:c0bfb29634e04cde8e54aee2d55aff9dad30d6ea1f3e9e3ce731934d78635aa1"
+                "sha256:8c127f455e8503eb3a5ed5388527719e1fef00a41b5e58dc036bc116f3bb8a16",
+                "sha256:bb5bdf324b4a24def86757c8dd8a4e91a9c28bbf1bf8505d702ce4b8d2508270"
             ],
-            "version": "==1.0.8"
+            "version": "==1.0.16"
         },
         "idna": {
             "hashes": [
@@ -307,13 +250,6 @@
             ],
             "version": "==1.0.0"
         },
-        "ipaddress": {
-            "hashes": [
-                "sha256:200d8686011d470b5e4de207d803445deee427455cd0cb7c982b68cf82524f81"
-            ],
-            "markers": "python_version < '3'",
-            "version": "==1.0.19"
-        },
         "jinja2": {
             "hashes": [
                 "sha256:74c935a1b8bb9a3947c50a54766a969d4846290e1e788ea44c1392163723c3bd",
@@ -339,14 +275,22 @@
                 "sha256:5ce3c71c5545b472da17b72268978914d0252980348636840bd34a00b5cc96c1",
                 "sha256:b158b6df76edd239b8208d481dc46b6afd45a846b7812ff0ce58971cf5bc8bba"
             ],
-            "markers": "python_version < '3.0'",
+            "index": "pypi",
             "version": "==2.0.0"
         },
+        "more-itertools": {
+            "hashes": [
+                "sha256:0dd8f72eeab0d2c3bd489025bb2f6a1b8342f9b198f6fc37b52d15cfa4531fea",
+                "sha256:11a625025954c20145b37ff6309cd54e39ca94f72f6bb9576d1195db6fa2442e",
+                "sha256:c9ce7eccdcb901a2c75d326ea134e0886abfbea5f93e91cc95de9507c0816c44"
+            ],
+            "version": "==4.1.0"
+        },
         "nodeenv": {
             "hashes": [
-                "sha256:98835dab727f94a713eacc7234e3db6777a55cafb60f391485011899e5c818df"
+                "sha256:dd0a34001090ff042cfdb4b0c8d6a6f7ec9baa49733f00b695bb8a8b4700ba6c"
             ],
-            "version": "==1.2.0"
+            "version": "==1.3.0"
         },
         "packaging": {
             "hashes": [
@@ -357,30 +301,33 @@
         },
         "pbr": {
             "hashes": [
-                "sha256:05f61c71aaefc02d8e37c0a3eeb9815ff526ea28b3b76324769e6158d7f95be1",
-                "sha256:60c25b7dfd054ef9bb0ae327af949dd4676aa09ac3a9471cdc871d8a9213f9ac"
+                "sha256:4e8a0ed6a8705a26768f4c3da26026013b157821fe5f95881599556ea9d91c19",
+                "sha256:dae4aaa78eafcad10ce2581fc34d694faa616727837fd8e55c1a00951ad6744f"
             ],
-            "version": "==3.1.1"
+            "version": "==4.0.2"
         },
         "pluggy": {
             "hashes": [
-                "sha256:7f8ae7f5bdf75671a718d2daf0a64b7885f74510bcd98b1a0bb420eb9a9d0cff"
+                "sha256:7f8ae7f5bdf75671a718d2daf0a64b7885f74510bcd98b1a0bb420eb9a9d0cff",
+                "sha256:d345c8fe681115900d6da8d048ba67c25df42973bda370783cd58826442dcd7c",
+                "sha256:e160a7fcf25762bb60efc7e171d4497ff1d8d2d75a3d0df7a21b76821ecbf5c5"
             ],
             "version": "==0.6.0"
         },
         "pre-commit": {
             "hashes": [
-                "sha256:1b96ef893c003fcf81ac7c39cc790b01438dea05d9298e73bb61b9bf572282c3",
-                "sha256:89ab725f311e6785f2f391ecfb6730b12b991d9488ae08d9d382104364527110"
+                "sha256:01bb5f44606735ca30c8be641fa24f5760fcc599a0260ead0067bcde2f0305f9",
+                "sha256:823452163aa9fb024a9ff30947ba7f5a2778708db7554a4d36438b9bbead6bbb"
             ],
-            "version": "==1.8.1"
+            "index": "pypi",
+            "version": "==1.8.2"
         },
         "py": {
             "hashes": [
-                "sha256:8cca5c229d225f8c1e3085be4fcf306090b00850fefad892f9d96c7b6e2f310f",
-                "sha256:ca18943e28235417756316bfada6cd96b23ce60dd532642690dcfdaba988a76d"
+                "sha256:29c9fab495d7528e80ba1e343b958684f4ace687327e6f789a94bf3d1915f881",
+                "sha256:983f77f3331356039fdd792e9220b7b8ee1aa6bd2b25f567a963ff1de5a64f6a"
             ],
-            "version": "==1.5.2"
+            "version": "==1.5.3"
         },
         "pycodestyle": {
             "hashes": [
@@ -414,6 +361,7 @@
                 "sha256:07a2de1a54de07448732a81e38a55df7da109b2f47f599f8bb35b0cbec69d4bd",
                 "sha256:2c10cfba46a52c0b0950118981d61e72c1e5b1aac451ca1bc77de1a679456773"
             ],
+            "index": "pypi",
             "version": "==17.5.0"
         },
         "pyparsing": {
@@ -430,38 +378,34 @@
         },
         "pytest": {
             "hashes": [
-                "sha256:062027955bccbc04d2fcd5d79690947e018ba31abe4c90b2c6721abec734261b",
-                "sha256:117bad36c1a787e1a8a659df35de53ba05f9f3398fb9e4ac17e80ad5903eb8c5"
+                "sha256:54713b26c97538db6ff0703a12b19aeaeb60b5e599de542e7fca0ec83b9038e8",
+                "sha256:829230122facf05a5f81a6d4dfe6454a04978ea3746853b2b84567ecf8e5c526"
             ],
-            "version": "==3.4.2"
+            "index": "pypi",
+            "version": "==3.5.1"
         },
         "pytest-cov": {
             "hashes": [
                 "sha256:03aa752cf11db41d281ea1d807d954c4eda35cfa1b21d6971966cc041bbf6e2d",
                 "sha256:890fe5565400902b0c78b5357004aab1c814115894f4f21370e2433256a3eeec"
             ],
+            "index": "pypi",
             "version": "==2.5.1"
         },
         "pytest-mock": {
             "hashes": [
-                "sha256:03a2fea79d0a83a8de2e77e92afe5f0a5ca99a58cc68f843f9a74de34800a943",
-                "sha256:b879dff61e31fcd4727c227c182f15f222a155293cc64ed5a02d55e0020cf949"
+                "sha256:53801e621223d34724926a5c98bd90e8e417ce35264365d39d6c896388dcc928",
+                "sha256:d89a8209d722b8307b5e351496830d5cc5e192336003a485443ae9adeb7dd4c0"
             ],
-            "version": "==1.7.1"
+            "index": "pypi",
+            "version": "==1.10.0"
         },
         "pytz": {
             "hashes": [
-                "sha256:07edfc3d4d2705a20a6e99d97f0c4b61c800b8232dc1c04d87e8554f130148dd",
-                "sha256:3a47ff71597f821cd84a162e71593004286e5be07a340fd462f0d33a760782b5",
-                "sha256:410bcd1d6409026fbaa65d9ed33bf6dd8b1e94a499e32168acfc7b332e4095c0",
-                "sha256:5bd55c744e6feaa4d599a6cbd8228b4f8f9ba96de2c38d56f08e534b3c9edf0d",
-                "sha256:61242a9abc626379574a166dc0e96a66cd7c3b27fc10868003fa210be4bff1c9",
-                "sha256:887ab5e5b32e4d0c86efddd3d055c1f363cbaa583beb8da5e22d2fa2f64d51ef",
-                "sha256:ba18e6a243b3625513d85239b3e49055a2f0318466e0b8a92b8fb8ca7ccdf55f",
-                "sha256:ed6509d9af298b7995d69a440e2822288f2eca1681b8cce37673dbb10091e5fe",
-                "sha256:f93ddcdd6342f94cea379c73cddb5724e0d6d0a1c91c9bdef364dc0368ba4fda"
+                "sha256:65ae0c8101309c45772196b21b74c46b2e5d11b6275c45d251b150d5da334555",
+                "sha256:c06425302f2cf668f1bba7a0a03f3c1d34d4ebeef2c72003da308b3947c7f749"
             ],
-            "version": "==2018.3"
+            "version": "==2018.4"
         },
         "pyyaml": {
             "hashes": [
@@ -505,17 +449,19 @@
         },
         "sphinx": {
             "hashes": [
-                "sha256:41ae26acc6130ccf6ed47e5cca73742b80d55a134f0ab897c479bba8d3640b8e",
-                "sha256:da987de5fcca21a4acc7f67a86a363039e67ac3e8827161e61b91deb131c0ee8"
+                "sha256:2e7ad92e96eff1b2006cf9f0cdb2743dacbae63755458594e9e8238b0c3dc60b",
+                "sha256:e9b1a75a3eae05dded19c80eb17325be675e0698975baae976df603b6ed1eb10"
             ],
-            "version": "==1.7.1"
+            "index": "pypi",
+            "version": "==1.7.4"
         },
         "sphinx-rtd-theme": {
             "hashes": [
-                "sha256:2df74b8ff6fae6965c527e97cca6c6c944886aae474b490e17f92adfbe843417",
-                "sha256:62ee4752716e698bad7de8a18906f42d33664128eea06c46b718fc7fbd1a9f5c"
+                "sha256:32424dac2779f0840b4788fbccb032ba2496c1ca47a439ad2510c8b1e55dfd33",
+                "sha256:6d0481532b5f441b075127a2d755f430f1f8410a50112b1af6b069518548381d"
             ],
-            "version": "==0.2.4"
+            "index": "pypi",
+            "version": "==0.3.1"
         },
         "sphinxcontrib-websupport": {
             "hashes": [
@@ -524,28 +470,20 @@
             ],
             "version": "==1.0.1"
         },
-        "typing": {
-            "hashes": [
-                "sha256:3a887b021a77b292e151afb75323dea88a7bc1b3dfa92176cff8e44c8b68bddf",
-                "sha256:b2c689d54e1144bbcfd191b0832980a21c2dbcf7b5ff7a66248a60c90e951eb8",
-                "sha256:d400a9344254803a2368533e4533a4200d21eb7b6b729c173bc38201a74db3f2"
-            ],
-            "markers": "python_version < '3.5'",
-            "version": "==3.6.4"
-        },
         "urllib3": {
             "hashes": [
                 "sha256:06330f386d6e4b195fbfc736b297f58c5a892e4440e54d294d7004e3a9bbea1b",
                 "sha256:cc44da8e1145637334317feebd728bd869a35285b93cbb4cca2577da7e62db4f"
             ],
+            "index": "pypi",
             "version": "==1.22"
         },
         "virtualenv": {
             "hashes": [
-                "sha256:02f8102c2436bb03b3ee6dede1919d1dac8a427541652e5ec95171ec8adbc93a",
-                "sha256:39d88b533b422825d644087a21e78c45cf5af0ef7a99a1fc9fbb7b481e5c85b0"
+                "sha256:1d7e241b431e7afce47e77f8843a276f652699d1fa4f93b9d8ce0076fd7b0b54",
+                "sha256:e8e05d4714a1c51a2f5921e62f547fcb0f713ebbe959e0a7f585cc8bef71d11f"
             ],
-            "version": "==15.1.0"
+            "version": "==15.2.0"
         }
     }
 }

README.md

@@ -13,7 +13,7 @@
 </div>
 
 # pytube
-*pytube* is a lightweight, dependency-free Python library (and command-line utility) for downloading YouTube Videos.
+*pytube* is a very serious, lightweight, dependency-free Python library (and command-line utility) for downloading YouTube Videos.
 
 ## Description
 YouTube is the most popular video-sharing platform in the world and as a hacker you may encounter a situation where you want to script something to download videos.  For this I present to you *pytube*.

pytube/__init__.py

@@ -2,14 +2,10 @@
 # flake8: noqa
 # noreorder
 """
-Pytube is a Python library for downloading YouTube Videos.
-
-Pytube aims to be lightweight, dependency-free, extensively documented and
-follows best practice patterns.
-
+Pytube: a very serious Python library for downloading YouTube Videos.
 """
 __title__ = 'pytube'
-__version__ = '9.1.1'
+__version__ = '9.2.3'
 __author__ = 'Nick Ficano'
 __license__ = 'MIT License'
 __copyright__ = 'Copyright 2017 Nick Ficano'

pytube/__main__.py

@@ -19,10 +19,11 @@ from pytube import mixins
 from pytube import request
 from pytube import Stream
 from pytube import StreamQuery
+from pytube.compat import install_proxy
 from pytube.compat import parse_qsl
+from pytube.exceptions import VideoUnavailable
 from pytube.helpers import apply_mixin
 
-
 logger = logging.getLogger(__name__)
 
 
@@ -31,7 +32,7 @@ class YouTube(object):
 
     def __init__(
         self, url=None, defer_prefetch_init=False, on_progress_callback=None,
-        on_complete_callback=None,
+        on_complete_callback=None, proxies=None,
     ):
         """Construct a :class:`YouTube <YouTube>`.
 
@@ -80,6 +81,9 @@ class YouTube(object):
             'on_complete': on_complete_callback,
         }
 
+        if proxies:
+            install_proxy(proxies)
+
         if not defer_prefetch_init:
             self.prefetch_init()
 
@@ -154,6 +158,8 @@ class YouTube(object):
 
         """
         self.watch_html = request.get(url=self.watch_url)
+        if '<img class="icon meh" src="/yts/img' not in self.watch_html:
+            raise VideoUnavailable('This video is unavailable.')
         self.embed_html = request.get(url=self.embed_url)
         self.age_restricted = extract.is_age_restricted(self.watch_html)
         self.vid_info_url = extract.video_info_url(

pytube/compat.py

@@ -10,6 +10,7 @@ PY33 = sys.version_info[0:2] >= (3, 3)
 
 
 if PY2:
+    import urllib2
     from urllib import urlencode
     from urllib2 import URLError
     from urllib2 import quote
@@ -18,6 +19,17 @@ if PY2:
     from urlparse import parse_qsl
     from HTMLParser import HTMLParser
 
+    def install_proxy(proxy_handler):
+        """
+        install global proxy.
+        :param proxy_handler:
+            :samp:`{"http":"http://my.proxy.com:1234", "https":"https://my.proxy.com:1234"}`
+        :return:
+        """
+        proxy_support = urllib2.ProxyHandler(proxy_handler)
+        opener = urllib2.build_opener(proxy_support)
+        urllib2.install_opener(opener)
+
     def unescape(s):
         """Strip HTML entries from a string."""
         html_parser = HTMLParser()
@@ -34,6 +46,12 @@ elif PY3:
     from urllib.parse import unquote
     from urllib.parse import urlencode
     from urllib.request import urlopen
+    from urllib import request
+
+    def install_proxy(proxy_handler):
+        proxy_support = request.ProxyHandler(proxy_handler)
+        opener = request.build_opener(proxy_support)
+        request.install_opener(opener)
 
     def unicode(s):
         """No-op."""

pytube/contrib/playlist.py

@@ -66,26 +66,67 @@ class Playlist(object):
             complete_url = base_url + video_id
             self.video_urls.append(complete_url)
 
-    def download_all(self, download_path=None):
+    def _path_num_prefix_generator(self, reverse=False):
+        """
+        This generator function generates number prefixes, for the items
+        in the playlist.
+        If the number of digits required to name a file,is less than is
+        required to name the last file,it prepends 0s.
+        So if you have a playlist of 100 videos it will number them like:
+        001, 002, 003 ect, up to 100.
+        It also adds a space after the number.
+        :return: prefix string generator : generator
+        """
+        digits = len(str(len(self.video_urls)))
+        if reverse:
+            start, stop, step = (len(self.video_urls), 0, -1)
+        else:
+            start, stop, step = (1, len(self.video_urls) + 1, 1)
+        return (str(i).zfill(digits) for i in range(start, stop, step))
+
+    def download_all(
+        self, download_path=None, prefix_number=True,
+        reverse_numbering=False,
+    ):
         """Download all the videos in the the playlist. Initially, download
         resolution is 720p (or highest available), later more option
         should be added to download resolution of choice
 
         TODO(nficano): Add option to download resolution of user's choice
+
+        :param download_path:
+            (optional) Output path for the playlist If one is not
+            specified, defaults to the current working directory.
+            This is passed along to the Stream objects.
+        :type download_path: str or None
+        :param prefix_number:
+            (optional) Automatically numbers playlists using the
+            _path_num_prefix_generator function.
+        :type prefix_number: bool
+        :param reverse_numbering:
+            (optional) Lets you number playlists in reverse, since some
+            playlists are ordered newest -> oldests.
+        :type reverse_numbering: bool
         """
 
         self.populate_video_urls()
-        logger.debug('total videos found: ', len(self.video_urls))
+        logger.debug('total videos found: %d', len(self.video_urls))
         logger.debug('starting download')
 
+        prefix_gen = self._path_num_prefix_generator(reverse_numbering)
+
         for link in self.video_urls:
             yt = YouTube(link)
-
             # TODO: this should not be hardcoded to a single user's preference
             dl_stream = yt.streams.filter(
                 progressive=True, subtype='mp4',
             ).order_by('resolution').desc().first()
 
             logger.debug('download path: %s', download_path)
-            dl_stream.download(download_path)
+            if prefix_number:
+                prefix = next(prefix_gen)
+                logger.debug('file prefix is: %s', prefix)
+                dl_stream.download(download_path, filename_prefix=prefix)
+            else:
+                dl_stream.download(download_path)
             logger.debug('download complete')

pytube/exceptions.py

@@ -34,3 +34,7 @@ class ExtractError(PytubeError):
 
 class RegexMatchError(ExtractError):
     """Regex pattern did not return any matches."""
+
+
+class VideoUnavailable(PytubeError):
+    """Video is unavailable."""

pytube/itags.py

@@ -57,9 +57,9 @@ ITAGS = {
     246: ('480p', None),
     247: ('720p', None),
     248: ('1080p', None),
-    264: ('144p', None),
+    264: ('1440p', None),
     266: ('2160p', None),
-    271: ('144p',  None),
+    271: ('1440p',  None),
     272: ('2160p', None),
     278: ('144p', None),
     298: ('720p', None),

pytube/query.py

@@ -187,7 +187,7 @@ class StreamQuery:
     def get_by_itag(self, itag):
         """Get the corresponding :class:`Stream <Stream>` for a given itag.
 
-        :param str itag:
+        :param str int itag:
             YouTube format identifier code.
         :rtype: :class:`Stream <Stream>` or None
         :returns:
@@ -196,7 +196,7 @@ class StreamQuery:
 
         """
         try:
-            return self.itag_index[itag]
+            return self.itag_index[int(itag)]
         except KeyError:
             pass
 

pytube/streams.py

@@ -9,6 +9,7 @@ separately).
 """
 from __future__ import absolute_import
 
+import io
 import logging
 import os
 import pprint
@@ -173,7 +174,7 @@ class Stream(object):
         filename = safe_filename(title)
         return '{filename}.{s.subtype}'.format(filename=filename, s=self)
 
-    def download(self, output_path=None, filename=None):
+    def download(self, output_path=None, filename=None, filename_prefix=None):
         """Write the media stream to disk.
 
         :param output_path:
@@ -184,8 +185,15 @@ class Stream(object):
             (optional) Output filename (stem only) for writing media file.
             If one is not specified, the default filename is used.
         :type filename: str or None
+        :param filename_prefix:
+            (optional) A string that will be prepended to the filename.
+            For example a number in a playlist or the name of a series.
+            If one is not specified, nothing will be prepended
+            This is seperate from filename so you can use the default
+            filename but still add a prefix.
+        :type filename_prefix: str or None
 
-        :rtype: None
+        :rtype: str
 
         """
         output_path = output_path or os.getcwd()
@@ -194,6 +202,13 @@ class Stream(object):
             filename = '{filename}.{s.subtype}'.format(filename=safe, s=self)
         filename = filename or self.default_filename
 
+        if filename_prefix:
+            filename = '{prefix}{filename}'\
+                .format(
+                    prefix=safe_filename(filename_prefix),
+                    filename=filename,
+                )
+
         # file path
         fp = os.path.join(output_path, filename)
         bytes_remaining = self.filesize
@@ -209,6 +224,27 @@ class Stream(object):
                 # send to the on_progress callback.
                 self.on_progress(chunk, fh, bytes_remaining)
             self.on_complete(fh)
+        return fp
+
+    def stream_to_buffer(self):
+        """Write the media stream to buffer
+
+        :rtype: io.BytesIO buffer
+        """
+        buffer = io.BytesIO()
+        bytes_remaining = self.filesize
+        logger.debug(
+            'downloading (%s total bytes) file to BytesIO buffer',
+            self.filesize,
+        )
+
+        for chunk in request.get(self.url, streaming=True):
+            # reduce the (bytes) remainder by the length of the chunk.
+            bytes_remaining -= len(chunk)
+            # send to the on_progress callback.
+            self.on_progress(chunk, buffer, bytes_remaining)
+        self.on_complete(buffer)
+        return buffer
 
     def on_progress(self, chunk, file_handler, bytes_remaining):
         """On progress callback function.

setup.cfg

@@ -1,9 +1,9 @@
 [bumpversion]
 commit = True
 tag = True
-current_version = 9.1.1
+current_version = 9.2.3
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?
-serialize = 
+serialize =
 	{major}.{minor}.{patch}
 
 [metadata]
@@ -15,6 +15,5 @@ description-file = README.md
 
 [coverage:run]
 source = pytube
-omit = 
+omit =
 	pytube/compat.py
-

setup.py

@@ -14,7 +14,7 @@ with open('LICENSE') as readme_file:
 
 setup(
     name='pytube',
-    version='9.1.1',
+    version='9.2.3',
     author='Nick Ficano',
     author_email='nficano@gmail.com',
     packages=['pytube', 'pytube.contrib'],

tests/test_playlist.py

@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
 from pytube import Playlist
 
+short_test_pl = 'https://www.youtube.com/watch?v=' \
+    'm5q2GCsteQs&list=PL525f8ds9RvsXDl44X6Wwh9t3fCzFNApw'
+long_test_pl = 'https://www.youtube.com/watch?v=' \
+               '9CHDoAsX1yo&list=UUXuqSBlHAE6Xw-yeJA0Tunw'
+
 
 def test_construct():
-    ob = Playlist(
-        'https://www.youtube.com/watch?v=m5q2GCsteQs&list='
-        'PL525f8ds9RvsXDl44X6Wwh9t3fCzFNApw',
-    )
+    ob = Playlist(short_test_pl)
     expected = 'https://www.youtube.com/' \
                'playlist?list=' \
                'PL525f8ds9RvsXDl44X6Wwh9t3fCzFNApw'
@@ -14,25 +16,8 @@ def test_construct():
     assert ob.construct_playlist_url() == expected
 
 
-def test_link_parse():
-    ob = Playlist(
-        'https://www.youtube.com/watch?v=m5q2GCsteQs&list='
-        'PL525f8ds9RvsXDl44X6Wwh9t3fCzFNApw',
-    )
-
-    expected = [
-        '/watch?v=m5q2GCsteQs',
-        '/watch?v=5YK63cXyJ2Q',
-        '/watch?v=Rzt4rUPFYD4',
-    ]
-    assert ob.parse_links() == expected
-
-
 def test_populate():
-    ob = Playlist(
-        'https://www.youtube.com/watch?v=m5q2GCsteQs&list='
-        'PL525f8ds9RvsXDl44X6Wwh9t3fCzFNApw',
-    )
+    ob = Playlist(short_test_pl)
     expected = [
         'https://www.youtube.com/watch?v=m5q2GCsteQs',
         'https://www.youtube.com/watch?v=5YK63cXyJ2Q',
@@ -43,10 +28,50 @@ def test_populate():
     assert ob.video_urls == expected
 
 
+def test_link_parse():
+    ob = Playlist(short_test_pl)
+
+    expected = [
+        '/watch?v=m5q2GCsteQs',
+        '/watch?v=5YK63cXyJ2Q',
+        '/watch?v=Rzt4rUPFYD4',
+    ]
+    assert ob.parse_links() == expected
+
+
 def test_download():
-    ob = Playlist(
-        'https://www.youtube.com/watch?v=lByG_AgKS9k&list='
-        'PL525f8ds9RvuerPZ3bZygmNiYw2sP4BDk',
-    )
+    ob = Playlist(short_test_pl)
     ob.download_all()
     ob.download_all('.')
+    ob.download_all(prefix_number=False)
+    ob.download_all('.', prefix_number=False)
+
+
+def test_numbering():
+    ob = Playlist(short_test_pl)
+    ob.populate_video_urls()
+    gen = ob._path_num_prefix_generator(reverse=False)
+    assert '1' in next(gen)
+    assert '2' in next(gen)
+
+    ob = Playlist(short_test_pl)
+    ob.populate_video_urls()
+    gen = ob._path_num_prefix_generator(reverse=True)
+    assert str(len(ob.video_urls)) in next(gen)
+    assert str(len(ob.video_urls) - 1) in next(gen)
+
+    ob = Playlist(long_test_pl)
+    ob.populate_video_urls()
+    gen = ob._path_num_prefix_generator(reverse=False)
+    nxt = next(gen)
+    assert len(nxt) > 1
+    assert '1' in nxt
+    nxt = next(gen)
+    assert len(nxt) > 1
+    assert '2' in nxt
+
+    ob = Playlist(long_test_pl)
+    ob.populate_video_urls()
+    gen = ob._path_num_prefix_generator(reverse=True)
+    assert str(len(ob.video_urls)) in next(gen)
+    assert str(len(ob.video_urls) - 1) in next(gen)

tests/test_query.py

@@ -111,6 +111,7 @@ def test_get_by_itag(cipher_signature):
     :class:`Stream <Stream>`.
     """
     assert cipher_signature.streams.get_by_itag(22).itag == '22'
+    assert cipher_signature.streams.get_by_itag('22').itag == '22'
 
 
 def test_get_by_non_existent_itag(cipher_signature):