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

Commit6ee08fc

Browse files
committed
RF: primarily flake8 lints + minor RF to reduce duplication in PATHEXT
I did keep some "bare" except with catch all Exception: , while tried to disableflake8 complaints where clearly all exceptions are to be catched
1 parent0a96030 commit6ee08fc

File tree

10 files changed

+53
-56
lines changed

10 files changed

+53
-56
lines changed

‎git/compat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,5 +309,5 @@ def register_surrogateescape():
309309

310310
try:
311311
b"100644\x9f\0aaa".decode(defenc,"surrogateescape")
312-
except:
312+
exceptException:
313313
register_surrogateescape()

‎git/diff.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -313,20 +313,20 @@ def __str__(self):
313313
h%=self.b_blob.path
314314

315315
msg=''
316-
l=None# temp line
317-
ll=0# line length
316+
line=None# temp line
317+
line_length=0# line length
318318
forb,ninzip((self.a_blob,self.b_blob), ('lhs','rhs')):
319319
ifb:
320-
l="\n%s: %o | %s"% (n,b.mode,b.hexsha)
320+
line="\n%s: %o | %s"% (n,b.mode,b.hexsha)
321321
else:
322-
l="\n%s: None"%n
322+
line="\n%s: None"%n
323323
# END if blob is not None
324-
ll=max(len(l),ll)
325-
msg+=l
324+
line_length=max(len(line),line_length)
325+
msg+=line
326326
# END for each blob
327327

328328
# add headline
329-
h+='\n'+'='*ll
329+
h+='\n'+'='*line_length
330330

331331
ifself.deleted_file:
332332
msg+='\nfile deleted in rhs'

‎git/exc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def __init__(self, command, status=None, stderr=None, stdout=None):
4848
else:
4949
try:
5050
status=u'exit code(%s)'%int(status)
51-
except:
51+
exceptValueError:
5252
s=safe_decode(str(status))
5353
status=u"'%s'"%sifisinstance(status,string_types)elses
5454

‎git/refs/log.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ def to_file(self, filepath):
246246
try:
247247
self._serialize(fp)
248248
lfd.commit()
249-
except:
249+
exceptException:
250250
# on failure it rolls back automatically, but we make it clear
251251
lfd.rollback()
252252
raise

‎git/remote.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -542,9 +542,11 @@ def urls(self):
542542
if' Push URL:'inline:
543543
yieldline.split(': ')[-1]
544544
exceptGitCommandErrorasex:
545-
ifany([msginstr(ex)formsgin ['correct access rights','cannot run ssh']]):
546-
# If ssh is not setup to access this repository, see issue 694
547-
result=Git().execute(['git','config','--get','remote.%s.url'%self.name])
545+
ifany([msginstr(ex)formsgin ['correct access rights','cannot run ssh']]):
546+
# If ssh is not setup to access this repository, see issue 694
547+
result=Git().execute(
548+
['git','config','--get','remote.%s.url'%self.name]
549+
)
548550
yieldresult
549551
else:
550552
raiseex

‎git/repo/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ def __exit__(self, exc_type, exc_value, traceback):
203203
def__del__(self):
204204
try:
205205
self.close()
206-
except:
206+
exceptException:
207207
pass
208208

209209
defclose(self):

‎git/test/lib/helper.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ def repo_creator(self):
139139
try:
140140
try:
141141
returnfunc(self,rw_repo)
142-
except:
142+
except:# noqa E722
143143
log.info("Keeping repo after failure: %s",repo_dir)
144144
repo_dir=None
145145
raise
@@ -227,7 +227,7 @@ def with_rw_and_rw_remote_repo(working_tree_ref):
227227
Same as with_rw_repo, but also provides a writable remote repository from which the
228228
rw_repo has been forked as well as a handle for a git-daemon that may be started to
229229
run the remote_repo.
230-
The remote repository was cloned as bare repository from therorepo, whereas
230+
The remote repository was cloned as bare repository from thero repo, whereas
231231
the rw repo has a working tree and was cloned from the remote repository.
232232
233233
remote_repo has two remotes: origin and daemon_origin. One uses a local url,
@@ -296,7 +296,7 @@ def remote_repo_creator(self):
296296
withcwd(rw_repo.working_dir):
297297
try:
298298
returnfunc(self,rw_repo,rw_daemon_repo)
299-
except:
299+
except:# noqa E722
300300
log.info("Keeping repos after failure:\n rw_repo_dir: %s\n rw_daemon_repo_dir: %s",
301301
rw_repo_dir,rw_daemon_repo_dir)
302302
rw_repo_dir=rw_daemon_repo_dir=None

‎git/test/test_submodule.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -920,4 +920,4 @@ class Repo(object):
920920
submodule_path='D:\\submodule_path'
921921
relative_path=Submodule._to_relative_path(super_repo,submodule_path)
922922
msg='_to_relative_path should be "submodule_path" but was "%s"'%relative_path
923-
assertrelative_path=='submodule_path',msg
923+
assertrelative_path=='submodule_path',msg

‎git/test/test_util.py

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -217,49 +217,49 @@ def test_actor(self):
217217
@ddt.data(('name',''), ('name','prefix_'))
218218
deftest_iterable_list(self,case):
219219
name,prefix=case
220-
l=IterableList(name,prefix)
220+
ilist=IterableList(name,prefix)
221221

222222
name1="one"
223223
name2="two"
224224
m1=TestIterableMember(prefix+name1)
225225
m2=TestIterableMember(prefix+name2)
226226

227-
l.extend((m1,m2))
227+
ilist.extend((m1,m2))
228228

229-
self.assertEqual(len(l),2)
229+
self.assertEqual(len(ilist),2)
230230

231231
# contains works with name and identity
232-
self.assertIn(name1,l)
233-
self.assertIn(name2,l)
234-
self.assertIn(m2,l)
235-
self.assertIn(m2,l)
236-
self.assertNotIn('invalid',l)
232+
self.assertIn(name1,ilist)
233+
self.assertIn(name2,ilist)
234+
self.assertIn(m2,ilist)
235+
self.assertIn(m2,ilist)
236+
self.assertNotIn('invalid',ilist)
237237

238238
# with string index
239-
self.assertIs(l[name1],m1)
240-
self.assertIs(l[name2],m2)
239+
self.assertIs(ilist[name1],m1)
240+
self.assertIs(ilist[name2],m2)
241241

242242
# with int index
243-
self.assertIs(l[0],m1)
244-
self.assertIs(l[1],m2)
243+
self.assertIs(ilist[0],m1)
244+
self.assertIs(ilist[1],m2)
245245

246246
# with getattr
247-
self.assertIs(l.one,m1)
248-
self.assertIs(l.two,m2)
247+
self.assertIs(ilist.one,m1)
248+
self.assertIs(ilist.two,m2)
249249

250250
# test exceptions
251-
self.failUnlessRaises(AttributeError,getattr,l,'something')
252-
self.failUnlessRaises(IndexError,l.__getitem__,'something')
251+
self.failUnlessRaises(AttributeError,getattr,ilist,'something')
252+
self.failUnlessRaises(IndexError,ilist.__getitem__,'something')
253253

254254
# delete by name and index
255-
self.failUnlessRaises(IndexError,l.__delitem__,'something')
256-
del(l[name2])
257-
self.assertEqual(len(l),1)
258-
self.assertNotIn(name2,l)
259-
self.assertIn(name1,l)
260-
del(l[0])
261-
self.assertNotIn(name1,l)
262-
self.assertEqual(len(l),0)
263-
264-
self.failUnlessRaises(IndexError,l.__delitem__,0)
265-
self.failUnlessRaises(IndexError,l.__delitem__,'something')
255+
self.failUnlessRaises(IndexError,ilist.__delitem__,'something')
256+
del(ilist[name2])
257+
self.assertEqual(len(ilist),1)
258+
self.assertNotIn(name2,ilist)
259+
self.assertIn(name1,ilist)
260+
del(ilist[0])
261+
self.assertNotIn(name1,ilist)
262+
self.assertEqual(len(ilist),0)
263+
264+
self.failUnlessRaises(IndexError,ilist.__delitem__,0)
265+
self.failUnlessRaises(IndexError,ilist.__delitem__,'something')

‎git/util.py

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -188,20 +188,15 @@ def assure_directory_exists(path, is_file=False):
188188

189189

190190
def_get_exe_extensions():
191-
try:
192-
winprog_exts=tuple(p.upper()forpinos.environ['PATHEXT'].split(os.pathsep))
193-
except:
194-
winprog_exts= ('.BAT','COM','.EXE')
195-
196-
returnwinprog_exts
191+
PATHEXT=os.environ.get('PATHEXT',None)
192+
returntuple(p.upper()forpinPATHEXT.split(os.pathsep)) \
193+
ifPATHEXT \
194+
else (('.BAT','COM','.EXE')ifis_winelse ())
197195

198196

199197
defpy_where(program,path=None):
200198
# From: http://stackoverflow.com/a/377028/548792
201-
try:
202-
winprog_exts=tuple(p.upper()forpinos.environ['PATHEXT'].split(os.pathsep))
203-
except:
204-
winprog_exts=is_winand ('.BAT','COM','.EXE')or ()
199+
winprog_exts=_get_exe_extensions()
205200

206201
defis_exec(fpath):
207202
returnosp.isfile(fpath)andos.access(fpath,os.X_OK)and (
@@ -347,7 +342,7 @@ def expand_path(p, expand_vars=True):
347342
ifexpand_vars:
348343
p=osp.expandvars(p)
349344
returnosp.normpath(osp.abspath(p))
350-
except:
345+
exceptException:
351346
returnNone
352347

353348
#} END utilities

0 commit comments

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