Skip to content
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

Jump to bottom

Bugfixes #68

Merged
merged 2 commits into from
Dec 29, 2017
Merged

Bugfixes #68

merged 2 commits into from
Dec 29, 2017

Conversation

monsieurh
Copy link
Collaborator

Purpose
Extract some useful bugfixes from #60 to be merged into devel faster.
irc log for discussion

irc.freenode.net #zerophone for Dec 28, 2017
[02:28] <CRImier> BTW, small commits like these:
[02:28] <CRImier> https://github.com/ZeroPhone/ZPUI/pull/60/commits/bd77eb583a46969bf2e14f4f1dedb090f7347d32
[02:28] <CRImier> or
[02:28] <CRImier> https://github.com/ZeroPhone/ZPUI/pull/60/commits/42278abc7a181f2ee22c9351cb88812248e5fd4a
[02:28] <CRImier> Feel free to send them as separate PRs, will be instantly merged

@monsieurh monsieurh requested a review from CRImier December 29, 2017 09:26
@CRImier CRImier changed the base branch from devel to master December 29, 2017 09:53
@CRImier CRImier changed the base branch from master to devel December 29, 2017 09:53
CRImier
CRImier approved these changes Dec 29, 2017
View reviewed changes
output/drivers/pygame_emulator_factory.py
from helpers import setup_logger

# ignore PIL debug messages

logging.getLogger("PIL").setLevel(logging.ERROR)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fixes the import error, but loses a feature - namely, PIL library logging output suppression (which is pointed out in the comment right above). Sorry for not pointing this out earlier =)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, we don't even use the resulting logger - so, removed

@CRImier CRImier merged commit d5625f2 into devel Dec 29, 2017
@CRImier CRImier deleted the bugfixes branch December 29, 2017 10:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@CRImier CRImier CRImier approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@monsieurh @CRImier