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

Release channels and M2M for country and locale #41

Merged
merged 3 commits into from
Feb 25, 2016

Conversation

mythmon
Copy link
Contributor

@mythmon mythmon commented Feb 19, 2016

@Osmose r?

Fixes bug 1248265.
@mythmon mythmon changed the title Filter by release channel Release channels and M2M for country and locale Feb 20, 2016
@mythmon
Copy link
Contributor Author

mythmon commented Feb 20, 2016

The release channel change and the M2M changes for country and locale share a lot in common. It was much easier to combine them into one branch, so I did that.

self.request = request
self.locale = locale
self.release_channel = release_channel
self._country = country
Copy link
Contributor

Choose a reason for hiding this comment

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

You can actually just set self.country = country and it will use that instead of the cached property. So setting it if country isn't None will let you retain the decorator while allowing it to be set manually.

@Osmose
Copy link
Contributor

Osmose commented Feb 25, 2016

r+wc, nice work!

mythmon pushed a commit that referenced this pull request Feb 25, 2016
Release channels and M2M for country and locale
@mythmon mythmon merged commit 249d0a1 into mozilla:master Feb 25, 2016
@mythmon mythmon deleted the version-filtering-1248265 branch February 25, 2016 00:51
@mythmon mythmon restored the version-filtering-1248265 branch March 2, 2016 20:09
@mythmon mythmon deleted the version-filtering-1248265 branch March 2, 2016 20:10
mythmon pushed a commit to mythmon/normandy that referenced this pull request Jan 5, 2017
Bug 1325797: Do not fail if the dev-mode pref is missing on startup.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants