Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ This project uses [Semantic Versioning 2.0.0](http://semver.org/).

## main

- REMOVED: Removed deprecated `get_domain_premium_price`. Use `get_domain_prices` instead.
- REMOVED: Removed deprecated `get_whois_privacy` (dnsimple/dnsimple-developer#919)
- REMOVED: Removed deprecated `renew_whois_privacy` (dnsimple/dnsimple-developer#919)

Expand Down
29 changes: 1 addition & 28 deletions dnsimple/service/registrar.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import json
import warnings

from dnsimple.response import Response
from dnsimple.struct import DomainCheck, DomainPremiumPrice, DomainRegistration, DomainTransfer, DomainRenewal, DomainRestore, RegistrantChange, VanityNameServer, WhoisPrivacy, DomainPrice, CheckRegistrantChangeInput, CreateRegistrantChangeInput, RegistrantChangeCheck, DomainTransferLock
from dnsimple.struct import DomainCheck, DomainRegistration, DomainTransfer, DomainRenewal, DomainRestore, RegistrantChange, VanityNameServer, WhoisPrivacy, DomainPrice, CheckRegistrantChangeInput, CreateRegistrantChangeInput, RegistrantChangeCheck, DomainTransferLock


class Registrar(object):
Expand Down Expand Up @@ -32,32 +31,6 @@ def check_domain(self, account_id, domain):
response = self.client.get(f'/{account_id}/registrar/domains/{domain}/check')
return Response(response, DomainCheck)

def get_domain_premium_price(self, account_id, domain, options=None):
"""
DEPERECATED: Get the premium price for a domain.
Use get_domain_prices

See https://developer.dnsimple.com/v2/registrar/#getDomainPremiumPrice

:param account_id: int
The account ID
:param domain: str
The domain name
:param options: dnsimple.struct.DomainPremiumPriceOptions
Optional action between "registration", "renewal", and "transfer".
If omitted, it defaults to "registration".

:return: dnsimple.Response
The domain premium price requested
"""

warnings.warn("DEPRECATION WARNING: get_domain_premium_price is deprecated, use get_domain_prices instead.")

if options is None:
options = {}
response = self.client.get(f'/{account_id}/registrar/domains/{domain}/premium_price', params=options)
return Response(response, DomainPremiumPrice)

def get_domain_prices(self, account_id, domain):
"""
Get prices for a domain.
Expand Down
1 change: 0 additions & 1 deletion dnsimple/struct/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
from dnsimple.struct.delegation_signer_record import DelegationSignerRecord, DelegationSignerRecordInput
from dnsimple.struct.domain import Domain
from dnsimple.struct.domain_check import DomainCheck
from dnsimple.struct.domain_premium_price import DomainPremiumPrice, DomainPremiumPriceOptions
from dnsimple.struct.domain_price import DomainPrice
from dnsimple.struct.domain_registration import DomainRegistration, DomainRegistrationRequest
from dnsimple.struct.domain_renewal import DomainRenewal, DomainRenewRequest
Expand Down
27 changes: 0 additions & 27 deletions dnsimple/struct/domain_premium_price.py

This file was deleted.

This file was deleted.

This file was deleted.

20 changes: 0 additions & 20 deletions tests/fixtures/v2/api/checkDomainPremiumPrice/success.http

This file was deleted.

15 changes: 0 additions & 15 deletions tests/fixtures/v2/api/getDomainPremiumPrice/failure.http

This file was deleted.

20 changes: 0 additions & 20 deletions tests/fixtures/v2/api/getDomainPremiumPrice/success.http

This file was deleted.

29 changes: 1 addition & 28 deletions tests/service/registrar_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import responses

from dnsimple import DNSimpleException
from dnsimple.struct import DomainPremiumPriceOptions, DomainTransferRequest, DomainRenewRequest, DomainRestoreRequest
from dnsimple.struct import DomainTransferRequest, DomainRenewRequest, DomainRestoreRequest
from dnsimple.struct.domain_registration import DomainRegistrationRequest
from tests.helpers import DNSimpleMockResponse, DNSimpleTest

Expand All @@ -20,16 +20,6 @@ def test_check_domain(self):
self.assertTrue(domain_check.available)
self.assertTrue(domain_check.premium)

@responses.activate
def test_check_domain_premium_price(self):
responses.add(DNSimpleMockResponse(method=responses.GET,
path='/1010/registrar/domains/ruby.codes/premium_price',
fixture_name='getDomainPremiumPrice/success'))
domain_premium_price = self.registrar.get_domain_premium_price(1010, 'ruby.codes').data

self.assertEqual('109.00', domain_premium_price.premium_price)
self.assertEqual('registration', domain_premium_price.action)

@responses.activate
def test_get_domain_prices(self):
responses.add(DNSimpleMockResponse(method=responses.GET,
Expand Down Expand Up @@ -84,23 +74,6 @@ def test_get_domain_renewal(self):
self.assertEqual(domain_renewal.created_at, "2016-12-09T19:46:45Z")
self.assertEqual(domain_renewal.updated_at, "2016-12-12T19:46:45Z")

@responses.activate
def test_check_domain_premium_price_passing_action(self):
responses.add(DNSimpleMockResponse(method=responses.GET,
path='/1010/registrar/domains/ruby.codes/premium_price?action=registration',
fixture_name='getDomainPremiumPrice/success'))
self.registrar.get_domain_premium_price(1010, 'ruby.codes', DomainPremiumPriceOptions(action='registration'))

@responses.activate
def test_check_domain_premium_price(self):
responses.add(DNSimpleMockResponse(method=responses.GET,
path='/1010/registrar/domains/example.com/premium_price',
fixture_name='getDomainPremiumPrice/failure'))
try:
self.registrar.get_domain_premium_price(1010, 'example.com')
except DNSimpleException as dnse:
self.assertEqual('`example.com` is not a premium domain for registration', dnse.message)

@responses.activate
def test_register_domain(self):
responses.add(DNSimpleMockResponse(method=responses.POST,
Expand Down