Skip to content

Update requirements, .gitignore, and normalize URLs with trailing slash #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
denini08 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update requirements, .gitignore, and normalize URLs with trailing slash #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94622f5
config
denini08 Jan 24, 2026
c1b586c
terminate full hostnames with a /
denini08 Jan 24, 2026
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@ src/*
.cache
*.egg
.idea
env/
venv/

24 changes: 12 additions & 12 deletions dadata/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,37 +145,37 @@ def __init__(self, *args, **kwargs):
Clean Entities
"""
class Address(ApiURL):
url_postfix = '/address'
url_postfix = '/address/'
limit = ADDRESS_LIMIT


class Phone(ApiURL):
url_postfix = '/phone'
url_postfix = '/phone/'
limit = PHONE_LIMIT


class Passport(ApiURL):
url_postfix = '/passport'
url_postfix = '/passport/'
limit = PASSPORT_LIMIT


class FIO(ApiURL):
url_postfix = '/name'
url_postfix = '/name/'
limit = FIO_LIMIT


class EMail(ApiURL):
url_postfix = '/email'
url_postfix = '/email/'
limit = EMAIL_LIMIT


class Date(ApiURL):
url_postfix = '/birthdate'
url_postfix = '/birthdate/'
limit = DATE_LIMIT


class Auto(ApiURL):
url_postfix = '/vehicle'
url_postfix = '/vehicle/'
limit = AUTO_LIMIT


Expand All @@ -200,27 +200,27 @@ def __init__(self, *args, **kwargs):
Suggestion Entities
"""
class S_Address(SuggestionApiURL):
url_postfix = '/address'
url_postfix = '/address/'
limit = ADDRESS_LIMIT


class S_Party(SuggestionApiURL):
url_postfix = '/party'
url_postfix = '/party/'
limit = SUGGESTIONS_LIMIT


class S_Bank(SuggestionApiURL):
url_postfix = '/bank'
url_postfix = '/bank/'
limit = SUGGESTIONS_LIMIT


class S_FIO(SuggestionApiURL):
url_postfix = '/name'
url_postfix = '/name/'
limit = FIO_LIMIT


class S_EMail(SuggestionApiURL):
url_postfix = '/email'
url_postfix = '/email/'
limit = EMAIL_LIMIT


Expand Down
3 changes: 3 additions & 0 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
requests
requests_mock
pytest
mock
2 changes: 1 addition & 1 deletion tests/test_address.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ def setUp(self):
)
adapter = requests_mock.Adapter()
adapter.register_uri('POST',
'mock://api/v2/clean/address',
'mock://api/v2/clean/address/',
request_headers={'Authorization': 'Token key', 'X-Secret':'secret'},
text=ADDRESS_RESPONSE)
self.client.session.mount('mock', adapter)
Expand Down
2 changes: 1 addition & 1 deletion tests/test_suggestions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class SuggestionsTest(CommonTestCase):
def test_suggestion_url(self):
client = self.client
# self.assertEqual(client.suggestions.address.url, "https://suggestions.dadata.ru/suggestions/api/4_1/rs/suggest/address")
self.assertEqual(client.suggestions.address.url, "https://dadata.ru/api/v2/suggest/address")
self.assertEqual(client.suggestions.address.url, "https://dadata.ru/api/v2/suggest/address/")

def test_that_suggestion_url_is_not_private(self):
self.assertEqual(self.client.suggestions.address.private, False)
Expand Down
2 changes: 1 addition & 1 deletion tests/test_url_builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class UrlBuildTest(CommonTestCase):
"""
def test_address_url(self):
url = self.client.address.url
correct_url = self.client.url + '/clean/address'
correct_url = self.client.url + '/clean/address/'
self.assertEqual(url, correct_url)

def test_request_no_key(self):
Expand Down