[Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-04-14 Thread noreply
The proposal to merge lp:~m2j/openlp/bug-1094342 into lp:openlp has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~m2j/openlp/bug-1094342/+merge/157524 -- https://code.launchpad.net/~m2j/openlp/bug-1094342/+merge/157524 Your team OpenLP Core is s

[Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-04-14 Thread Tim Bentley
The proposal to merge lp:~m2j/openlp/bug-1094342 into lp:openlp has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~m2j/openlp/bug-1094342/+merge/157524 -- https://code.launchpad.net/~m2j/openlp/bug-1094342/+merge/157524 Your team OpenLP Cor

Re: [Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-04-14 Thread Tim Bentley
Review: Approve -- https://code.launchpad.net/~m2j/openlp/bug-1094342/+merge/157524 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe

Re: [Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-04-06 Thread Andreas Preikschat
Review: Approve -- https://code.launchpad.net/~m2j/openlp/bug-1094342/+merge/157524 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe

[Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-04-06 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/bug-1094342 into lp:openlp. Requested reviews: Andreas Preikschat (googol) Tim Bentley (trb143) Raoul Snyman (raoul-snyman) Related bugs: Bug #1094342 in OpenLP: "Natural sorting broken on windows" https://bugs.launchpad.net/openlp/+bug/

Re: [Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-04-06 Thread Andreas Preikschat
Review: Needs Fixing You missed to fix the tests (function renaming). -- https://code.launchpad.net/~m2j/openlp/bug-1094342/+merge/157523 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post

Re: [Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-04-06 Thread Andreas Preikschat
Review: Approve -- https://code.launchpad.net/~m2j/openlp/bug-1094342/+merge/157523 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe

[Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-04-06 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/bug-1094342 into lp:openlp. Requested reviews: Andreas Preikschat (googol) Raoul Snyman (raoul-snyman) Tim Bentley (trb143) Related bugs: Bug #1094342 in OpenLP: "Natural sorting broken on windows" https://bugs.launchpad.net/openlp/+bug/

Re: [Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-04-05 Thread Raoul Snyman
Review: Needs Fixing === added file 'tests/interfaces/openlp_plugins/__init__.pyc.OTHER' This file needs to be removed. -- https://code.launchpad.net/~m2j/openlp/bug-1094342/+merge/157445 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Ma

[Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-04-05 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/bug-1094342 into lp:openlp. Requested reviews: Tim Bentley (trb143) Raoul Snyman (raoul-snyman) Andreas Preikschat (googol) Related bugs: Bug #1094342 in OpenLP: "Natural sorting broken on windows" https://bugs.launchpad.net/openlp/+bug/

Re: [Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-04-05 Thread Meinert Jordan
Thanks the approves and the "locale" hint. -- https://code.launchpad.net/~m2j/openlp/bug-1094342/+merge/156691 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.

[Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-04-05 Thread Raoul Snyman
The proposal to merge lp:~m2j/openlp/bug-1094342 into lp:openlp has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~m2j/openlp/bug-1094342/+merge/156691 -- https://code.launchpad.net/~m2j/openlp/bug-1094342/+merge/156691 Your team OpenLP Cor

Re: [Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-04-05 Thread Raoul Snyman
Review: Needs Fixing 93 +def get_local_key(string): Surely that should be "get_locale_key"? -- https://code.launchpad.net/~m2j/openlp/bug-1094342/+merge/156691 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://lau

[Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-04-04 Thread Tim Bentley
The proposal to merge lp:~m2j/openlp/bug-1094342 into lp:openlp has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~m2j/openlp/bug-1094342/+merge/156691 -- https://code.launchpad.net/~m2j/openlp/bug-1094342/+merge/156691 Your team OpenLP Cor

Re: [Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-04-04 Thread Tim Bentley
Review: Approve -- https://code.launchpad.net/~m2j/openlp/bug-1094342/+merge/156691 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe

[Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-04-04 Thread Andreas Preikschat
You have been requested to review the proposed merge of lp:~m2j/openlp/bug-1094342 into lp:openlp. For more details, see: https://code.launchpad.net/~m2j/openlp/bug-1094342/+merge/156691 This branch replaces the "cmp=" argument when sorting a list of strings. This is necessary for Python3 trans

Re: [Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-04-02 Thread Andreas Preikschat
Review: Approve + -- https://code.launchpad.net/~m2j/openlp/bug-1094342/+merge/156691 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscrib

[Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-04-02 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/bug-1094342 into lp:openlp. Requested reviews: Andreas Preikschat (googol) Related bugs: Bug #1094342 in OpenLP: "Natural sorting broken on windows" https://bugs.launchpad.net/openlp/+bug/1094342 For more details, see: https://code.launchpa

Re: [Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-04-02 Thread Andreas Preikschat
But the rest looks good :) -- https://code.launchpad.net/~m2j/openlp/bug-1094342/+merge/156655 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Un

Re: [Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-04-02 Thread Andreas Preikschat
Review: Needs Fixing 9 + ICU_VERSION = u'OK' You should be using icu.VERSION. However, I do not know if that always existed. So maybe we need another try-catch around it. -- https://code.launchpad.net/~m2j/openlp/bug-1094342/+merge/156655 Your team OpenLP Core is subscribed to branch lp:op

[Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-04-02 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/bug-1094342 into lp:openlp. Requested reviews: Andreas Preikschat (googol) Related bugs: Bug #1094342 in OpenLP: "Natural sorting broken on windows" https://bugs.launchpad.net/openlp/+bug/1094342 For more details, see: https://code.launchpa

Re: [Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-03-31 Thread Andreas Preikschat
You should add a test to your proposal ;) -- https://code.launchpad.net/~m2j/openlp/bug-1094342/+merge/156309 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.l

[Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-03-31 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/bug-1094342 into lp:openlp. Requested reviews: Andreas Preikschat (googol) Related bugs: Bug #1094342 in OpenLP: "Natural sorting broken on windows" https://bugs.launchpad.net/openlp/+bug/1094342 For more details, see: https://code.launchpa

Re: [Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-03-31 Thread Meinert Jordan
I will compile the regexp in a variable called DIGITS_OR_NONDIGITS. I will use list compression. I used a loop before, as there were originally more code in the loop. About the memory usage: It is approximately same as before. The only difference is, that we are storing keys for the strings inst

Re: [Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-03-31 Thread Andreas Preikschat
Use list comprehension: 108 + for index, part in enumerate(key): 109 + if part.isdigit(): 110 + key[index] = int(part) 111 + else: 112 + key[index] = get_local_key(part) return [int(part) if part.isdigit() else get_local_key(part) for part in keys] Hm..

Re: [Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-03-31 Thread Andreas Preikschat
> I tested your branch and compared it to trunk: > branch: 0:00:00.001660 > trunk: 0:00:00.008635 > > 2961 songs (Note: This does not consider any pre-computing) -- https://code.launchpad.net/~m2j/openlp/bug-1094342/+merge/156292 Your team OpenLP Core is subscribed to branch lp:openlp. ___

Re: [Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-03-31 Thread Andreas Preikschat
I tested your branch and compared it to trunk: branch: 0:00:00.001660 trunk: 0:00:00.008635 2961 songs -- https://code.launchpad.net/~m2j/openlp/bug-1094342/+merge/156292 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https

Re: [Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-03-31 Thread Andreas Preikschat
92 + if ICU_COLLATOR is None: 93 + from languagemanager import LanguageManager And this is okay. -- https://code.launchpad.net/~m2j/openlp/bug-1094342/+merge/156292 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing lis

Re: [Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-03-31 Thread Andreas Preikschat
Can you replace this: 105 + key = re.findall(r'(\d+|\D+)', string) by key = REGEX_WHATEVER.findall(string) -- https://code.launchpad.net/~m2j/openlp/bug-1094342/+merge/156292 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing lis

[Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-03-31 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/bug-1094342 into lp:openlp. Requested reviews: Andreas Preikschat (googol) Related bugs: Bug #1094342 in OpenLP: "Natural sorting broken on windows" https://bugs.launchpad.net/openlp/+bug/1094342 For more details, see: https://code.launchpa

[Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-03-31 Thread Meinert Jordan
The proposal to merge lp:~m2j/openlp/bug-1094342 into lp:openlp has been updated. Description changed to: This branch replaces the "cmp=" argument when sorting a list of strings. This is necessary for Python3 transition. Additionally it uses ICU for locale aware string sorting. For Windows thi

Re: [Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-03-31 Thread Meinert Jordan
> Works on windows and one linux. I tested the sorting only with py2. On py3 I > only tested if it starts. > > I haven't reviewed the code nor did performance tests yet. Hi, I've looked to the Song class, and realized, that it makes sence to buffer the whole key generation for song titles. This

Re: [Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-03-31 Thread Andreas Preikschat
Works on windows and one linux. I tested the sorting only with py2. On py3 I only tested if it starts. I haven't reviewed the code nor did performance tests yet. -- https://code.launchpad.net/~m2j/openlp/bug-1094342/+merge/156284 Your team OpenLP Core is subscribed to branch lp:openlp. ___

[Openlp-core] [Merge] lp:~m2j/openlp/bug-1094342 into lp:openlp

2013-03-30 Thread Meinert Jordan
Meinert Jordan has proposed merging lp:~m2j/openlp/bug-1094342 into lp:openlp. Commit message: - use ICU for string sorting - switch to Python 3 style sorting Requested reviews: Andreas Preikschat (googol) Related bugs: Bug #1094342 in OpenLP: "Natural sorting broken on windows" https://bug