You need to make your code PEP8 compliant according to project guidelines:

$ make pep8

Rebase it on the master if your missing some parts.

Can you in the same time, merge both commit into one (to have a clean diff).

I'll merge it once it's done.

Next time, when you want to submit a bug report and the corresponding fix, just open a pull request: an issue will be automatically created and its easier to track and understand.

By the way, thanks for the fix.

i'm fairly inexperienced with git, so merging the commits and pushing them didn't go so well, sorry. anyway, here's the commit: szelga@179876f

For the next time,

When you submit a pul request based on a branch, you can update the branch (even with a git push -f) et the pull request will automatically update itself.

To rebase your branch properly on master and merge some commit together, you need to use the interactive rebase.
In you case, you could have done:

$ git remote add noirbizarre https://github.com/noirbizarre/django.js.git
$ git pull noirbizarre master  # sync your master from upstream
$ git checkout fix_cms
$ git rebase -i master  # start the interactive rebase

You would have this displayed:

pick 6bd6c6b fix #25
pick 89b3e86 fix #25 -- fix prev commit

To amend the first commit with the second, you should have written:

pick 6bd6c6b fix #25
fixup 89b3e86 fix #25 -- fix prev commit

or

pick 6bd6c6b fix #25
f 89b3e86 fix #25 -- fix prev commit

Once it's done, you could have overwritten your remote branch and updated the pull-request:

$ git push -f

thank you very much and sorry for inconvenience.

i'm used to mercurial and some of its features and workflow are new to me, so your tips are very helpful.

You are very welcome!
There was no inconvenience, don't worry !

I'm glad to help on git usage.
I think I would be lost on mercurial too!!

Using mercurial, you are not so far from git, just some tips like that to learn!

Coverage decreased (-45.47%) when pulling 89b3e86 on szelga:fix_cms into 4c41997 on noirbizarre:master.