-
Notifications
You must be signed in to change notification settings - Fork 292
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
Added full names and numerical codes for Swedish counties #117
Open
dessibelle
wants to merge
8
commits into
django:master
Choose a base branch
from
dessibelle:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
958c0fe
Added dictionaries for numerical county codes and full county names.
dessibelle b222b24
Added @county_decorator() which adds a few accessor methods to models
dessibelle a15abc3
Removed unused dependency.
dessibelle 703a53f
Formatting
dessibelle c4c4462
Removed class decorator and added SECountyField to handle model acces…
dessibelle 2bda725
Syntax conformance.
dessibelle ca6bbb7
Fixed bad dict => tuple conversion.
dessibelle a7dff89
Better defaults for SECountyField.
dessibelle File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
from .se_counties import numerical_county_code, full_county_name | ||
|
||
|
||
def county_decorator(field_names=()): | ||
"""Decorator that adds get_FIELDNAME_numerical_code() and get_FIELDNAME_full_name() methods | ||
to django models for all FIELDNAME values supplied in the field_names tuple. Ideally | ||
this can be used on all model fields that uses COUNTY_CHOICES for the choices argument. | ||
|
||
@county_decorator(field_names('field',)) | ||
class MyClass: | ||
field = models.CharField(choices=se_counties=COUNTY_CHOICES) | ||
""" | ||
|
||
def decorate(cls): | ||
for field_name in field_names: | ||
|
||
_get_numerical_code = lambda self: numerical_county_code(getattr(self, field_name)) | ||
_get_full_name = lambda self: full_county_name(getattr(self, field_name)) | ||
|
||
setattr(cls, "get_" + field_name + "_numerical_code", _get_numerical_code) | ||
setattr(cls, "get_" + field_name + "_full_name", _get_full_name) | ||
|
||
return cls | ||
return decorate |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Both of those helpers won't be necessary as they just wrap dict functionality, which seems moot. Please remove.