Merge lp://staging/~slacklinucs/lalita/new-photo into lp://staging/lalita

Proposed by Martin Chikilian
Status: Merged
Approved by: Facundo Batista
Approved revision: 172
Merge reported by: Facundo Batista
Merged at revision: not available
Proposed branch: lp://staging/~slacklinucs/lalita/new-photo
Merge into: lp://staging/lalita
Diff against target: 2379 lines (+2233/-23) (has conflicts)
3 files modified
lalita.cfg.sample (+2127/-0)
lalita/plugins/photo.py (+53/-23)
lalita/plugins/tests/test_photo.py (+53/-0)
Text conflict in lalita.cfg.sample
To merge this branch: bzr merge lp://staging/~slacklinucs/lalita/new-photo
Reviewer Review Type Date Requested Status
Facundo Batista Approve
Review via email: mp+56164@code.staging.launchpad.net

Description of the change

Added ability of parsing PRIVATE_MESSAGES in the Photo plugin

To post a comment you must log in.
Revision history for this message
Facundo Batista (facundo) wrote :

Hey, great functionality; some details are pending, let's work to push this:

Notes:

- The "photo_command" method needs to keep the docstring, because it's the command's help.

- You mixed tabs with spaces! Need to indent using only spaces.

- Don't add this plugin to lalita.cfg.sample, the idea is to keep it simple

- Tests look ok, but couldn't run it because you mixed tabs with spaces.

So, let me know when you push these fixes!

Thank you!

review: Needs Fixing
171. By Martin Chikilian

Fixed some things requested by CM

Revision history for this message
Martin Chikilian (slacklinucs) wrote :

Facundo,

Requested fixes were applied, please consider merging revision 171 into
trunk.

Thanks!

Martín

On Mon, Apr 4, 2011 at 8:18 PM, Facundo Batista <email address hidden>wrote:

> Review: Needs Fixing
> Hey, great functionality; some details are pending, let's work to push
> this:
>
> Notes:
>
> - The "photo_command" method needs to keep the docstring, because it's the
> command's help.
>
> - You mixed tabs with spaces! Need to indent using only spaces.
>
> - Don't add this plugin to lalita.cfg.sample, the idea is to keep it simple
>
> - Tests look ok, but couldn't run it because you mixed tabs with spaces.
>
> So, let me know when you push these fixes!
>
> Thank you!
> --
> https://code.launchpad.net/~slacklinucs/lalita/new-photo/+merge/56164
> You are the owner of lp:~slacklinucs/lalita/new-photo.
>

Revision history for this message
Facundo Batista (facundo) wrote :

Some further comments:

- Docstrings in command and private message are ok... but is redundant in _photo(), please put a doscstring there like "Common photo functionality", or something.

- In photo_command(), why you do:

        if retTxt:
            self.say(channel, retTxt)

...if retTxt is always true? (same in photo_private())

- Please merge again lalita.cfg.sample, it seems to be a whitespace conflict.

Thank you!

172. By Martin Chikilian

Merged corrections to photo plugin and configuration file restored

Revision history for this message
Facundo Batista (facundo) wrote :

Hi!

I still have a conflict in the config file.

However, this file is not need, so I used the other two, and merged them to trunk.

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches