1. Alexander Solovyov
  2. byteflow
  3. Pull requests

Pull requests

#2 Open

Progress towards Django 1.4

Bitbucket cannot automatically merge this request.

The commits that make up this pull request have been removed.

Bitbucket cannot automatically merge this request due to conflicts.

Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:

hg update 
hg pull -r default https://bitbucket.org/resplin/byteflow
  1. Richard Esplin

Resolving errors to make compatible with Django 1.4. This is done in a backwards-compatible manner, so it still runs in Django 1.1.

Still have one issue that I know of: https://bitbucket.org/resplin/byteflow/issue/1/ Since my changes don't impact current compatibility, I'm think it is safe to merge so that others can help.

The other changes correct problems with interaction between settings.py and settings_local.py.

They are in the same pull request because the last commit corrects a bug in the backwards compatible Django 1.4 changes. I don't see how to cherry pick that bugfix with the first set of changes without including the second set.

  • Learn about pull requests

Comments (2)

  1. Alexander Solovyov repo owner

    I don't really use or maintain Byteflow already, but this seems like no-brainer to me, absolutely safe to merge. I have one note though: use 'key' in dict instead of has_key to check if dictionary has the key, that's how Python does it right now.

    Also, in one of comments you have a misprint: 'depricated'.

    Thanks for your work! :)