File tree 1 file changed +8
-12
lines changed
1 file changed +8
-12
lines changed Original file line number Diff line number Diff line change 43
43
stream_copy ,
44
44
)
45
45
46
+ try :
47
+ PermissionError
48
+ except NameError : # Python < 3.3
49
+ PermissionError = OSError
46
50
47
51
execute_kwargs = {'istream' , 'with_extended_output' ,
48
52
'with_exceptions' , 'as_process' , 'stdout_as_string' ,
@@ -211,22 +215,14 @@ def refresh(cls, path=None):
211
215
212
216
# test if the new git executable path is valid
213
217
214
- if sys .version_info < (3 ,):
215
- # - a GitCommandNotFound error is spawned by ourselves
216
- # - a OSError is spawned if the git executable provided
217
- # cannot be executed for whatever reason
218
- exceptions = (GitCommandNotFound , OSError )
219
- else :
220
- # - a GitCommandNotFound error is spawned by ourselves
221
- # - a PermissionError is spawned if the git executable provided
222
- # cannot be executed for whatever reason
223
- exceptions = (GitCommandNotFound , PermissionError )
224
-
218
+ # - a GitCommandNotFound error is spawned by ourselves
219
+ # - a PermissionError is raised if the git executable provided
220
+ # cannot be executed for whatever reason
225
221
has_git = False
226
222
try :
227
223
cls ().version ()
228
224
has_git = True
229
- except exceptions :
225
+ except ( GitCommandNotFound , PermissionError ) :
230
226
pass
231
227
232
228
# warn or raise exception if test failed
You can’t perform that action at this time.
0 commit comments