diff options
-rw-r--r-- | pandora/client.py | 15 | ||||
-rw-r--r-- | pandora/util.py | 35 | ||||
-rw-r--r-- | tests/test_pandora/test_util.py | 22 |
3 files changed, 0 insertions, 72 deletions
diff --git a/pandora/client.py b/pandora/client.py index df09144..658fb0d 100644 --- a/pandora/client.py +++ b/pandora/client.py | |||
@@ -14,7 +14,6 @@ For simplicity use a client builder from pandora.clientbuilder to create an | |||
14 | instance of a client. | 14 | instance of a client. |
15 | """ | 15 | """ |
16 | from . import errors | 16 | from . import errors |
17 | from .util import deprecated | ||
18 | 17 | ||
19 | 18 | ||
20 | class BaseAPIClient(object): | 19 | class BaseAPIClient(object): |
@@ -40,20 +39,6 @@ class BaseAPIClient(object): | |||
40 | self.username = None | 39 | self.username = None |
41 | self.password = None | 40 | self.password = None |
42 | 41 | ||
43 | @classmethod | ||
44 | @deprecated("1.3", "2.0", | ||
45 | "Replaced by clientbuilder.SettingsDictBuilder") | ||
46 | def from_settings_dict(cls, settings): # pragma: no cover | ||
47 | from .clientbuilder import SettingsDictBuilder | ||
48 | return SettingsDictBuilder(settings).build() | ||
49 | |||
50 | @classmethod | ||
51 | @deprecated("1.3", "2.0", | ||
52 | "Replaced by clientbuilder.PydoraConfigFileBuilder") | ||
53 | def from_config_file(cls, path, authenticate=True): # pragma: no cover | ||
54 | from .clientbuilder import PydoraConfigFileBuilder | ||
55 | return PydoraConfigFileBuilder(path, authenticate).build() | ||
56 | |||
57 | def _partner_login(self): | 42 | def _partner_login(self): |
58 | partner = self.transport("auth.partnerLogin", | 43 | partner = self.transport("auth.partnerLogin", |
59 | username=self.partner_user, | 44 | username=self.partner_user, |
diff --git a/pandora/util.py b/pandora/util.py deleted file mode 100644 index e0fc7fd..0000000 --- a/pandora/util.py +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | """ | ||
2 | Utility Functions | ||
3 | |||
4 | Functions that don't have a home anywhere else. | ||
5 | """ | ||
6 | |||
7 | import warnings | ||
8 | from functools import wraps | ||
9 | |||
10 | |||
11 | def warn_deprecated(in_version, remove_version, what, message): | ||
12 | """Warn that something is deprecated | ||
13 | """ | ||
14 | msg = ("{} is deprecated as of version {}" | ||
15 | " and will be removed in version {}. {}") | ||
16 | |||
17 | warnings.warn( | ||
18 | msg.format(what, in_version, remove_version, message), | ||
19 | DeprecationWarning) | ||
20 | |||
21 | |||
22 | def deprecated(in_version, remove_version, message): | ||
23 | """Deprecated function decorator | ||
24 | |||
25 | Decorator to warn that a function is deprecated and what version it will be | ||
26 | removed in. | ||
27 | """ | ||
28 | def wrapper(wrapped): | ||
29 | @wraps(wrapped) | ||
30 | def inner_wrapper(self, *args, **kwargs): | ||
31 | warn_deprecated( | ||
32 | in_version, remove_version, wrapped.__name__, message) | ||
33 | return wrapped(self, *args, **kwargs) | ||
34 | return inner_wrapper | ||
35 | return wrapper | ||
diff --git a/tests/test_pandora/test_util.py b/tests/test_pandora/test_util.py deleted file mode 100644 index d8c3876..0000000 --- a/tests/test_pandora/test_util.py +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | import warnings | ||
2 | from unittest import TestCase | ||
3 | from unittest.mock import patch | ||
4 | |||
5 | from pandora import util | ||
6 | |||
7 | |||
8 | class TestDeprecatedWarning(TestCase): | ||
9 | |||
10 | def test_warning(self): | ||
11 | class Bar(object): | ||
12 | |||
13 | @util.deprecated("1.0", "2.0", "Don't use this") | ||
14 | def foo(self): | ||
15 | pass | ||
16 | |||
17 | with patch.object(warnings, "warn") as wmod: | ||
18 | Bar().foo() | ||
19 | |||
20 | wmod.assert_called_with( | ||
21 | ("foo is deprecated as of version 1.0 and will be removed in " | ||
22 | "version 2.0. Don't use this"), DeprecationWarning) | ||