Skip to content

Minimal changes to make it work with py3 with log and all #74

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Minimal changes to make it work with py3 with log and all #74

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
7 changes: 5 additions & 2 deletions patch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ def tostr(b):

logger = logging.getLogger(__name__)

logger.handlers.clear() # really needed? maybe for use as library...

debug = logger.debug
info = logger.info
warning = logger.warning
Expand Down Expand Up @@ -697,8 +699,8 @@ def _normalize_filenames(self):
for i,p in enumerate(self.items):
if debugmode:
debug(" patch type = " + p.type)
debug(" source = " + p.source)
debug(" target = " + p.target)
debug(" source = " + tostr(p.source))
debug(" target = " + tostr(p.target))
if p.type in (HG, GIT):
# TODO: figure out how to deal with /dev/null entries
debug("stripping a/ and b/ prefixes")
Expand Down Expand Up @@ -1157,6 +1159,7 @@ def main():
loglevel = verbosity_levels[options.verbosity]
logformat = "%(message)s"
logger.setLevel(loglevel)
logger.addHandler(streamhandler)
streamhandler.setFormatter(logging.Formatter(logformat))

if options.debugmode:
Expand Down