diff options
| author | Jakub Wilk <jwilk@jwilk.net> | 2016-01-10 16:17:47 +0100 | 
|---|---|---|
| committer | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2016-01-10 17:24:28 +0100 | 
| commit | dfb1b1468cef4ddc7ecc43776abce03763f8e426 (patch) | |
| tree | fbd8d76f3c9a04d999f5b0853b25deacfe715f31 | |
| parent | 3c91e41614a0f3bfab8710e861c895b78d93bce8 (diff) | |
Fix typos
Closes #8200.
| -rwxr-xr-x | devscripts/gh-pages/update-copyright.py | 2 | ||||
| -rw-r--r-- | test/test_write_annotations.py | 2 | ||||
| -rwxr-xr-x | youtube_dl/YoutubeDL.py | 2 | ||||
| -rw-r--r-- | youtube_dl/extractor/common.py | 4 | ||||
| -rw-r--r-- | youtube_dl/extractor/facebook.py | 4 | ||||
| -rw-r--r-- | youtube_dl/extractor/generic.py | 4 | ||||
| -rw-r--r-- | youtube_dl/extractor/ivi.py | 2 | ||||
| -rw-r--r-- | youtube_dl/extractor/mdr.py | 2 | ||||
| -rw-r--r-- | youtube_dl/extractor/nbc.py | 2 | ||||
| -rw-r--r-- | youtube_dl/extractor/nhl.py | 2 | ||||
| -rw-r--r-- | youtube_dl/extractor/ora.py | 2 | ||||
| -rw-r--r-- | youtube_dl/extractor/testurl.py | 2 | ||||
| -rw-r--r-- | youtube_dl/extractor/tv4.py | 2 | ||||
| -rw-r--r-- | youtube_dl/extractor/videomore.py | 2 | ||||
| -rw-r--r-- | youtube_dl/swfinterp.py | 2 | ||||
| -rw-r--r-- | youtube_dl/utils.py | 4 | 
16 files changed, 20 insertions, 20 deletions
| diff --git a/devscripts/gh-pages/update-copyright.py b/devscripts/gh-pages/update-copyright.py index 3663c8afe..e6c3abc8d 100755 --- a/devscripts/gh-pages/update-copyright.py +++ b/devscripts/gh-pages/update-copyright.py @@ -5,7 +5,7 @@ from __future__ import with_statement, unicode_literals  import datetime  import glob -import io  # For Python 2 compatibilty +import io  # For Python 2 compatibility  import os  import re diff --git a/test/test_write_annotations.py b/test/test_write_annotations.py index 84b8f39e0..8de08f2d6 100644 --- a/test/test_write_annotations.py +++ b/test/test_write_annotations.py @@ -66,7 +66,7 @@ class TestAnnotations(unittest.TestCase):                  textTag = a.find('TEXT')                  text = textTag.text                  self.assertTrue(text in expected)  # assertIn only added in python 2.7 -                # remove the first occurance, there could be more than one annotation with the same text +                # remove the first occurrence, there could be more than one annotation with the same text                  expected.remove(text)          # We should have seen (and removed) all the expected annotation texts.          self.assertEqual(len(expected), 0, 'Not all expected annotations were found.') diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index 3b2be3159..d50b7cfed 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -1312,7 +1312,7 @@ class YoutubeDL(object):              # only set the 'formats' fields if the original info_dict list them              # otherwise we end up with a circular reference, the first (and unique)              # element in the 'formats' field in info_dict is info_dict itself, -            # wich can't be exported to json +            # which can't be exported to json              info_dict['formats'] = formats          if self.params.get('listformats'):              self.list_formats(info_dict) diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index 0719c7bcd..b05b22a94 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -313,9 +313,9 @@ class InfoExtractor(object):          except ExtractorError:              raise          except compat_http_client.IncompleteRead as e: -            raise ExtractorError('A network error has occured.', cause=e, expected=True) +            raise ExtractorError('A network error has occurred.', cause=e, expected=True)          except (KeyError, StopIteration) as e: -            raise ExtractorError('An extractor error has occured.', cause=e) +            raise ExtractorError('An extractor error has occurred.', cause=e)      def set_downloader(self, downloader):          """Sets the downloader for this IE.""" diff --git a/youtube_dl/extractor/facebook.py b/youtube_dl/extractor/facebook.py index 5e43f2359..ec699ba54 100644 --- a/youtube_dl/extractor/facebook.py +++ b/youtube_dl/extractor/facebook.py @@ -105,7 +105,7 @@ class FacebookIE(InfoExtractor):                      login_results, 'login error', default=None, group='error')                  if error:                      raise ExtractorError('Unable to login: %s' % error, expected=True) -                self._downloader.report_warning('unable to log in: bad username/password, or exceded login rate limit (~3/min). Check credentials or wait.') +                self._downloader.report_warning('unable to log in: bad username/password, or exceeded login rate limit (~3/min). Check credentials or wait.')                  return              fb_dtsg = self._search_regex( @@ -126,7 +126,7 @@ class FacebookIE(InfoExtractor):              check_response = self._download_webpage(check_req, None,                                                      note='Confirming login')              if re.search(r'id="checkpointSubmitButton"', check_response) is not None: -                self._downloader.report_warning('Unable to confirm login, you have to login in your brower and authorize the login.') +                self._downloader.report_warning('Unable to confirm login, you have to login in your browser and authorize the login.')          except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err:              self._downloader.report_warning('unable to log in: %s' % error_to_compat_str(err))              return diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index d79e1adc9..b3f8efc80 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -487,7 +487,7 @@ class GenericIE(InfoExtractor):                  'description': 'md5:8145d19d320ff3e52f28401f4c4283b9',              }          }, -        # Embeded Ustream video +        # Embedded Ustream video          {              'url': 'http://www.american.edu/spa/pti/nsa-privacy-janus-2014.cfm',              'md5': '27b99cdb639c9b12a79bca876a073417', @@ -1644,7 +1644,7 @@ class GenericIE(InfoExtractor):          if myvi_url:              return self.url_result(myvi_url) -        # Look for embeded soundcloud player +        # Look for embedded soundcloud player          mobj = re.search(              r'<iframe\s+(?:[a-zA-Z0-9_-]+="[^"]+"\s+)*src="(?P<url>https?://(?:w\.)?soundcloud\.com/player[^"]+)"',              webpage) diff --git a/youtube_dl/extractor/ivi.py b/youtube_dl/extractor/ivi.py index d0f00cdea..472d72b4c 100644 --- a/youtube_dl/extractor/ivi.py +++ b/youtube_dl/extractor/ivi.py @@ -32,7 +32,7 @@ class IviIE(InfoExtractor):              },              'skip': 'Only works from Russia',          }, -        # Serial's serie +        # Serial's series          {              'url': 'http://www.ivi.ru/watch/dvoe_iz_lartsa/9549',              'md5': '221f56b35e3ed815fde2df71032f4b3e', diff --git a/youtube_dl/extractor/mdr.py b/youtube_dl/extractor/mdr.py index 88334889e..425fc9e2a 100644 --- a/youtube_dl/extractor/mdr.py +++ b/youtube_dl/extractor/mdr.py @@ -17,7 +17,7 @@ class MDRIE(InfoExtractor):      _VALID_URL = r'https?://(?:www\.)?(?:mdr|kika)\.de/(?:.*)/[a-z]+(?P<id>\d+)(?:_.+?)?\.html'      _TESTS = [{ -        # MDR regularily deletes its videos +        # MDR regularly deletes its videos          'url': 'http://www.mdr.de/fakt/video189002.html',          'only_matching': True,      }, { diff --git a/youtube_dl/extractor/nbc.py b/youtube_dl/extractor/nbc.py index 340c922bd..1dd54c2f1 100644 --- a/youtube_dl/extractor/nbc.py +++ b/youtube_dl/extractor/nbc.py @@ -100,7 +100,7 @@ class NBCSportsVPlayerIE(InfoExtractor):  class NBCSportsIE(InfoExtractor): -    # Does not include https becuase its certificate is invalid +    # Does not include https because its certificate is invalid      _VALID_URL = r'http://www\.nbcsports\.com//?(?:[^/]+/)+(?P<id>[0-9a-z-]+)'      _TEST = { diff --git a/youtube_dl/extractor/nhl.py b/youtube_dl/extractor/nhl.py index e98a5ef89..8d5ce46ad 100644 --- a/youtube_dl/extractor/nhl.py +++ b/youtube_dl/extractor/nhl.py @@ -223,7 +223,7 @@ class NHLVideocenterIE(NHLBaseInfoExtractor):          response = self._download_webpage(request_url, playlist_title)          response = self._fix_json(response)          if not response.strip(): -            self._downloader.report_warning('Got an empty reponse, trying ' +            self._downloader.report_warning('Got an empty response, trying '                                              'adding the "newvideos" parameter')              response = self._download_webpage(request_url + '&newvideos=true',                                                playlist_title) diff --git a/youtube_dl/extractor/ora.py b/youtube_dl/extractor/ora.py index 9c4255a2d..02de1502a 100644 --- a/youtube_dl/extractor/ora.py +++ b/youtube_dl/extractor/ora.py @@ -37,7 +37,7 @@ class OraTVIE(InfoExtractor):              formats = self._extract_m3u8_formats(                  m3u8_url, display_id, 'mp4', 'm3u8_native',                  m3u8_id='hls', fatal=False) -            # simular to GameSpotIE +            # similar to GameSpotIE              m3u8_path = compat_urlparse.urlparse(m3u8_url).path              QUALITIES_RE = r'((,[a-z]+\d+)+,?)'              available_qualities = self._search_regex( diff --git a/youtube_dl/extractor/testurl.py b/youtube_dl/extractor/testurl.py index c7d559315..46918adb0 100644 --- a/youtube_dl/extractor/testurl.py +++ b/youtube_dl/extractor/testurl.py @@ -7,7 +7,7 @@ from ..utils import ExtractorError  class TestURLIE(InfoExtractor): -    """ Allows adressing of the test cases as test:yout.*be_1 """ +    """ Allows addressing of the test cases as test:yout.*be_1 """      IE_DESC = False  # Do not list      _VALID_URL = r'test(?:url)?:(?P<id>(?P<extractor>.+?)(?:_(?P<num>[0-9]+))?)$' diff --git a/youtube_dl/extractor/tv4.py b/youtube_dl/extractor/tv4.py index 1c4b6d635..343edf206 100644 --- a/youtube_dl/extractor/tv4.py +++ b/youtube_dl/extractor/tv4.py @@ -67,7 +67,7 @@ class TV4IE(InfoExtractor):          info = self._download_json(              'http://www.tv4play.se/player/assets/%s.json' % video_id, video_id, 'Downloading video info JSON') -        # If is_geo_restricted is true, it doesn't neceserally mean we can't download it +        # If is_geo_restricted is true, it doesn't necessarily mean we can't download it          if info['is_geo_restricted']:              self.report_warning('This content might not be available in your country due to licensing restrictions.')          if info['requires_subscription']: diff --git a/youtube_dl/extractor/videomore.py b/youtube_dl/extractor/videomore.py index a66d6de23..fcee940e6 100644 --- a/youtube_dl/extractor/videomore.py +++ b/youtube_dl/extractor/videomore.py @@ -170,7 +170,7 @@ class VideomoreVideoIE(InfoExtractor):              'skip_download': True,          },      }, { -        # season single serie with og:video:iframe +        # season single series with og:video:iframe          'url': 'http://videomore.ru/poslednii_ment/1_sezon/14_seriya',          'only_matching': True,      }, { diff --git a/youtube_dl/swfinterp.py b/youtube_dl/swfinterp.py index e60505ace..06c1d6cc1 100644 --- a/youtube_dl/swfinterp.py +++ b/youtube_dl/swfinterp.py @@ -689,7 +689,7 @@ class SWFInterpreter(object):                      elif mname in _builtin_classes:                          res = _builtin_classes[mname]                      else: -                        # Assume unitialized +                        # Assume uninitialized                          # TODO warn here                          res = undefined                      stack.append(res) diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index da4ec7f20..9c1c0e0bd 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -984,7 +984,7 @@ def date_from_str(date_str):          if sign == '-':              time = -time          unit = match.group('unit') -        # A bad aproximation? +        # A bad approximation?          if unit == 'month':              unit = 'day'              time *= 30 @@ -1307,7 +1307,7 @@ def parse_filesize(s):      if s is None:          return None -    # The lower-case forms are of course incorrect and inofficial, +    # The lower-case forms are of course incorrect and unofficial,      # but we support those too      _UNIT_TABLE = {          'B': 1, | 
