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.

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

Merge pending PRs from upstream #2

Merged
merged 9 commits into from
Jan 17, 2018
Merged

Merge pending PRs from upstream #2

merged 9 commits into from
Jan 17, 2018

Conversation

atodorov
Copy link

No description provided.

atodorov and others added 9 commits January 17, 2018 15:35
Checks that Pylint does not complain about django lazy proxy
when using ugettext_lazy
Fix E1101:Instance of '__proxy__' has no 'format' member' when using .format() on a ugettext_lazy translation

NOTE: merged with modifications. Instead of returning str,
      returns ''

Fixes pylint-dev#80
Origina PR: pylint-dev#100
NOTE: merged with modifications:
	- resolved conflicts
	- updated where test files are on disk

Original PR: pylint-dev#84
@coveralls
Copy link

coveralls commented Jan 17, 2018

Coverage Status

Coverage increased (+0.6%) to 84.774% when pulling 1a68739 on next_release into 2f713d3 on master.

@atodorov atodorov merged commit 53287bf into master Jan 17, 2018
@atodorov atodorov deleted the next_release branch January 17, 2018 14:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
7 participants