Skip to content

Commit bf2c933

Browse files
committed
refactor: Update rule_map for python 3.11
1 parent 133f3f3 commit bf2c933

8 files changed

Lines changed: 20 additions & 17 deletions

File tree

docs/url/registry.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Prefix for KDE infrastructure, `kde:group/repository`:
6060

6161
>>> @dataclasses.dataclass(repr=False)
6262
... class MyGitURLParser(GitURL):
63-
... rule_map: RuleMap = RuleMap(
63+
... rule_map = RuleMap(
6464
... _rule_map={
6565
... **GitURL.rule_map._rule_map,
6666
... 'github_prefix': GitHubPrefix,

src/libvcs/url/base.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ def register(self, cls: Rule) -> None:
101101
102102
>>> @dataclasses.dataclass(repr=False)
103103
... class GitHubURL(GitURL):
104-
... rule_map: RuleMap = RuleMap(
104+
... rule_map = RuleMap(
105105
... _rule_map={'github_prefix': GitHubPrefix}
106106
... )
107107
@@ -151,7 +151,7 @@ def register(self, cls: Rule) -> None:
151151
152152
>>> @dataclasses.dataclass(repr=False)
153153
... class GitLabURL(GitURL):
154-
... rule_map: RuleMap = RuleMap(
154+
... rule_map = RuleMap(
155155
... _rule_map={'gitlab_prefix': GitLabPrefix}
156156
... )
157157
@@ -187,7 +187,7 @@ def register(self, cls: Rule) -> None:
187187
188188
>>> @dataclasses.dataclass(repr=False)
189189
... class GitURLWithPip(GitBaseURL):
190-
... rule_map: RuleMap = RuleMap(
190+
... rule_map = RuleMap(
191191
... _rule_map={m.label: m for m in [*DEFAULT_RULES, *PIP_DEFAULT_RULES]}
192192
... )
193193

src/libvcs/url/git.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,11 @@ class GitBaseURL(URLProtocol, SkipDefaultFieldsReprMixin):
262262
# Decoration
263263
suffix: Optional[str] = None
264264

265+
# Matched
265266
rule: Optional[str] = None
266-
rule_map: RuleMap = RuleMap(_rule_map={m.label: m for m in DEFAULT_RULES})
267+
268+
# Settings
269+
rule_map = RuleMap(_rule_map={m.label: m for m in DEFAULT_RULES})
267270

268271
def __post_init__(self) -> None:
269272
url = self.url
@@ -382,7 +385,7 @@ class GitPipURL(GitBaseURL, URLProtocol, SkipDefaultFieldsReprMixin):
382385
# commit-ish (rev): tag, branch, ref
383386
rev: Optional[str] = None
384387

385-
rule_map: RuleMap = RuleMap(_rule_map={m.label: m for m in PIP_DEFAULT_RULES})
388+
rule_map = RuleMap(_rule_map={m.label: m for m in PIP_DEFAULT_RULES})
386389

387390
def to_url(self) -> str:
388391
"""Exports a pip-compliant URL.
@@ -490,7 +493,7 @@ class GitURL(GitPipURL, GitBaseURL, URLProtocol, SkipDefaultFieldsReprMixin):
490493
- :meth:`GitBaseURL.to_url`
491494
"""
492495

493-
rule_map: RuleMap = RuleMap(
496+
rule_map = RuleMap(
494497
_rule_map={m.label: m for m in [*DEFAULT_RULES, *PIP_DEFAULT_RULES]}
495498
)
496499

src/libvcs/url/hg.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ class HgBaseURL(URLProtocol, SkipDefaultFieldsReprMixin):
204204
rule: Optional[str] = None
205205
# name of the :class:`Rule`
206206

207-
rule_map: RuleMap = RuleMap(_rule_map={m.label: m for m in DEFAULT_RULES})
207+
rule_map = RuleMap(_rule_map={m.label: m for m in DEFAULT_RULES})
208208

209209
def __post_init__(self) -> None:
210210
url = self.url
@@ -342,7 +342,7 @@ class HgPipURL(HgBaseURL, URLProtocol, SkipDefaultFieldsReprMixin):
342342
# commit-ish (rev): tag, branch, ref
343343
rev: Optional[str] = None
344344

345-
rule_map: RuleMap = RuleMap(_rule_map={m.label: m for m in PIP_DEFAULT_RULES})
345+
rule_map = RuleMap(_rule_map={m.label: m for m in PIP_DEFAULT_RULES})
346346

347347
@classmethod
348348
def is_valid(cls, url: str, is_explicit: Optional[bool] = None) -> bool:
@@ -424,7 +424,7 @@ class HgURL(HgPipURL, HgBaseURL, URLProtocol, SkipDefaultFieldsReprMixin):
424424
- :meth:`HgBaseURL.to_url`
425425
"""
426426

427-
rule_map: RuleMap = RuleMap(
427+
rule_map = RuleMap(
428428
_rule_map={m.label: m for m in [*DEFAULT_RULES, *PIP_DEFAULT_RULES]}
429429
)
430430

src/libvcs/url/svn.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ class SvnBaseURL(URLProtocol, SkipDefaultFieldsReprMixin):
189189
ref: Optional[str] = None
190190

191191
rule: Optional[str] = None
192-
rule_map: RuleMap = RuleMap(_rule_map={m.label: m for m in DEFAULT_RULES})
192+
rule_map = RuleMap(_rule_map={m.label: m for m in DEFAULT_RULES})
193193

194194
def __post_init__(self) -> None:
195195
url = self.url
@@ -285,7 +285,7 @@ class SvnPipURL(SvnBaseURL, URLProtocol, SkipDefaultFieldsReprMixin):
285285
# commit-ish (rev): tag, branch, ref
286286
rev: Optional[str] = None
287287

288-
rule_map: RuleMap = RuleMap(_rule_map={m.label: m for m in PIP_DEFAULT_RULES})
288+
rule_map = RuleMap(_rule_map={m.label: m for m in PIP_DEFAULT_RULES})
289289

290290
@classmethod
291291
def is_valid(cls, url: str, is_explicit: Optional[bool] = None) -> bool:
@@ -356,7 +356,7 @@ class SvnURL(SvnPipURL, SvnBaseURL, URLProtocol, SkipDefaultFieldsReprMixin):
356356
- :meth:`SvnBaseURL.to_url`
357357
"""
358358

359-
rule_map: RuleMap = RuleMap(
359+
rule_map = RuleMap(
360360
_rule_map={m.label: m for m in [*DEFAULT_RULES, *PIP_DEFAULT_RULES]}
361361
)
362362

tests/url/test_git.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ def test_git_url_extension_pip(
141141
git_repo: GitSync,
142142
) -> None:
143143
class GitURLWithPip(GitBaseURL):
144-
rule_map: RuleMap = RuleMap(
144+
rule_map = RuleMap(
145145
_rule_map={m.label: m for m in [*DEFAULT_RULES, *PIP_DEFAULT_RULES]}
146146
)
147147

@@ -254,7 +254,7 @@ def test_git_revs(
254254
git_url_kwargs: GitURLKwargs,
255255
) -> None:
256256
class GitURLWithPip(GitURL):
257-
rule_map: RuleMap = RuleMap(
257+
rule_map = RuleMap(
258258
_rule_map={m.label: m for m in [*DEFAULT_RULES, *PIP_DEFAULT_RULES]}
259259
)
260260

tests/url/test_hg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def test_hg_url_extension_pip(
107107
hg_repo: HgSync,
108108
) -> None:
109109
class HgURLWithPip(HgURL):
110-
rule_map: RuleMap = RuleMap(
110+
rule_map = RuleMap(
111111
_rule_map={m.label: m for m in [*DEFAULT_RULES, *PIP_DEFAULT_RULES]}
112112
)
113113

tests/url/test_svn.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ def test_svn_url_extension_pip(
124124
svn_repo: SvnSync,
125125
) -> None:
126126
class SvnURLWithPip(SvnURL):
127-
rule_map: RuleMap = RuleMap(
127+
rule_map = RuleMap(
128128
_rule_map={m.label: m for m in [*DEFAULT_RULES, *PIP_DEFAULT_RULES]}
129129
)
130130

0 commit comments

Comments
 (0)