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

Commit7925c90

Browse files
nejchJohnVillalovos
authored andcommitted
refactor: use f-strings for string formatting
1 parentf51d9be commit7925c90

40 files changed

+206
-227
lines changed

‎gitlab/base.py‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,17 +115,13 @@ def __setattr__(self, name: str, value: Any) -> None:
115115
def__str__(self)->str:
116116
data=self._attrs.copy()
117117
data.update(self._updated_attrs)
118-
return"%s => %s"% (type(self),data)
118+
returnf"{type(self)} =>{data}"
119119

120120
def__repr__(self)->str:
121121
ifself._id_attr:
122-
return"<%s %s:%s>"% (
123-
self.__class__.__name__,
124-
self._id_attr,
125-
self.get_id(),
126-
)
122+
returnf"<{self.__class__.__name__}{self._id_attr}:{self.get_id()}>"
127123
else:
128-
return"<%s>"%self.__class__.__name__
124+
returnf"<{self.__class__.__name__}>"
129125

130126
def__eq__(self,other:object)->bool:
131127
ifnotisinstance(other,RESTObject):

‎gitlab/cli.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ def wrapped_f(*args: Any, **kwargs: Any) -> Any:
8585

8686
defdie(msg:str,e:Optional[Exception]=None)->None:
8787
ife:
88-
msg="%s (%s)"% (msg,e)
89-
sys.stderr.write(msg+"\n")
88+
msg=f"{msg} ({e})"
89+
sys.stderr.write(f"{msg}\n")
9090
sys.exit(1)
9191

9292

@@ -172,7 +172,7 @@ def _parse_value(v: Any) -> Any:
172172
withopen(v[1:])asfl:
173173
returnfl.read()
174174
exceptExceptionase:
175-
sys.stderr.write("%s\n"%e)
175+
sys.stderr.write(f"{e}\n")
176176
sys.exit(1)
177177

178178
returnv
@@ -209,7 +209,7 @@ def main() -> None:
209209
sys.exit(e)
210210
# We only support v4 API at this time
211211
ifconfig.api_versionnotin ("4",):
212-
raiseModuleNotFoundError(name="gitlab.v%s.cli"%config.api_version)
212+
raiseModuleNotFoundError(name=f"gitlab.v{config.api_version}.cli")
213213

214214
# Now we build the entire set of subcommands and do the complete parsing
215215
parser=_get_parser()

‎gitlab/client.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def __init__(
8080
self._server_version:Optional[str]=None
8181
self._server_revision:Optional[str]=None
8282
self._base_url=self._get_base_url(url)
83-
self._url="%s/api/v%s"% (self._base_url,api_version)
83+
self._url=f"{self._base_url}/api/v{api_version}"
8484
#: Timeout to use for requests to gitlab server
8585
self.timeout=timeout
8686
self.retry_transient_errors=retry_transient_errors
@@ -106,7 +106,7 @@ def __init__(
106106

107107
# We only support v4 API at this time
108108
ifself._api_versionnotin ("4",):
109-
raiseModuleNotFoundError(name="gitlab.v%s.objects"%self._api_version)
109+
raiseModuleNotFoundError(name=f"gitlab.v{self._api_version}.objects")
110110
# NOTE: We must delay import of gitlab.v4.objects until now or
111111
# otherwise it will cause circular import errors
112112
importgitlab.v4.objects
@@ -196,7 +196,7 @@ def __setstate__(self, state: Dict[str, Any]) -> None:
196196
self.__dict__.update(state)
197197
# We only support v4 API at this time
198198
ifself._api_versionnotin ("4",):
199-
raiseModuleNotFoundError(name="gitlab.v%s.objects"%self._api_version)
199+
raiseModuleNotFoundError(name=f"gitlab.v{self._api_version}.objects")
200200
# NOTE: We must delay import of gitlab.v4.objects until now or
201201
# otherwise it will cause circular import errors
202202
importgitlab.v4.objects
@@ -409,7 +409,7 @@ def _set_auth_info(self) -> None:
409409
self.headers.pop("JOB-TOKEN",None)
410410

411411
ifself.oauth_token:
412-
self.headers["Authorization"]="Bearer%s"%self.oauth_token
412+
self.headers["Authorization"]=f"Bearer{self.oauth_token}"
413413
self.headers.pop("PRIVATE-TOKEN",None)
414414
self.headers.pop("JOB-TOKEN",None)
415415

@@ -465,7 +465,7 @@ def _build_url(self, path: str) -> str:
465465
ifpath.startswith("http://")orpath.startswith("https://"):
466466
returnpath
467467
else:
468-
return"%s%s"% (self._url,path)
468+
returnf"{self._url}{path}"
469469

470470
def_check_redirects(self,result:requests.Response)->None:
471471
# Check the requests history to detect 301/302 redirections.

‎gitlab/config.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ def __init__(
9595
self.url=self._config.get(self.gitlab_id,"url")
9696
exceptExceptionase:
9797
raiseGitlabDataError(
98-
"Impossible to get gitlabinformations from "
99-
"configuration (%s)"%self.gitlab_id
98+
"Impossible to get gitlabdetails from "
99+
f"configuration ({self.gitlab_id})"
100100
)frome
101101

102102
self.ssl_verify:Union[bool,str]=True
@@ -173,7 +173,7 @@ def __init__(
173173
exceptException:
174174
pass
175175
ifself.api_versionnotin ("4",):
176-
raiseGitlabDataError("Unsupported API version:%s"%self.api_version)
176+
raiseGitlabDataError(f"Unsupported API version:{self.api_version}")
177177

178178
self.per_page=None
179179
forsectionin ["global",self.gitlab_id]:
@@ -182,7 +182,7 @@ def __init__(
182182
exceptException:
183183
pass
184184
ifself.per_pageisnotNoneandnot0<=self.per_page<=100:
185-
raiseGitlabDataError("Unsupported per_page number:%s"%self.per_page)
185+
raiseGitlabDataError(f"Unsupported per_page number:{self.per_page}")
186186

187187
self.pagination=None
188188
try:

‎gitlab/const.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,4 @@
5555
# specific project scope
5656
SEARCH_SCOPE_PROJECT_NOTES:str="notes"
5757

58-
USER_AGENT:str="{}/{}".format(__title__,__version__)
58+
USER_AGENT:str=f"{__title__}/{__version__}"

‎gitlab/exceptions.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ def __init__(
4646

4747
def__str__(self)->str:
4848
ifself.response_codeisnotNone:
49-
return"{0}: {1}".format(self.response_code,self.error_message)
49+
returnf"{self.response_code}:{self.error_message}"
5050
else:
51-
return"{0}".format(self.error_message)
51+
returnf"{self.error_message}"
5252

5353

5454
classGitlabAuthenticationError(GitlabError):

‎gitlab/mixins.py‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ def get(
101101
"""
102102
ifnotisinstance(id,int):
103103
id=utils.clean_str_id(id)
104-
path="%s/%s"% (self.path,id)
104+
path=f"{self.path}/{id}"
105105
ifTYPE_CHECKING:
106106
assertself._obj_clsisnotNone
107107
iflazyisTrue:
@@ -173,7 +173,7 @@ def refresh(self, **kwargs: Any) -> None:
173173
GitlabGetError: If the server cannot perform the request
174174
"""
175175
ifself._id_attr:
176-
path="%s/%s"% (self.manager.path,self.id)
176+
path=f"{self.manager.path}/{self.id}"
177177
else:
178178
ifTYPE_CHECKING:
179179
assertself.manager.pathisnotNone
@@ -273,7 +273,7 @@ def _check_missing_create_attrs(self, data: Dict[str, Any]) -> None:
273273
missing.append(attr)
274274
continue
275275
ifmissing:
276-
raiseAttributeError("Missing attributes:%s"%", ".join(missing))
276+
raiseAttributeError(f"Missing attributes:{', '.join(missing)}")
277277

278278
@exc.on_http_error(exc.GitlabCreateError)
279279
defcreate(
@@ -349,7 +349,7 @@ def _check_missing_update_attrs(self, data: Dict[str, Any]) -> None:
349349
missing.append(attr)
350350
continue
351351
ifmissing:
352-
raiseAttributeError("Missing attributes:%s"%", ".join(missing))
352+
raiseAttributeError(f"Missing attributes:{', '.join(missing)}")
353353

354354
def_get_update_method(
355355
self,
@@ -370,7 +370,7 @@ def update(
370370
self,
371371
id:Optional[Union[str,int]]=None,
372372
new_data:Optional[Dict[str,Any]]=None,
373-
**kwargs:Any
373+
**kwargs:Any,
374374
)->Dict[str,Any]:
375375
"""Update an object on the server.
376376
@@ -391,7 +391,7 @@ def update(
391391
ifidisNone:
392392
path=self.path
393393
else:
394-
path="%s/%s"% (self.path,id)
394+
path=f"{self.path}/{id}"
395395

396396
self._check_missing_update_attrs(new_data)
397397
files= {}
@@ -444,7 +444,7 @@ def set(self, key: str, value: str, **kwargs: Any) -> base.RESTObject:
444444
Returns:
445445
obj: The created/updated attribute
446446
"""
447-
path="%s/%s"% (self.path,utils.clean_str_id(key))
447+
path=f"{self.path}/{utils.clean_str_id(key)}"
448448
data= {"value":value}
449449
server_data=self.gitlab.http_put(path,post_data=data,**kwargs)
450450
ifTYPE_CHECKING:
@@ -479,7 +479,7 @@ def delete(self, id: Union[str, int], **kwargs: Any) -> None:
479479
else:
480480
ifnotisinstance(id,int):
481481
id=utils.clean_str_id(id)
482-
path="%s/%s"% (self.path,id)
482+
path=f"{self.path}/{id}"
483483
self.gitlab.http_delete(path,**kwargs)
484484

485485

@@ -598,7 +598,7 @@ def user_agent_detail(self, **kwargs: Any) -> Dict[str, Any]:
598598
GitlabAuthenticationError: If authentication is not correct
599599
GitlabGetError: If the server cannot perform the request
600600
"""
601-
path="%s/%s/user_agent_detail"% (self.manager.path,self.get_id())
601+
path=f"{self.manager.path}/{self.get_id()}/user_agent_detail"
602602
result=self.manager.gitlab.http_get(path,**kwargs)
603603
ifTYPE_CHECKING:
604604
assertnotisinstance(result,requests.Response)
@@ -631,7 +631,7 @@ def approve(
631631
GitlabUpdateError: If the server fails to perform the request
632632
"""
633633

634-
path="%s/%s/approve"% (self.manager.path,self.id)
634+
path=f"{self.manager.path}/{self.id}/approve"
635635
data= {"access_level":access_level}
636636
server_data=self.manager.gitlab.http_put(path,post_data=data,**kwargs)
637637
ifTYPE_CHECKING:
@@ -654,7 +654,7 @@ def download(
654654
streamed:bool=False,
655655
action:Optional[Callable]=None,
656656
chunk_size:int=1024,
657-
**kwargs:Any
657+
**kwargs:Any,
658658
)->Optional[bytes]:
659659
"""Download the archive of a resource export.
660660
@@ -674,7 +674,7 @@ def download(
674674
Returns:
675675
str: The blob content if streamed is False, None otherwise
676676
"""
677-
path="%s/download"% (self.manager.path)
677+
path=f"{self.manager.path}/download"
678678
result=self.manager.gitlab.http_get(
679679
path,streamed=streamed,raw=True,**kwargs
680680
)
@@ -705,7 +705,7 @@ def subscribe(self, **kwargs: Any) -> None:
705705
GitlabAuthenticationError: If authentication is not correct
706706
GitlabSubscribeError: If the subscription cannot be done
707707
"""
708-
path="%s/%s/subscribe"% (self.manager.path,self.get_id())
708+
path=f"{self.manager.path}/{self.get_id()}/subscribe"
709709
server_data=self.manager.gitlab.http_post(path,**kwargs)
710710
ifTYPE_CHECKING:
711711
assertnotisinstance(server_data,requests.Response)
@@ -725,7 +725,7 @@ def unsubscribe(self, **kwargs: Any) -> None:
725725
GitlabAuthenticationError: If authentication is not correct
726726
GitlabUnsubscribeError: If the unsubscription cannot be done
727727
"""
728-
path="%s/%s/unsubscribe"% (self.manager.path,self.get_id())
728+
path=f"{self.manager.path}/{self.get_id()}/unsubscribe"
729729
server_data=self.manager.gitlab.http_post(path,**kwargs)
730730
ifTYPE_CHECKING:
731731
assertnotisinstance(server_data,requests.Response)
@@ -752,7 +752,7 @@ def todo(self, **kwargs: Any) -> None:
752752
GitlabAuthenticationError: If authentication is not correct
753753
GitlabTodoError: If the todo cannot be set
754754
"""
755-
path="%s/%s/todo"% (self.manager.path,self.get_id())
755+
path=f"{self.manager.path}/{self.get_id()}/todo"
756756
self.manager.gitlab.http_post(path,**kwargs)
757757

758758

@@ -781,7 +781,7 @@ def time_stats(self, **kwargs: Any) -> Dict[str, Any]:
781781
if"time_stats"inself.attributes:
782782
returnself.attributes["time_stats"]
783783

784-
path="%s/%s/time_stats"% (self.manager.path,self.get_id())
784+
path=f"{self.manager.path}/{self.get_id()}/time_stats"
785785
result=self.manager.gitlab.http_get(path,**kwargs)
786786
ifTYPE_CHECKING:
787787
assertnotisinstance(result,requests.Response)
@@ -800,7 +800,7 @@ def time_estimate(self, duration: str, **kwargs: Any) -> Dict[str, Any]:
800800
GitlabAuthenticationError: If authentication is not correct
801801
GitlabTimeTrackingError: If the time tracking update cannot be done
802802
"""
803-
path="%s/%s/time_estimate"% (self.manager.path,self.get_id())
803+
path=f"{self.manager.path}/{self.get_id()}/time_estimate"
804804
data= {"duration":duration}
805805
result=self.manager.gitlab.http_post(path,post_data=data,**kwargs)
806806
ifTYPE_CHECKING:
@@ -819,7 +819,7 @@ def reset_time_estimate(self, **kwargs: Any) -> Dict[str, Any]:
819819
GitlabAuthenticationError: If authentication is not correct
820820
GitlabTimeTrackingError: If the time tracking update cannot be done
821821
"""
822-
path="%s/%s/reset_time_estimate"% (self.manager.path,self.get_id())
822+
path=f"{self.manager.path}/{self.get_id()}/reset_time_estimate"
823823
result=self.manager.gitlab.http_post(path,**kwargs)
824824
ifTYPE_CHECKING:
825825
assertnotisinstance(result,requests.Response)
@@ -838,7 +838,7 @@ def add_spent_time(self, duration: str, **kwargs: Any) -> Dict[str, Any]:
838838
GitlabAuthenticationError: If authentication is not correct
839839
GitlabTimeTrackingError: If the time tracking update cannot be done
840840
"""
841-
path="%s/%s/add_spent_time"% (self.manager.path,self.get_id())
841+
path=f"{self.manager.path}/{self.get_id()}/add_spent_time"
842842
data= {"duration":duration}
843843
result=self.manager.gitlab.http_post(path,post_data=data,**kwargs)
844844
ifTYPE_CHECKING:
@@ -857,7 +857,7 @@ def reset_spent_time(self, **kwargs: Any) -> Dict[str, Any]:
857857
GitlabAuthenticationError: If authentication is not correct
858858
GitlabTimeTrackingError: If the time tracking update cannot be done
859859
"""
860-
path="%s/%s/reset_spent_time"% (self.manager.path,self.get_id())
860+
path=f"{self.manager.path}/{self.get_id()}/reset_spent_time"
861861
result=self.manager.gitlab.http_post(path,**kwargs)
862862
ifTYPE_CHECKING:
863863
assertnotisinstance(result,requests.Response)
@@ -893,7 +893,7 @@ def participants(self, **kwargs: Any) -> Dict[str, Any]:
893893
RESTObjectList: The list of participants
894894
"""
895895

896-
path="%s/%s/participants"% (self.manager.path,self.get_id())
896+
path=f"{self.manager.path}/{self.get_id()}/participants"
897897
result=self.manager.gitlab.http_get(path,**kwargs)
898898
ifTYPE_CHECKING:
899899
assertnotisinstance(result,requests.Response)
@@ -920,7 +920,7 @@ def render(self, link_url: str, image_url: str, **kwargs: Any) -> Dict[str, Any]
920920
Returns:
921921
dict: The rendering properties
922922
"""
923-
path="%s/render"%self.path
923+
path=f"{self.path}/render"
924924
data= {"link_url":link_url,"image_url":image_url}
925925
result=self.gitlab.http_get(path,data,**kwargs)
926926
ifTYPE_CHECKING:
@@ -967,7 +967,7 @@ def promote(self, **kwargs: Any) -> Dict[str, Any]:
967967
dict: The updated object data (*not* a RESTObject)
968968
"""
969969

970-
path="%s/%s/promote"% (self.manager.path,self.id)
970+
path=f"{self.manager.path}/{self.id}/promote"
971971
http_method=self._get_update_method()
972972
result=http_method(path,**kwargs)
973973
ifTYPE_CHECKING:

‎gitlab/types.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,4 @@ def get_file_name(self, attr_name: Optional[str] = None) -> Optional[str]:
6161

6262
classImageAttribute(FileAttribute):
6363
defget_file_name(self,attr_name:Optional[str]=None)->str:
64-
return"%s.png"%attr_nameifattr_nameelse"image.png"
64+
returnf"{attr_name}.png"ifattr_nameelse"image.png"

‎gitlab/utils.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def copy_dict(dest: Dict[str, Any], src: Dict[str, Any]) -> None:
5151
# custom_attributes: {'foo', 'bar'} =>
5252
# "custom_attributes['foo']": "bar"
5353
fordict_k,dict_vinv.items():
54-
dest["%s[%s]"% (k,dict_k)]=dict_v
54+
dest[f"{k}[{dict_k}]"]=dict_v
5555
else:
5656
dest[k]=v
5757

0 commit comments

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