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

Add new Christmas letters to Santa postcode. #150

Merged
merged 7 commits into from
Nov 28, 2014
Merged

Add new Christmas letters to Santa postcode. #150

merged 7 commits into from
Nov 28, 2014

Conversation

dracos
Copy link
Member

@dracos dracos commented Nov 27, 2014

This is the postcode now according to
http://www.royalmail.com/letters-to-santa

@stevenday
Copy link
Contributor

🎅

@dracos
Copy link
Member Author

dracos commented Nov 27, 2014

Rebased on top of the py3 branch as that also has Travis/Django 1.7.1 fixes. Will wait for that to go through first.

This commit combines the output of the following:
    lib2to3.fixes.fix_except
    lib2to3.fixes.fix_idioms
    lib2to3.fixes.fix_import
    lib2to3.fixes.fix_ws_comma
    lib2to3.fixes.fix_xrange
    libmodernize.fixes.fix_dict
    Replace filter with list comprehension.
    Wrap map() in list/tuple, it's an iterator in Py3.
    libmodernize.fixes.fix_metaclass
    libmodernize.fixes.fix_next
    libmodernize.fixes.fix_raise
    Update imports using six.moves.
    raw_input
    Fix urllib
    Fix print handling (brackets, __future__).
    Fix unicode handling (remove u'', smart_str/text).
    Python 3 string related fixes.
    Update model string methods for Python 3.
Add Python 3 testing to Travis, and work around issue with echo/YAML
indenting.
Django 1.7.1 calls the built-in version by default on related managers,
so move to using a version that matches its behaviour more precisely.
@dracos dracos merged commit 9e84122 into master Nov 28, 2014
@dracos dracos deleted the santa-postcode branch December 22, 2015 12:02
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