Summary

Fix syntax error in resources.py, and move extension_resource instantiation

Review Request #1842 — Created Oct. 18, 2010 and submitted

Information

Owner

mike_conley

Repository

Review Board

Branch

extensions

Bugs

Depends On

Reviewers

Groups

reviewboard

People

Description

Un-doing some damage I inserted into the code.  Not sure how it slipped under the radar, but there was a double-comma (and a line over 80 chars) in the ExtensionResource import.

Also, the RootResource refers to extension_resource, which therefore needs to be instantiated *before* RootResource.  So that's why I moved it.

Testing Done

Manual.  Things all work nicely again.

reviewboard/webapi/resources.py (Diff revision 1)

I feel like this would all be prettier if you wrapped after "import" and indented 4 spaces.

Change Summary:

Thanks for the review.  Wrapping after import, and indented 4 spaces.

Diff:

Revision 2 (+10 -8)

Show changes

reviewboard/webapi/resources.py

Ship it!

Looks good. Do you have push access to the main repos yet?

mike_conley Oct. 21, 2010, 7:54 a.m.

Nope - if you're OK with giving it, my Github account username mikeconley.

Let me know if you're cool with me pushing.

david Oct. 21, 2010, 6:21 p.m.

I've enabled you to push to the reviewboard and djblets repositories. Please merge this to master and push it, and then close it out as submitted :)

chipx86 Oct. 21, 2010, 7 p.m.

A couple notes there. It's nice to have a well-structured change history. A small fix like this should be collapsed into one commit that lives in master (not worth having merge history there). Large designs with several organized commits (rather than random "Fixed this..", "Fixed another thing", "Tweak", etc.) can be merged into mater, but it's also nice to have a custom merge message describing it as if it were a single commit.

In both cases (single commit on master, merged commit message), please append the following to the message:

Fixes bugs #123
Reviewed at http://....../r/123/


Of course, leave out the bugs thing if there are no bugs. The URL for the review request should be the review request itself, not a diff or anything.