Patch for ini backend problems (was Re: 0.3 this week)

9 views
Skip to first unread message

Marcin Kasperski

unread,
Jun 26, 2010, 1:41:29 PM6/26/10
to python-...@googlegroups.com
I implemented simple escaping for file-based backends, to resolve the
old problem of crashes when non-alphanumeric characters are used in
username or service. In particuler it should resolve my problems with
mercurial_keyring on shell accounts.

You can pull it as
http://bitbucket.org/Mekk/python-keyring-lib-mekk-patches

(implemented in branch handle-non-char-keys)

PS What is the best way to offer patches? Email here, bitbucket
"request for merge", something else? And is it a good idea to branch,
or not?

Tarek Ziadé

unread,
Jun 26, 2010, 5:30:26 PM6/26/10
to python-...@googlegroups.com

The best way is to avoid named branches and work on a clone
that is synced with the tip, then asked for pull requests here.
(or build a patch file, that works too)

If you could do this I'll pull your changes,

Cheers

Tarek
--
Tarek Ziadé | http://ziade.org

Marcin Kasperski

unread,
Jun 27, 2010, 11:32:07 AM6/27/10
to python-...@googlegroups.com
> The best way is to avoid named branches and work on a clone
> that is synced with the tip, then asked for pull requests here.
> (or build a patch file, that works too)

Any particular reasons? I intended to use branches because if things
work out I hope to work on more than one patch, and branch makes it
possible for you to pull selectively...

Still, I merged my branch to my tip as you wanted.

Tarek Ziadé

unread,
Jul 1, 2010, 9:44:11 AM7/1/10
to python-...@googlegroups.com
On Sun, Jun 27, 2010 at 5:32 PM, Marcin Kasperski
<Marcin.K...@mekk.waw.pl> wrote:
>> The best way is to avoid named branches and work on a clone
>> that is synced with the tip, then asked for pull requests here.
>> (or build a patch file, that works too)
>
> Any particular reasons? I intended to use branches because if things
> work out I hope to work on more than one patch, and branch makes it
> possible for you to pull selectively...

This is to avoid getting new branches when I pull your changes.

But you could work with branches on your side, and provide me a patch
I can apply

> Still, I merged my branch to my tip as you wanted.
>

Ok, I'll look at it asap

Tarek Ziadé

unread,
Jul 5, 2010, 4:19:24 AM7/5/10
to python-...@googlegroups.com
On Thu, Jul 1, 2010 at 3:44 PM, Tarek Ziadé <ziade...@gmail.com> wrote:
...

> Ok, I'll look at it asap

Done !

Anything else pending or shall I release 0.3 ?

Tarek Ziadé

unread,
Jul 5, 2010, 4:25:44 AM7/5/10
to python-...@googlegroups.com
Arg, your named branch appears in the main repo now.

I hate mercurial sometimes....

Marcin Kasperski

unread,
Jul 5, 2010, 5:46:36 AM7/5/10
to python-...@googlegroups.com
> Anything else pending or shall I release 0.3 ?

At the moment I don't have anything, next patches are rather matter of
months, not days.

> Arg, your named branch appears in the main repo now.
> I hate mercurial sometimes....

The branch is inactive so should not really be a problem

But OK, I will switch to bookmarks for next things...

Tarek Ziadé

unread,
Jul 5, 2010, 6:12:12 AM7/5/10
to python-...@googlegroups.com

It's not a big deal, but we might have many inactive branches popping
up in the main repo.
Do you know how to remove these completely ?

Marcin Kasperski

unread,
Jul 5, 2010, 8:00:15 AM7/5/10
to python-...@googlegroups.com
> It's not a big deal, but we might have many inactive branches popping
> up in the main repo.
> Do you know how to remove these completely ?

100% completely is impossible (info about branch remain in
changesets), but from practical point of view

hg update handle-non-char-keys
hg commit --close-branch -m "closing branch"

and it should not appear in hg branches and such (unless you add a
flag to show closed branches).

I should have closed the branch while merging it, forgot, sorry. If
you prefer I can push this changeset to my repo.

Marcin Kasperski

unread,
Jul 6, 2010, 11:54:03 AM7/6/10
to python-...@googlegroups.com
I just spotted one omission - I forgot to update setup.py what
resulted in errrors like

abort: could not import module util.escape!

(just keyring.util must be added to packages in setup.py)

You can pull updated setup (plus changeset closing the old branch) from my repo.

Reply all
Reply to author
Forward
0 new messages