Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit6d6aae1

Browse files
committed
fix rdereddict, cannot subclass typing-extensiosn version
1 parent981cfa8 commit6d6aae1

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

‎git/config.py

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"""Module containing module parser implementation able to properly read and write
77
configuration files"""
88

9+
importsys
910
importabc
1011
fromfunctoolsimportwraps
1112
importinspect
@@ -33,13 +34,21 @@
3334
fromtypingimport (Any,Callable,Generic,IO,List,Dict,Sequence,
3435
TYPE_CHECKING,Tuple,TypeVar,Union,cast,overload)
3536

36-
fromgit.typesimportLit_config_levels,ConfigLevels_Tup,OrderedDict,PathLike,TBD,assert_never,_T
37+
fromgit.typesimportLit_config_levels,ConfigLevels_Tup,PathLike,TBD,assert_never,_T
3738

3839
ifTYPE_CHECKING:
3940
fromgit.repo.baseimportRepo
4041
fromioimportBytesIO
4142

4243
T_ConfigParser=TypeVar('T_ConfigParser',bound='GitConfigParser')
44+
45+
ifsys.version_info[:2]< (3,7):
46+
fromcollectionsimportOrderedDict
47+
OrderedDict_OMD=OrderedDict
48+
else:
49+
fromtypingimportOrderedDict
50+
OrderedDict_OMD=OrderedDict[str,List[_T]]
51+
4352
# -------------------------------------------------------------
4453

4554
__all__= ('GitConfigParser','SectionConstraint')
@@ -164,7 +173,7 @@ def __exit__(self, exception_type: str, exception_value: str, traceback: str) ->
164173
self._config.__exit__(exception_type,exception_value,traceback)
165174

166175

167-
class_OMD(OrderedDict[str,List[_T]]):
176+
class_OMD(OrderedDict_OMD):
168177
"""Ordered multi-dict."""
169178

170179
def__setitem__(self,key:str,value:_T)->None:# type: ignore[override]
@@ -617,6 +626,7 @@ def write_section(name, section_dict):
617626

618627
ifself._defaults:
619628
write_section(cp.DEFAULTSECT,self._defaults)
629+
value:TBD
620630
forname,valueinself._sections.items():
621631
write_section(name,value)
622632

‎git/types.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
NamedTuple,TYPE_CHECKING,TypeVar)# noqa: F401
99

1010
ifsys.version_info[:2]>= (3,8):
11-
fromtypingimportFinal,Literal,SupportsIndex,TypedDict,Protocol,runtime_checkable,OrderedDict# noqa: F401
11+
fromtypingimportFinal,Literal,SupportsIndex,TypedDict,Protocol,runtime_checkable# noqa: F401
1212
else:
1313
fromtyping_extensionsimport (Final,Literal,SupportsIndex,# noqa: F401
14-
TypedDict,Protocol,runtime_checkable,OrderedDict)# noqa: F401
14+
TypedDict,Protocol,runtime_checkable)# noqa: F401
1515

1616
# if sys.version_info[:2] >= (3, 10):
1717
# from typing import TypeGuard # noqa: F401

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp