gryf/tuir
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/michael-lazar/rtv

Browse Source
This commit is contained in:
Michael Lazar
2015-10-16 11:40:43 -07:00
parent 972fc4ad9a 10b4b56476
commit a37884ca7a
10 changed files with 55 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtv/content.py
View File

@@ -4,7 +4,8 @@ import praw
import requests
import re
from .exceptions import SubmissionError, SubredditError, SubscriptionError, AccountError
from .exceptions import (SubmissionError, SubredditError, SubscriptionError,
AccountError)
from .helpers import humanize_timestamp, wrap_text, strip_subreddit_url
__all__ = ['SubredditContent', 'SubmissionContent', 'SubscriptionContent']
@@ -112,7 +113,8 @@ class BaseContent(object):
"selfpost" or "x-post" or a link.
"""
reddit_link = re.compile("https?://(www\.)?(np\.)?redd(it\.com|\.it)/r/.*")
reddit_link = re.compile(
"https?://(www\.)?(np\.)?redd(it\.com|\.it)/r/.*")
author = getattr(sub, 'author', '[deleted]')
name = getattr(author, 'name', '[deleted]')
flair = getattr(sub, 'link_flair_text', '')