This commit is contained in:
Michael Lazar
2016-07-26 01:20:27 -07:00
parent 620434eed0
commit 349ea94afd
3 changed files with 4 additions and 4 deletions

View File

@@ -64,8 +64,8 @@ class YoutubeMIMEParser(BaseMIMEParser):
Assign a custom mime-type so they can be referenced in mailcap. Assign a custom mime-type so they can be referenced in mailcap.
""" """
pattern = re.compile( pattern = re.compile(
r'(?:https?://)?(m\.)?(?:youtu\.be/|(?:www\.)?youtube\.com/watch' r'(?:https?://)?(m\.)?(?:youtu\.be/|(?:www\.)?youtube\.com/watch'
r'(?:\.php)?\'?.*v=)([a-zA-Z0-9\-_]+)') r'(?:\.php)?\'?.*v=)([a-zA-Z0-9\-_]+)')
@staticmethod @staticmethod
def get_mimetype(url): def get_mimetype(url):

View File

@@ -190,7 +190,7 @@ class LoadScreen(object):
self.exception = e self.exception = e
exc_name = type(e).__name__ exc_name = type(e).__name__
_logger.info('Loader caught: {0} - {1}'.format(exc_name, e)) _logger.info('Loader caught: %s - %s', exc_name, e)
if isinstance(e, KeyboardInterrupt): if isinstance(e, KeyboardInterrupt):
# Don't need to print anything for this one, just swallow it # Don't need to print anything for this one, just swallow it

View File

@@ -81,7 +81,7 @@ class SubredditPage(Page):
If this was pressed on the front page, go back to the last subreddit. If this was pressed on the front page, go back to the last subreddit.
""" """
if not self.content.name == '/r/front': if self.content.name != '/r/front':
target = '/r/front' target = '/r/front'
self._toggled_subreddit = self.content.name self._toggled_subreddit = self.content.name
else: else: