Skip to content

Commit 79e3058

Browse files
committed
s/parse/parse_uri/
1 parent 5ebf6a2 commit 79e3058

File tree

3 files changed

+18
-16
lines changed

3 files changed

+18
-16
lines changed

django_mongodb/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Check Django compatibility before other imports which may fail if the
44
# wrong version of Django is installed.
5-
from .utils import check_django_compatability, parse
5+
from .utils import check_django_compatability, parse_uri
66

77
check_django_compatability()
88

@@ -14,7 +14,7 @@
1414
from .lookups import register_lookups # noqa: E402
1515
from .query import register_nodes # noqa: E402
1616

17-
__all__ = ['parse']
17+
__all__ = ["parse_uri"]
1818

1919
register_aggregates()
2020
register_expressions()

django_mongodb/utils.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from django.core.exceptions import ImproperlyConfigured
77
from django.db.backends.utils import logger
88
from django.utils.version import get_version_tuple
9-
from pymongo.uri_parser import parse_uri
9+
from pymongo.uri_parser import parse_uri as parse_uri_mongo
1010

1111

1212
def check_django_compatability():
@@ -26,7 +26,7 @@ def check_django_compatability():
2626
)
2727

2828

29-
def parse(
29+
def parse_uri(
3030
uri, engine=None, conn_max_age=None, conn_health_checks=None, ssl_require=None, test=None
3131
):
3232
"""
@@ -35,7 +35,7 @@ def parse(
3535
``pymongo.uri_parser.parse_uri()`` function that converts PyMongo's
3636
settings dictionary into a Django database settings dictionary.
3737
"""
38-
uri = parse_uri(uri)
38+
uri = parse_uri_mongo(uri)
3939

4040
host = None
4141
port = None

tests/utils_/test_parse.py

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
class MongoParseURITests(SimpleTestCase):
1212
"""
13-
Test django_mongodb.parse(uri) function
13+
Test django_mongodb.parse_uri(uri) function
1414
"""
1515

1616
def setUp(self):
@@ -22,14 +22,16 @@ def setUp(self):
2222

2323
@patch("dns.resolver.resolve")
2424
def test_uri(self, mock_resolver):
25-
settings_dict = django_mongodb.parse("mongodb://cluster0.example.mongodb.net/myDatabase")
25+
settings_dict = django_mongodb.parse_uri(
26+
"mongodb://cluster0.example.mongodb.net/myDatabase"
27+
)
2628
self.assertEqual(settings_dict["ENGINE"], "django_mongodb")
2729
self.assertEqual(settings_dict["NAME"], "myDatabase")
2830
self.assertEqual(settings_dict["HOST"], "cluster0.example.mongodb.net")
2931

3032
@patch("dns.resolver.resolve")
3133
def test_srv_uri_with_options(self, mock_resolver):
32-
settings_dict = django_mongodb.parse(URI)
34+
settings_dict = django_mongodb.parse_uri(URI)
3335
self.assertEqual(settings_dict["ENGINE"], "django_mongodb")
3436
self.assertEqual(settings_dict["NAME"], "myDatabase")
3537
self.assertEqual(settings_dict["HOST"], "mongodb+srv://cluster0.example.mongodb.net")
@@ -41,41 +43,41 @@ def test_srv_uri_with_options(self, mock_resolver):
4143
)
4244

4345
def test_localhost(self):
44-
settings_dict = django_mongodb.parse("mongodb://localhost/myDatabase")
46+
settings_dict = django_mongodb.parse_uri("mongodb://localhost/myDatabase")
4547
self.assertEqual(settings_dict["ENGINE"], "django_mongodb")
4648
self.assertEqual(settings_dict["NAME"], "myDatabase")
4749
self.assertEqual(settings_dict["HOST"], "localhost")
4850

4951
def test_localhost_bad_credentials(self):
5052
with self.assertRaises(pymongo.errors.InvalidURI):
51-
django_mongodb.parse("mongodb://:@localhost/myDatabase")
53+
django_mongodb.parse_uri("mongodb://:@localhost/myDatabase")
5254

5355
@patch("dns.resolver.resolve")
5456
def test_engine_kwarg(self, mock_resolver):
55-
settings_dict = django_mongodb.parse(URI, engine="some_other_engine")
57+
settings_dict = django_mongodb.parse_uri(URI, engine="some_other_engine")
5658
self.assertEqual(settings_dict["ENGINE"], "some_other_engine")
5759

5860
@patch("dns.resolver.resolve")
5961
def test_conn_max_age_kwarg(self, mock_resolver):
60-
settings_dict = django_mongodb.parse(URI, conn_max_age=600)
62+
settings_dict = django_mongodb.parse_uri(URI, conn_max_age=600)
6163
self.assertEqual(settings_dict["CONN_MAX_AGE"], 600)
6264

6365
@patch("dns.resolver.resolve")
6466
def test_conn_health_checks_kwarg(self, mock_resolver):
65-
settings_dict = django_mongodb.parse(URI, conn_health_checks=True)
67+
settings_dict = django_mongodb.parse_uri(URI, conn_health_checks=True)
6668
self.assertEqual(settings_dict["CONN_HEALTH_CHECKS"], True)
6769

6870
@patch("dns.resolver.resolve")
6971
def test_ssl_require_kwarg(self, mock_resolver):
70-
settings_dict = django_mongodb.parse(URI, ssl_require=True)
72+
settings_dict = django_mongodb.parse_uri(URI, ssl_require=True)
7173
self.assertEqual(settings_dict["SSL_REQUIRE"], True)
7274

7375
@patch("dns.resolver.resolve")
7476
def test_test_kwarg(self, mock_resolver):
75-
settings_dict = django_mongodb.parse(URI, test={"NAME": "test_db"})
77+
settings_dict = django_mongodb.parse_uri(URI, test={"NAME": "test_db"})
7678
self.assertEqual(settings_dict["TEST"]["NAME"], "test_db")
7779

7880
@patch("dns.resolver.resolve")
7981
def test_uri_no_prefix(self, mock_resolver):
8082
with self.assertRaises(pymongo.errors.InvalidURI):
81-
django_mongodb.parse("cluster0.example.mongodb.net/myDatabase")
83+
django_mongodb.parse_uri("cluster0.example.mongodb.net/myDatabase")

0 commit comments

Comments
 (0)