Skip to content

Fix some issues found by lgtm.com#64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
misery wants to merge 1 commit into
base:master
Choose a base branch
from
Open

Fix some issues found by lgtm.com #64

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions patch.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -368,7 +368,7 @@ def lineno(self):
header.append(fe.line)
fe.next()
if fe.is_empty:
if p == None:
if p is None:
debug("no patch data found") # error is shown later
self.errors += 1
else:
Expand DownExpand Up@@ -941,7 +941,6 @@ def apply(self, strip=0, root=None):
if exists(backupname):
warning("can't backup original file to %s - aborting" % backupname)
else:
import shutil
shutil.move(filename, backupname)
if self.write_hunks(backupname, filename, p.hunks):
info("successfully patched %d/%d:\t %s" % (i+1, total, filename))
Expand DownExpand Up@@ -1005,7 +1004,6 @@ class NoMatch(Exception):

lineno = 1
line = fp.readline()
hno = None
try:
for hno, h in enumerate(hunks):
# skip to first line of the hunk
Expand Down