diff --git a/setup.py b/setup.py index 58a0ae1..f61ef8a 100755 --- a/setup.py +++ b/setup.py @@ -37,7 +37,7 @@ setup(name='dropbox', author='Dropbox, Inc.', author_email='support-api@dropbox.com', url='http://www.dropbox.com/', - packages=['dropbox', 'tests'], + packages=['dropbox'], install_requires=INSTALL_REQUIRES, package_data={'dropbox': ['trusted-certs.crt'], 'tests' : ['server.crt', 'server.key']}, diff --git a/tests/test_client.py b/tests/test_client.py index 87b0b0b..b74c31d 100755 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -292,7 +292,7 @@ class TestClientOAuth1(BaseClientTests, unittest.TestCase): sess.set_token(cls.access_key, cls.access_secret) class TestClientOAuth2(BaseClientTests, unittest.TestCase): - Session = session.DropboxSessionOAuth2 + Session = session.DropboxOAuth2Session @classmethod def _configure_session(cls, sess): diff --git a/tests/test_session.py b/tests/test_session.py index bca077a..f0b34f6 100644 --- a/tests/test_session.py +++ b/tests/test_session.py @@ -3,7 +3,7 @@ import unittest import urllib import urlparse -from dropbox.session import DropboxSession, DropboxSessionOAuth2 +from dropbox.session import DropboxSession, DropboxOAuth2Session class ConfigurableSessionTest(unittest.TestCase): def _create_generic_session(self, rest_client, consumer_key='a', @@ -14,7 +14,7 @@ class OAuth1Mixin(ConfigurableSessionTest): Session = DropboxSession class OAuth2Mixin(ConfigurableSessionTest): - Session = DropboxSessionOAuth2 + Session = DropboxOAuth2Session class BaseTestClientUsage(object): def test_API_CONTENT_HOST(self): @@ -69,7 +69,7 @@ class TestClientUsageOAuth1(OAuth1Mixin, BaseTestClientUsage): self.assertEqual(a.request_token.secret, request_token[1]) class TestClientUsageOAuth2(OAuth2Mixin, BaseTestClientUsage): - Session = DropboxSessionOAuth2 + Session = DropboxOAuth2Session def test_build_authorize_url(self): sess = self._create_generic_session(mock.Mock())