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

Commite61439b

Browse files
committed
src: constify is_<platform>() calls
+ TCs: unittest-asserts for git-tests.
1 parentdf2fb54 commite61439b

File tree

13 files changed

+45
-52
lines changed

13 files changed

+45
-52
lines changed

‎git/cmd.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555

5656
__all__= ('Git',)
5757

58-
ifis_win():
58+
ifis_win:
5959
WindowsError=OSError
6060

6161
ifPY3:
@@ -239,7 +239,7 @@ def dict_to_slots_and__excluded_are_none(self, d, excluded=()):
239239
## CREATE_NEW_PROCESS_GROUP is needed to allow killing it afterwards,
240240
# seehttps://docs.python.org/3/library/subprocess.html#subprocess.Popen.send_signal
241241
PROC_CREATIONFLAGS= (CREATE_NO_WINDOW|subprocess.CREATE_NEW_PROCESS_GROUP
242-
ifis_win()
242+
ifis_win
243243
else0)
244244

245245

@@ -630,7 +630,7 @@ def execute(self, command,
630630
env["LC_ALL"]="C"
631631
env.update(self._environment)
632632

633-
ifis_win():
633+
ifis_win:
634634
cmd_not_found_exception=WindowsError
635635
ifkill_after_timeout:
636636
raiseGitCommandError('"kill_after_timeout" feature is not supported on Windows.')
@@ -650,13 +650,13 @@ def execute(self, command,
650650
stderr=PIPE,
651651
stdout=PIPEifwith_stdoutelseopen(os.devnull,'wb'),
652652
shell=self.USE_SHELL,
653-
close_fds=(is_posix()),# unsupported on windows
653+
close_fds=(is_posix),# unsupported on windows
654654
universal_newlines=universal_newlines,
655655
creationflags=PROC_CREATIONFLAGS,
656656
**subprocess_kwargs
657657
)
658658
exceptcmd_not_found_exceptionaserr:
659-
raiseGitCommandNotFound(str(err))
659+
raiseGitCommandNotFound('%s: %s'% (command[0],err))
660660

661661
ifas_process:
662662
returnself.AutoInterrupt(proc,command)

‎git/compat.py‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
)
2525

2626
PY3=sys.version_info[0]>=3
27+
is_win= (os.name=='nt')
28+
is_posix= (os.name=='posix')
29+
is_darwin= (os.name=='darwin')
2730
defenc=sys.getdefaultencoding()
2831

2932
ifPY3:
@@ -78,17 +81,6 @@ def __new__(cls, name, nbases, d):
7881
returnmeta(name,bases,d)
7982
returnmetaclass(meta.__name__+'Helper',None, {})
8083

81-
defis_win():
82-
returnos.name=='nt'
83-
84-
85-
defis_posix():
86-
returnos.name=='posix'
87-
88-
89-
defis_darwin():
90-
returnos.name=='darwin'
91-
9284

9385
## From https://docs.python.org/3.3/howto/pyporting.html
9486
classUnicodeMixin(object):

‎git/index/base.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ def _set_cache_(self, attr):
137137
# which happens during read-tree.
138138
# In this case, we will just read the memory in directly.
139139
# Its insanely bad ... I am disappointed !
140-
allow_mmap= (is_win()orsys.version_info[1]>5)
140+
allow_mmap= (is_winorsys.version_info[1]>5)
141141
stream=file_contents_ro(fd,stream=True,allow_mmap=allow_mmap)
142142

143143
try:

‎git/index/fun.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def run_commit_hook(name, index):
7676
stdout=subprocess.PIPE,
7777
stderr=subprocess.PIPE,
7878
cwd=index.repo.working_dir,
79-
close_fds=(is_posix()),
79+
close_fds=(is_posix),
8080
creationflags=PROC_CREATIONFLAGS,)
8181
stdout,stderr=cmd.communicate()
8282
cmd.stdout.close()

‎git/remote.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ def __init__(self, repo, name):
376376
self.repo=repo
377377
self.name=name
378378

379-
ifis_win():
379+
ifis_win:
380380
# some oddity: on windows, python 2.5, it for some reason does not realize
381381
# that it has the config_writer property, but instead calls __getattr__
382382
# which will not yield the expected results. 'pinging' the members

‎git/repo/base.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ def delete_remote(self, remote):
370370
def_get_config_path(self,config_level):
371371
# we do not support an absolute path of the gitconfig on windows ,
372372
# use the global config instead
373-
ifis_win()andconfig_level=="system":
373+
ifis_winandconfig_level=="system":
374374
config_level="global"
375375

376376
ifconfig_level=="system":
@@ -884,7 +884,7 @@ def _clone(cls, git, url, path, odb_default_type, progress, **kwargs):
884884
prev_cwd=None
885885
prev_path=None
886886
odbt=kwargs.pop('odbt',odb_default_type)
887-
ifis_win():
887+
ifis_win:
888888
if'~'inpath:
889889
raiseOSError("Git cannot handle the ~ character in path %r correctly"%path)
890890

‎git/test/lib/helper.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def _mktemp(*args):
7474
prefixing /private/ will lead to incorrect paths on OSX."""
7575
tdir=tempfile.mktemp(*args)
7676
# See :note: above to learn why this is comented out.
77-
# if is_darwin():
77+
# if is_darwin:
7878
# tdir = '/private' + tdir
7979
returntdir
8080

@@ -84,7 +84,7 @@ def _rmtree_onerror(osremove, fullpath, exec_info):
8484
Handle the case on windows that read-only files cannot be deleted by
8585
os.remove by setting it to mode 777, then retry deletion.
8686
"""
87-
ifis_win()orosremoveisnotos.remove:
87+
ifis_winorosremoveisnotos.remove:
8888
raise
8989

9090
os.chmod(fullpath,0o777)
@@ -141,7 +141,7 @@ def repo_creator(self):
141141

142142

143143
deflaunch_git_daemon(temp_dir,ip,port):
144-
ifis_win():
144+
ifis_win:
145145
## On MINGW-git, daemon exists in .\Git\mingw64\libexec\git-core\,
146146
# but if invoked as 'git daemon', it detaches from parent `git` cmd,
147147
# and then CANNOT DIE!
@@ -242,7 +242,7 @@ def remote_repo_creator(self):
242242
gd.proc.terminate()
243243
log.warning('git(%s) ls-remote failed due to:%s',
244244
rw_repo.git_dir,e)
245-
ifis_win():
245+
ifis_win:
246246
msg=textwrap.dedent("""
247247
MINGW yet has problems with paths, and `git-daemon.exe` must be in PATH
248248
(look into .\Git\mingw64\libexec\git-core\);

‎git/test/test_base.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ def test_with_rw_remote_and_rw_repo(self, rw_repo, rw_remote_repo):
118118
assertrw_remote_repo.config_reader("repository").getboolean("core","bare")
119119
assertos.path.isdir(os.path.join(rw_repo.working_tree_dir,'lib'))
120120

121-
@skipIf(sys.version_info< (3,)andis_win(),
121+
@skipIf(sys.version_info< (3,)andis_win,
122122
"Unicode woes, see https://github.com/gitpython-developers/GitPython/pull/519")
123123
@with_rw_repo('0.1.6')
124124
deftest_add_unicode(self,rw_repo):
@@ -135,7 +135,7 @@ def test_add_unicode(self, rw_repo):
135135

136136
open(file_path,"wb").write(b'something')
137137

138-
ifis_win():
138+
ifis_win:
139139
# on windows, there is no way this works, see images on
140140
# https://github.com/gitpython-developers/GitPython/issues/147#issuecomment-68881897
141141
# Therefore, it must be added using the python implementation

‎git/test/test_git.py‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def test_it_transforms_kwargs_into_git_command_arguments(self):
8585

8686
# order is undefined
8787
res=self.git.transform_kwargs(**{'s':True,'t':True})
88-
assert['-s','-t']==resor ['-t','-s']==res
88+
self.assertEqual(set(['-s','-t']),set(res))
8989

9090
deftest_it_executes_git_to_shell_and_returns_result(self):
9191
assert_match('^git version [\d\.]{2}.*$',self.git.execute(["git","version"]))
@@ -117,7 +117,7 @@ def test_persistent_cat_file_command(self):
117117
g.stdin.write(b"b2339455342180c7cc1e9bba3e9f181f7baa5167\n")
118118
g.stdin.flush()
119119
obj_info_two=g.stdout.readline()
120-
assertobj_info==obj_info_two
120+
self.assertEqual(obj_info,obj_info_two)
121121

122122
# read data - have to read it in one large chunk
123123
size=int(obj_info.split()[2])
@@ -127,18 +127,19 @@ def test_persistent_cat_file_command(self):
127127
# now we should be able to read a new object
128128
g.stdin.write(b"b2339455342180c7cc1e9bba3e9f181f7baa5167\n")
129129
g.stdin.flush()
130-
assertg.stdout.readline()==obj_info
130+
self.assertEqual(g.stdout.readline(),obj_info)
131131

132132
# same can be achived using the respective command functions
133133
hexsha,typename,size=self.git.get_object_header(hexsha)
134134
hexsha,typename_two,size_two,data=self.git.get_object_data(hexsha)
135-
asserttypename==typename_twoandsize==size_two
135+
self.assertEqual(typename,typename_two)
136+
self.assertEqual(size,size_two)
136137

137138
deftest_version(self):
138139
v=self.git.version_info
139-
assertisinstance(v,tuple)
140+
self.assertIsInstance(v,tuple)
140141
forninv:
141-
assertisinstance(n,int)
142+
self.assertIsInstance(n,int)
142143
# END verify number types
143144

144145
deftest_cmd_override(self):
@@ -174,28 +175,28 @@ def test_insert_after_kwarg_raises(self):
174175
deftest_env_vars_passed_to_git(self):
175176
editor='non_existant_editor'
176177
withmock.patch.dict('os.environ', {'GIT_EDITOR':editor}):
177-
assertself.git.var("GIT_EDITOR")==editor
178+
self.assertEqual(self.git.var("GIT_EDITOR"),editor)
178179

179180
@with_rw_directory
180181
deftest_environment(self,rw_dir):
181182
# sanity check
182-
assertself.git.environment()== {}
183+
self.assertEqual(self.git.environment(), {})
183184

184185
# make sure the context manager works and cleans up after itself
185186
withself.git.custom_environment(PWD='/tmp'):
186-
assertself.git.environment()=={'PWD':'/tmp'}
187+
self.assertEqual(self.git.environment(),{'PWD':'/tmp'})
187188

188-
assertself.git.environment()== {}
189+
self.assertEqual(self.git.environment(), {})
189190

190191
old_env=self.git.update_environment(VARKEY='VARVALUE')
191192
# The returned dict can be used to revert the change, hence why it has
192193
# an entry with value 'None'.
193-
assertold_env=={'VARKEY':None}
194-
assertself.git.environment()=={'VARKEY':'VARVALUE'}
194+
self.assertEqual(old_env,{'VARKEY':None})
195+
self.assertEqual(self.git.environment(),{'VARKEY':'VARVALUE'})
195196

196197
new_env=self.git.update_environment(**old_env)
197-
assertnew_env=={'VARKEY':'VARVALUE'}
198-
assertself.git.environment()== {}
198+
self.assertEqual(new_env,{'VARKEY':'VARVALUE'})
199+
self.assertEqual(self.git.environment(), {})
199200

200201
path=os.path.join(rw_dir,'failing-script.sh')
201202
stream=open(path,'wt')
@@ -214,11 +215,11 @@ def test_environment(self, rw_dir):
214215
try:
215216
remote.fetch()
216217
exceptGitCommandErroraserr:
217-
ifsys.version_info[0]<3andis_darwin():
218-
assert'ssh-origin'instr(err)
219-
asserterr.status==128
218+
ifsys.version_info[0]<3andis_darwin:
219+
self.assertIn('ssh-orig,'instr(err))
220+
self.assertEqual(err.status,128)
220221
else:
221-
assert'FOO'instr(err)
222+
self.assertIn('FOO',str(err))
222223
# end
223224
# end
224225
# end if select.poll exists

‎git/test/test_index.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ def mixed_iterator():
577577
assertlen(entries)==1andentries[0].hexsha!=null_hex_sha
578578

579579
# add symlink
580-
ifnotis_win():
580+
ifnotis_win:
581581
fortargetin ('/etc/nonexisting','/etc/passwd','/etc'):
582582
basename="my_real_symlink"
583583

@@ -630,7 +630,7 @@ def mixed_iterator():
630630
index.checkout(fake_symlink_path)
631631

632632
# on windows we will never get symlinks
633-
ifis_win():
633+
ifis_win:
634634
# simlinks should contain the link as text ( which is what a
635635
# symlink actually is )
636636
open(fake_symlink_path,'rb').read()==link_target
@@ -711,7 +711,7 @@ def make_paths():
711711
assertfkeynotinindex.entries
712712

713713
index.add(files,write=True)
714-
ifis_win():
714+
ifis_win:
715715
hp=hook_path('pre-commit',index.repo.git_dir)
716716
hpd=os.path.dirname(hp)
717717
ifnotos.path.isdir(hpd):

0 commit comments

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