From c32119aa77d28a59efbcc709354175c9705e02b4 Mon Sep 17 00:00:00 2001 From: Michael Lazar Date: Tue, 28 Mar 2017 22:16:14 -0700 Subject: [PATCH] Fix package installation script --- rtv/packages/praw/__init__.py | 18 +++++++++--------- rtv/packages/praw/decorators.py | 6 +++--- rtv/packages/praw/handlers.py | 4 ++-- rtv/packages/praw/helpers.py | 2 +- rtv/packages/praw/internal.py | 10 +++++----- rtv/packages/praw/multiprocess.py | 4 ++-- rtv/packages/praw/objects.py | 20 ++++++++++---------- scripts/update_packages.py | 2 +- 8 files changed, 33 insertions(+), 33 deletions(-) diff --git a/rtv/packages/praw/__init__.py b/rtv/packages/praw/__init__.py index 0f6fee1..0c12d9c 100644 --- a/rtv/packages/praw/__init__.py +++ b/rtv/packages/praw/__init__.py @@ -32,14 +32,14 @@ import platform import re import six import sys -from praw import decorators, errors -from praw.handlers import DefaultHandler -from praw.helpers import chunk_sequence, normalize_url -from praw.internal import (_image_type, _prepare_request, - _raise_redirect_exceptions, - _raise_response_exceptions, - _to_reddit_list, _warn_pyopenssl) -from praw.settings import CONFIG +from . import decorators, errors +from .handlers import DefaultHandler +from .helpers import chunk_sequence, normalize_url +from .internal import (_image_type, _prepare_request, + _raise_redirect_exceptions, + _raise_response_exceptions, + _to_reddit_list, _warn_pyopenssl) +from .settings import CONFIG from requests import Session from requests.compat import urljoin from requests.utils import to_native_string @@ -2791,4 +2791,4 @@ class Reddit(ModConfigMixin, ModFlairMixin, ModLogMixin, ModOnlyMixin, """ # Prevent recursive import -from praw import objects # NOQA +from . import objects # NOQA diff --git a/rtv/packages/praw/decorators.py b/rtv/packages/praw/decorators.py index 6d4fa08..77bffab 100644 --- a/rtv/packages/praw/decorators.py +++ b/rtv/packages/praw/decorators.py @@ -27,12 +27,12 @@ import decorator import six import sys from functools import wraps -from praw.decorator_helpers import ( +from .decorator_helpers import ( _get_captcha, _is_mod_of_all, _make_func_args ) -from praw import errors +from . import errors from warnings import filterwarnings, warn @@ -238,7 +238,7 @@ def restrict_access(scope, mod=None, login=None, oauth_only=False, # Defer access until necessary for RedditContentObject. # This is because scoped sessions may not require this # attribute to exist, thus it might not be set. - from praw.objects import Subreddit + from .objects import Subreddit subreddit = args[0] if isinstance(args[0], Subreddit) \ else False else: diff --git a/rtv/packages/praw/handlers.py b/rtv/packages/praw/handlers.py index fa4df11..1661b8c 100644 --- a/rtv/packages/praw/handlers.py +++ b/rtv/packages/praw/handlers.py @@ -6,8 +6,8 @@ import socket import sys import time from functools import wraps -from praw.errors import ClientException -from praw.helpers import normalize_url +from .errors import ClientException +from .helpers import normalize_url from requests import Session from six import text_type from six.moves import cPickle # pylint: disable=F0401 diff --git a/rtv/packages/praw/helpers.py b/rtv/packages/praw/helpers.py index 45dfea2..8d5f2a3 100644 --- a/rtv/packages/praw/helpers.py +++ b/rtv/packages/praw/helpers.py @@ -27,7 +27,7 @@ import time from collections import deque from functools import partial from timeit import default_timer as timer -from praw.errors import HTTPException, PRAWException +from .errors import HTTPException, PRAWException from operator import attrgetter BACKOFF_START = 4 # Minimum number of seconds to sleep during errors diff --git a/rtv/packages/praw/internal.py b/rtv/packages/praw/internal.py index 1e8d36f..92c5e52 100644 --- a/rtv/packages/praw/internal.py +++ b/rtv/packages/praw/internal.py @@ -25,11 +25,11 @@ import six import sys from requests import Request, codes, exceptions from requests.compat import urljoin -from praw.decorators import restrict_access -from praw.errors import (ClientException, HTTPException, Forbidden, NotFound, - InvalidSubreddit, OAuthException, - OAuthInsufficientScope, OAuthInvalidToken, - RedirectException) +from .decorators import restrict_access +from .errors import (ClientException, HTTPException, Forbidden, NotFound, + InvalidSubreddit, OAuthException, + OAuthInsufficientScope, OAuthInvalidToken, + RedirectException) from warnings import warn try: from OpenSSL import __version__ as _opensslversion diff --git a/rtv/packages/praw/multiprocess.py b/rtv/packages/praw/multiprocess.py index 3d5aad2..c2c7ee2 100644 --- a/rtv/packages/praw/multiprocess.py +++ b/rtv/packages/praw/multiprocess.py @@ -5,8 +5,8 @@ from __future__ import print_function, unicode_literals import socket import sys from optparse import OptionParser -from praw import __version__ -from praw.handlers import DefaultHandler +from . import __version__ +from .handlers import DefaultHandler from requests import Session from six.moves import cPickle, socketserver # pylint: disable=F0401 from threading import Lock diff --git a/rtv/packages/praw/objects.py b/rtv/packages/praw/objects.py index 13418bc..a332010 100644 --- a/rtv/packages/praw/objects.py +++ b/rtv/packages/praw/objects.py @@ -30,16 +30,16 @@ from heapq import heappop, heappush from json import dumps from requests.compat import urljoin from warnings import warn, warn_explicit -from praw import (AuthenticatedReddit as AR, ModConfigMixin as MCMix, - ModFlairMixin as MFMix, ModLogMixin as MLMix, - ModOnlyMixin as MOMix, ModSelfMixin as MSMix, - MultiredditMixin as MultiMix, PrivateMessagesMixin as PMMix, - SubmitMixin, SubscribeMixin, UnauthenticatedReddit as UR) -from praw.decorators import (alias_function, limit_chars, restrict_access, - deprecated) -from praw.errors import ClientException -from praw.internal import (_get_redditor_listing, _get_sorter, - _modify_relationship) +from . import (AuthenticatedReddit as AR, ModConfigMixin as MCMix, + ModFlairMixin as MFMix, ModLogMixin as MLMix, + ModOnlyMixin as MOMix, ModSelfMixin as MSMix, + MultiredditMixin as MultiMix, PrivateMessagesMixin as PMMix, + SubmitMixin, SubscribeMixin, UnauthenticatedReddit as UR) +from .decorators import (alias_function, limit_chars, restrict_access, + deprecated) +from .errors import ClientException +from .internal import (_get_redditor_listing, _get_sorter, + _modify_relationship) REDDITOR_KEYS = ('approved_by', 'author', 'banned_by', 'redditor', diff --git a/scripts/update_packages.py b/scripts/update_packages.py index 78c770d..8d51a21 100644 --- a/scripts/update_packages.py +++ b/scripts/update_packages.py @@ -35,7 +35,7 @@ def main(): # Overwrite the project files src = os.path.join(tmpdir, 'praw') - dest = os.path.join(ROOT, 'packages', 'praw') + dest = os.path.join(ROOT, 'rtv', 'packages', 'praw') print('Copying package files to %s' % dest) shutil.rmtree(dest, ignore_errors=True) shutil.copytree(src, dest)