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

Commit6a1be5d

Browse files
chore reduce usage of 'from mod_foo import class_foo'
Reduce usage of doing: from SOME_MODULE import SOME_CLASS_OR_FUNCTIONInstead use: import SOME_MODULEAnd then use the full module name. This improves readability and makesobvious to the reader where the class or function has come from.
1 parent33fbc14 commit6a1be5d

File tree

6 files changed

+29
-30
lines changed

6 files changed

+29
-30
lines changed

‎gitlab/_backends/requests_backend.py

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
fromtypingimportAny,BinaryIO,Dict,Optional,TYPE_CHECKING,Union
55

66
importrequests
7-
fromrequestsimportPreparedRequest
8-
fromrequests.authimportAuthBase
9-
fromrequests.structuresimportCaseInsensitiveDict
107
fromrequests_toolbelt.multipart.encoderimportMultipartEncoder# type: ignore
118

129
from .importprotocol
@@ -17,24 +14,24 @@ def __init__(self, token: str):
1714
self.token=token
1815

1916

20-
classOAuthTokenAuth(TokenAuth,AuthBase):
21-
def__call__(self,r:PreparedRequest)->PreparedRequest:
17+
classOAuthTokenAuth(TokenAuth,requests.auth.AuthBase):
18+
def__call__(self,r:requests.PreparedRequest)->requests.PreparedRequest:
2219
r.headers["Authorization"]=f"Bearer{self.token}"
2320
r.headers.pop("PRIVATE-TOKEN",None)
2421
r.headers.pop("JOB-TOKEN",None)
2522
returnr
2623

2724

28-
classPrivateTokenAuth(TokenAuth,AuthBase):
29-
def__call__(self,r:PreparedRequest)->PreparedRequest:
25+
classPrivateTokenAuth(TokenAuth,requests.auth.AuthBase):
26+
def__call__(self,r:requests.PreparedRequest)->requests.PreparedRequest:
3027
r.headers["PRIVATE-TOKEN"]=self.token
3128
r.headers.pop("JOB-TOKEN",None)
3229
r.headers.pop("Authorization",None)
3330
returnr
3431

3532

36-
classJobTokenAuth(TokenAuth,AuthBase):
37-
def__call__(self,r:PreparedRequest)->PreparedRequest:
33+
classJobTokenAuth(TokenAuth,requests.auth.AuthBase):
34+
def__call__(self,r:requests.PreparedRequest)->requests.PreparedRequest:
3835
r.headers["JOB-TOKEN"]=self.token
3936
r.headers.pop("PRIVATE-TOKEN",None)
4037
r.headers.pop("Authorization",None)
@@ -68,7 +65,7 @@ def status_code(self) -> int:
6865
returnself._response.status_code
6966

7067
@property
71-
defheaders(self)->CaseInsensitiveDict[str]:
68+
defheaders(self)->requests.structures.CaseInsensitiveDict[str]:
7269
returnself._response.headers
7370

7471
@property

‎gitlab/cli.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
Union,
2020
)
2121

22-
fromrequests.structuresimportCaseInsensitiveDict
22+
importrequests
2323

2424
importgitlab.config
2525
fromgitlab.baseimportRESTObject
@@ -115,7 +115,7 @@ def die(msg: str, e: Optional[Exception] = None) -> None:
115115
defgitlab_resource_to_cls(
116116
gitlab_resource:str,namespace:ModuleType
117117
)->Type[RESTObject]:
118-
classes=CaseInsensitiveDict(namespace.__dict__)
118+
classes=requests.structures.CaseInsensitiveDict(namespace.__dict__)
119119
lowercase_class=gitlab_resource.replace("-","")
120120
class_type=classes[lowercase_class]
121121
ifTYPE_CHECKING:

‎gitlab/client.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
importos
44
importre
55
importtime
6+
importurllib
67
fromtypingimport (
78
Any,
89
BinaryIO,
@@ -15,7 +16,6 @@
1516
TYPE_CHECKING,
1617
Union,
1718
)
18-
fromurllibimportparse
1919

2020
importrequests
2121

@@ -517,10 +517,10 @@ def _set_auth_info(self) -> None:
517517
)
518518

519519
defenable_debug(self,mask_credentials:bool=True)->None:
520+
importhttp.client
520521
importlogging
521-
fromhttpimportclient
522522

523-
client.HTTPConnection.debuglevel=1
523+
http.client.HTTPConnection.debuglevel=1
524524
logging.basicConfig()
525525
logger=logging.getLogger()
526526
logger.setLevel(logging.DEBUG)
@@ -538,7 +538,7 @@ def enable_debug(self, mask_credentials: bool = True) -> None:
538538
defprint_as_log(*args:Any)->None:
539539
httpclient_log.log(logging.DEBUG," ".join(args))
540540

541-
setattr(client,"print",print_as_log)
541+
setattr(http.client,"print",print_as_log)
542542

543543
ifnotmask_credentials:
544544
return
@@ -684,11 +684,11 @@ def http_request(
684684
raw_url=self._build_url(path)
685685

686686
# parse user-provided URL params to ensure we don't add our own duplicates
687-
parsed=parse.urlparse(raw_url)
688-
params=parse.parse_qs(parsed.query)
687+
parsed=urllib.parse.urlparse(raw_url)
688+
params=urllib.parse.parse_qs(parsed.query)
689689
utils.copy_dict(src=query_data,dest=params)
690690

691-
url=parse.urlunparse(parsed._replace(query=""))
691+
url=urllib.parse.urlunparse(parsed._replace(query=""))
692692

693693
# Deal with kwargs: by default a user uses kwargs to send data to the
694694
# gitlab server, but this generates problems (python keyword conflicts

‎gitlab/config.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
importconfigparser
22
importos
3+
importpathlib
34
importshlex
45
importsubprocess
5-
fromos.pathimportexpanduser,expandvars
6-
frompathlibimportPath
76
fromtypingimportList,Optional,Union
87

98
fromgitlab.constimportUSER_AGENT
109

1110
_DEFAULT_FILES:List[str]= [
1211
"/etc/python-gitlab.cfg",
13-
str(Path.home()/".python-gitlab.cfg"),
12+
str(pathlib.Path.home()/".python-gitlab.cfg"),
1413
]
1514

1615
HELPER_PREFIX="helper:"
@@ -20,8 +19,8 @@
2019
_CONFIG_PARSER_ERRORS= (configparser.NoOptionError,configparser.NoSectionError)
2120

2221

23-
def_resolve_file(filepath:Union[Path,str])->str:
24-
resolved=Path(filepath).resolve(strict=True)
22+
def_resolve_file(filepath:Union[pathlib.Path,str])->str:
23+
resolved=pathlib.Path(filepath).resolve(strict=True)
2524
returnstr(resolved)
2625

2726

@@ -269,7 +268,10 @@ def _get_values_from_helper(self) -> None:
269268
continue
270269

271270
helper=value[len(HELPER_PREFIX) :].strip()
272-
commmand= [expanduser(expandvars(token))fortokeninshlex.split(helper)]
271+
commmand= [
272+
os.path.expanduser(os.path.expandvars(token))
273+
fortokeninshlex.split(helper)
274+
]
273275

274276
try:
275277
value= (

‎gitlab/const.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
fromenumimportEnum,IntEnum
1+
importenum
22

33
fromgitlab._versionimport__title__,__version__
44

55

6-
classGitlabEnum(str,Enum):
6+
classGitlabEnum(str,enum.Enum):
77
"""An enum mixed in with str to make it JSON-serializable."""
88

99

1010
# https://gitlab.com/gitlab-org/gitlab/-/blob/e97357824bedf007e75f8782259fe07435b64fbb/lib/gitlab/access.rb#L12-18
11-
classAccessLevel(IntEnum):
11+
classAccessLevel(enum.IntEnum):
1212
NO_ACCESS:int=0
1313
MINIMAL_ACCESS:int=5
1414
GUEST:int=10

‎gitlab/v4/objects/packages.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
https://docs.gitlab.com/ee/user/packages/generic_packages/
55
"""
66

7-
frompathlibimportPath
7+
importpathlib
88
fromtypingimport (
99
Any,
1010
BinaryIO,
@@ -57,7 +57,7 @@ def upload(
5757
package_name:str,
5858
package_version:str,
5959
file_name:str,
60-
path:Optional[Union[str,Path]]=None,
60+
path:Optional[Union[str,pathlib.Path]]=None,
6161
select:Optional[str]=None,
6262
data:Optional[Union[bytes,BinaryIO]]=None,
6363
**kwargs:Any,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp