nficano commited on
Commit
48d488b
·
2 Parent(s): 3b3f92b 5838157

Merge branch 'master' of github.com:nficano/pytube

Browse files

* 'master' of github.com:nficano/pytube:
updated README
Release version 6.1.5
[jsinterp] Extend function regex (closes #86)

Files changed (3) hide show
  1. README.rst +0 -9
  2. pytube/__init__.py +1 -1
  3. pytube/jsinterp.py +1 -1
README.rst CHANGED
@@ -37,15 +37,6 @@ YouTube is the most popular video-sharing platform in the world and as a hacker
37
 
38
  Finally *pytube* also includes a command-line utility, allowing you to quickly download videos right from terminal.
39
 
40
- Fix for CipherError
41
- ==========================================
42
-
43
- *Update December 2015* If you're using version <=6.1.3, you'll need to run the following to fix *pytube* for some videos.
44
-
45
- .. code:: bash
46
-
47
- pip install -U pytube
48
-
49
  Installation
50
  ============
51
 
 
37
 
38
  Finally *pytube* also includes a command-line utility, allowing you to quickly download videos right from terminal.
39
 
 
 
 
 
 
 
 
 
 
40
  Installation
41
  ============
42
 
pytube/__init__.py CHANGED
@@ -2,7 +2,7 @@
2
  # -*- coding: utf-8 -*-
3
  # flake8: noqa
4
  __title__ = 'pytube'
5
- __version__ = '6.1.4'
6
  __author__ = 'Nick Ficano'
7
  __license__ = 'MIT License'
8
  __copyright__ = 'Copyright 2015 Nick Ficano'
 
2
  # -*- coding: utf-8 -*-
3
  # flake8: noqa
4
  __title__ = 'pytube'
5
+ __version__ = '6.1.5'
6
  __author__ = 'Nick Ficano'
7
  __license__ = 'MIT License'
8
  __copyright__ = 'Copyright 2015 Nick Ficano'
pytube/jsinterp.py CHANGED
@@ -231,7 +231,7 @@ class JSInterpreter(object):
231
  def extract_function(self, funcname):
232
  func_m = re.search(
233
  r'''(?x)
234
- (?:function\s+%s|[{;]%s\s*=\s*function|var\s+%s\s*=\s*function)\s*
235
  \((?P<args>[^)]*)\)\s*
236
  \{(?P<code>[^}]+)\}''' % (
237
  re.escape(funcname), re.escape(funcname), re.escape(funcname)),
 
231
  def extract_function(self, funcname):
232
  func_m = re.search(
233
  r'''(?x)
234
+ (?:function\s+%s|[{;,]%s\s*=\s*function|var\s+%s\s*=\s*function)\s*
235
  \((?P<args>[^)]*)\)\s*
236
  \{(?P<code>[^}]+)\}''' % (
237
  re.escape(funcname), re.escape(funcname), re.escape(funcname)),