Bundling praw v3 with rtv

tests/conftest.py

@@ -7,7 +7,6 @@ import logging
 import threading
 from functools import partial
 
-import praw
 import pytest
 from vcr import VCR
 from six.moves.urllib.parse import urlparse, parse_qs
@@ -15,6 +14,7 @@ from six.moves.BaseHTTPServer import HTTPServer
 
 from rtv.oauth import OAuthHelper, OAuthHandler
 from rtv.config import Config
+from rtv.packages import praw
 from rtv.terminal import Terminal
 from rtv.subreddit_page import SubredditPage
 from rtv.submission_page import SubmissionPage

tests/test_content.py

@@ -6,12 +6,12 @@ from itertools import islice
 from collections import OrderedDict
 
 import six
-import praw
 import pytest
 
+from rtv import exceptions
+from rtv.packages import praw
 from rtv.content import (
     Content, SubmissionContent, SubredditContent, SubscriptionContent)
-from rtv import exceptions
 
 try:
     from unittest import mock

tests/test_oauth.py

@@ -2,9 +2,9 @@
 from __future__ import unicode_literals
 
 import requests
-from praw.errors import OAuthException
 
 from rtv.oauth import OAuthHelper, OAuthHandler
+from rtv.packages.praw.errors import OAuthException
 
 
 try:

tests/test_subreddit.py

@@ -2,10 +2,10 @@
 from __future__ import unicode_literals
 
 import six
-from praw.errors import NotFound
 
-from rtv.subreddit_page import SubredditPage
 from rtv import __version__
+from rtv.subreddit_page import SubredditPage
+from rtv.packages.praw.errors import NotFound
 
 try:
     from unittest import mock

tests/test_subscription.py

@@ -3,7 +3,6 @@ from __future__ import unicode_literals
 
 import curses
 
-import praw
 import pytest
 
 from rtv.subscription_page import SubscriptionPage

tests/test_terminal.py

@@ -10,8 +10,7 @@ import six
 import pytest
 
 from rtv.docs import HELP, COMMENT_EDIT_FILE
-from rtv.objects import Color
-from rtv.exceptions import TemporaryFileError, MailcapEntryNotFound
+from rtv.exceptions import TemporaryFileError
 
 try:
     from unittest import mock