Use OrderedDict to maintain emoticons order in packs.

4 files changed, 192 insertions, 184 deletions

diff --git a/data/emoticons/animated/emoticons.py b/data/emoticons/animated/emoticons.py
index 222358ef9..bf464b560 100644
--- a/data/emoticons/animated/emoticons.py
+++ b/data/emoticons/animated/emoticons.py
@@ -1,50 +1,52 @@
 # coding=utf-8
-emoticons = {
-        'smile.png': [':-)', ':)'],
-        'coolglasses.png': ['B-)', '(H)'],
-        'wink.gif': [';-)', ';)'],
-        'biggrin.png': [':-D', ':D'],
-        'unhappy.png': [':-(', ':('],
-        'cry.gif': [":'-(", ":'(", ';-(', ';(', ";'-("],
-        'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'],
-        'blush.png': [':-$', ':$'],
-        'angry.png': [':-@', ':@'],
-        'bat.gif': [':-[', ':['],
-        'kiss.png': [':-{}', ':-*', ':*', '(K)'],
-        'stare.png': [':-|', ':|'],
-        'devil.png': [']:->', '>:-)', '>:)', '(6)'],
-        'tongue.png': [':-P', ':P', ':-þ', ':þ'],
-        'oh.png': ['=-O', ':-O', ':O'],
-        'heart.png': ['<3', '(L)', '*IN LOVE*'],
-        'pussy.png': ['(@)'],
-        'cuffs.png': ['(%)'],
-        'moon.png': ['(S)'],
-        'lamp.png': ['(I)'],
-        'music.png': ['(8)'],
-        'beer.png': ['(B)', '*DRINK*'],
-        'brflower.png': ['(W)'],
-        'boy.png': ['(Z)'],
-        'girl.png': ['(X)'],
-        'mail.png': ['(E)'],
-        'thumbdown.png': ['(N)'],
-        'photo.png': ['(P)'],
-        'thumbup.png': ['(Y)', '*THUMBS UP*'],
-        'hugleft.png': ['(})'],
-        'brheart.png': ['</3', '(U)'],
-        'flower.png': ['@}->--', '(F)'],
-        'drink.png': ['(D)'],
-        'phone.png': ['(T)'],
-        'coffee.png': ['(C)'],
-        'hugright.png': ['({)'],
-        'star.png': ['(*)'],
-        'rainbow.png': ['(R)'],
-        'cigarette.gif': ['(ci)'],
-        'cake.gif': ['(^)'],
-        'dontknow.gif': [':^)'],
-        'eyeroll.gif': ['8-)'],
-        'lightning.gif': ['(li)'],
-        'party.gif': ['<:o)'],
-        'sleepy.gif': ['|-)'],
-        'think.gif': ['*-)'],
-        'puke.gif': [':-!'],
-}
+from collections import OrderedDict
+
+emoticons = OrderedDict((
+    ('smile.png', [':-)', ':)']),
+    ('coolglasses.png', ['B-)', '(H)']),
+    ('wink.gif', [';-)', ';)']),
+    ('biggrin.png', [':-D', ':D']),
+    ('unhappy.png', [':-(', ':(']),
+    ('cry.gif', [":'-(", ":'(", ';-(', ';(', ";'-("]),
+    ('frowning.png', [':-/', ':/', ':-\\', ':\\', ':-S', ':S']),
+    ('blush.png', [':-$', ':$']),
+    ('angry.png', [':-@', ':@']),
+    ('bat.gif', [':-[', ':[']),
+    ('kiss.png', [':-{}', ':-*', ':*', '(K)']),
+    ('stare.png', [':-|', ':|']),
+    ('devil.png', [']:->', '>:-)', '>:)', '(6)']),
+    ('tongue.png', [':-P', ':P', ':-þ', ':þ']),
+    ('oh.png', ['=-O', ':-O', ':O']),
+    ('heart.png', ['<3', '(L)', '*IN LOVE*']),
+    ('pussy.png', ['(@)']),
+    ('cuffs.png', ['(%)']),
+    ('moon.png', ['(S)']),
+    ('lamp.png', ['(I)']),
+    ('music.png', ['(8)']),
+    ('beer.png', ['(B)', '*DRINK*']),
+    ('brflower.png', ['(W)']),
+    ('boy.png', ['(Z)']),
+    ('girl.png', ['(X)']),
+    ('mail.png', ['(E)']),
+    ('thumbdown.png', ['(N)']),
+    ('photo.png', ['(P)']),
+    ('thumbup.png', ['(Y)', '*THUMBS UP*']),
+    ('hugleft.png', ['(})']),
+    ('brheart.png', ['</3', '(U)']),
+    ('flower.png', ['@}->--', '(F)']),
+    ('drink.png', ['(D)']),
+    ('phone.png', ['(T)']),
+    ('coffee.png', ['(C)']),
+    ('hugright.png', ['({)']),
+    ('star.png', ['(*)']),
+    ('rainbow.png', ['(R)']),
+    ('cigarette.gif', ['(ci)']),
+    ('cake.gif', ['(^)']),
+    ('dontknow.gif', [':^)']),
+    ('eyeroll.gif', ['8-)']),
+    ('lightning.gif', ['(li)']),
+    ('party.gif', ['<:o)']),
+    ('sleepy.gif', ['|-)']),
+    ('think.gif', ['*-)']),
+    ('puke.gif', [':-!']),
+))
diff --git a/data/emoticons/static-big/emoticons.py b/data/emoticons/static-big/emoticons.py
index 8ed1da834..ba51e1852 100644
--- a/data/emoticons/static-big/emoticons.py
+++ b/data/emoticons/static-big/emoticons.py
@@ -1,43 +1,45 @@
 # coding=utf-8
-emoticons = {
-        'smile.png': [':-)', ':)'],
-        'coolglasses.png': ['8-)', 'B-)', '(H)'],
-        'wink.png': [';-)', ';)'],
-        'biggrin.png': [':-D', ':D'],
-        'unhappy.png': [':-(', ':('],
-        'cry.png': [":'-(", ":'(", ';-(', ';(', ";'-("],
-        'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'],
-        'blush.png': [':-$', ':$'],
-        'angry.png': [':-@', ':@'],
-        'bat.png': [':-[', ':['],
-        'kiss.png': [':-{}', ':-*', ':*', '(K)'],
-        'stare.png': [':-|', ':|'],
-        'devil.png': [']:->', '>:-)', '>:)', '(6)'],
-        'tongue.png': [':-P', ':P', ':-þ', ':þ'],
-        'oh.png': ['=-O', ':-O', ':O'],
-        'heart.png': ['<3', '(L)', '*IN LOVE*'],
-        'lion.png': [':3', '>:3'],
-        'pussy.png': ['(@)', '=^.^='],
-        'cuffs.png': ['(%)'],
-        'moon.png': ['(S)'],
-        'lamp.png': ['(I)'],
-        'music.png': ['(8)'],
-        'beer.png': ['(B)', '*DRINK*'],
-        'brflower.png': ['(W)'],
-        'boy.png': ['(Z)'],
-        'girl.png': ['(X)'],
-        'mail.png': ['(E)'],
-        'thumbdown.png': ['(N)'],
-        'photo.png': ['(P)'],
-        'thumbup.png': ['(Y)', '*THUMBS UP*'],
-        'hugleft.png': ['(})'],
-        'brheart.png': ['</3', '(U)'],
-        'flower.png': ['@}->--', '(F)'],
-        'drink.png': ['(D)'],
-        'phone.png': ['(T)'],
-        'coffee.png': ['(C)'],
-        'hugright.png': ['({)'],
-        'star.png': ['(*)'],
-        'rainbow.png': ['(R)'],
-        'puke.png': [':-!'],
-}
+from collections import OrderedDict
+
+emoticons = OrderedDict((
+    ('smile.png', [':-)', ':)']),
+    ('coolglasses.png', ['8-)', 'B-)', '(H)']),
+    ('wink.png', [';-)', ';)']),
+    ('biggrin.png', [':-D', ':D']),
+    ('unhappy.png', [':-(', ':(']),
+    ('cry.png', [":'-(", ":'(", ';-(', ';(', ";'-("]),
+    ('frowning.png', [':-/', ':/', ':-\\', ':\\', ':-S', ':S']),
+    ('blush.png', [':-$', ':$']),
+    ('angry.png', [':-@', ':@']),
+    ('bat.png', [':-[', ':[']),
+    ('kiss.png', [':-{}', ':-*', ':*', '(K)']),
+    ('stare.png', [':-|', ':|']),
+    ('devil.png', [']:->', '>:-)', '>:)', '(6)']),
+    ('tongue.png', [':-P', ':P', ':-þ', ':þ']),
+    ('oh.png', ['=-O', ':-O', ':O']),
+    ('heart.png', ['<3', '(L)', '*IN LOVE*']),
+    ('lion.png', [':3', '>:3']),
+    ('pussy.png', ['(@)', '=^.^=']),
+    ('cuffs.png', ['(%)']),
+    ('moon.png', ['(S)']),
+    ('lamp.png', ['(I)']),
+    ('music.png', ['(8)']),
+    ('beer.png', ['(B)', '*DRINK*']),
+    ('brflower.png', ['(W)']),
+    ('boy.png', ['(Z)']),
+    ('girl.png', ['(X)']),
+    ('mail.png', ['(E)']),
+    ('thumbdown.png', ['(N)']),
+    ('photo.png', ['(P)']),
+    ('thumbup.png', ['(Y)', '*THUMBS UP*']),
+    ('hugleft.png', ['(})']),
+    ('brheart.png', ['</3', '(U)']),
+    ('flower.png', ['@}->--', '(F)']),
+    ('drink.png', ['(D)']),
+    ('phone.png', ['(T)']),
+    ('coffee.png', ['(C)']),
+    ('hugright.png', ['({)']),
+    ('star.png', ['(*)']),
+    ('rainbow.png', ['(R)']),
+    ('puke.png', [':-!']),
+))
diff --git a/data/emoticons/static/emoticons.py b/data/emoticons/static/emoticons.py
index 8ed1da834..ba51e1852 100644
--- a/data/emoticons/static/emoticons.py
+++ b/data/emoticons/static/emoticons.py
@@ -1,43 +1,45 @@
 # coding=utf-8
-emoticons = {
-        'smile.png': [':-)', ':)'],
-        'coolglasses.png': ['8-)', 'B-)', '(H)'],
-        'wink.png': [';-)', ';)'],
-        'biggrin.png': [':-D', ':D'],
-        'unhappy.png': [':-(', ':('],
-        'cry.png': [":'-(", ":'(", ';-(', ';(', ";'-("],
-        'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'],
-        'blush.png': [':-$', ':$'],
-        'angry.png': [':-@', ':@'],
-        'bat.png': [':-[', ':['],
-        'kiss.png': [':-{}', ':-*', ':*', '(K)'],
-        'stare.png': [':-|', ':|'],
-        'devil.png': [']:->', '>:-)', '>:)', '(6)'],
-        'tongue.png': [':-P', ':P', ':-þ', ':þ'],
-        'oh.png': ['=-O', ':-O', ':O'],
-        'heart.png': ['<3', '(L)', '*IN LOVE*'],
-        'lion.png': [':3', '>:3'],
-        'pussy.png': ['(@)', '=^.^='],
-        'cuffs.png': ['(%)'],
-        'moon.png': ['(S)'],
-        'lamp.png': ['(I)'],
-        'music.png': ['(8)'],
-        'beer.png': ['(B)', '*DRINK*'],
-        'brflower.png': ['(W)'],
-        'boy.png': ['(Z)'],
-        'girl.png': ['(X)'],
-        'mail.png': ['(E)'],
-        'thumbdown.png': ['(N)'],
-        'photo.png': ['(P)'],
-        'thumbup.png': ['(Y)', '*THUMBS UP*'],
-        'hugleft.png': ['(})'],
-        'brheart.png': ['</3', '(U)'],
-        'flower.png': ['@}->--', '(F)'],
-        'drink.png': ['(D)'],
-        'phone.png': ['(T)'],
-        'coffee.png': ['(C)'],
-        'hugright.png': ['({)'],
-        'star.png': ['(*)'],
-        'rainbow.png': ['(R)'],
-        'puke.png': [':-!'],
-}
+from collections import OrderedDict
+
+emoticons = OrderedDict((
+    ('smile.png', [':-)', ':)']),
+    ('coolglasses.png', ['8-)', 'B-)', '(H)']),
+    ('wink.png', [';-)', ';)']),
+    ('biggrin.png', [':-D', ':D']),
+    ('unhappy.png', [':-(', ':(']),
+    ('cry.png', [":'-(", ":'(", ';-(', ';(', ";'-("]),
+    ('frowning.png', [':-/', ':/', ':-\\', ':\\', ':-S', ':S']),
+    ('blush.png', [':-$', ':$']),
+    ('angry.png', [':-@', ':@']),
+    ('bat.png', [':-[', ':[']),
+    ('kiss.png', [':-{}', ':-*', ':*', '(K)']),
+    ('stare.png', [':-|', ':|']),
+    ('devil.png', [']:->', '>:-)', '>:)', '(6)']),
+    ('tongue.png', [':-P', ':P', ':-þ', ':þ']),
+    ('oh.png', ['=-O', ':-O', ':O']),
+    ('heart.png', ['<3', '(L)', '*IN LOVE*']),
+    ('lion.png', [':3', '>:3']),
+    ('pussy.png', ['(@)', '=^.^=']),
+    ('cuffs.png', ['(%)']),
+    ('moon.png', ['(S)']),
+    ('lamp.png', ['(I)']),
+    ('music.png', ['(8)']),
+    ('beer.png', ['(B)', '*DRINK*']),
+    ('brflower.png', ['(W)']),
+    ('boy.png', ['(Z)']),
+    ('girl.png', ['(X)']),
+    ('mail.png', ['(E)']),
+    ('thumbdown.png', ['(N)']),
+    ('photo.png', ['(P)']),
+    ('thumbup.png', ['(Y)', '*THUMBS UP*']),
+    ('hugleft.png', ['(})']),
+    ('brheart.png', ['</3', '(U)']),
+    ('flower.png', ['@}->--', '(F)']),
+    ('drink.png', ['(D)']),
+    ('phone.png', ['(T)']),
+    ('coffee.png', ['(C)']),
+    ('hugright.png', ['({)']),
+    ('star.png', ['(*)']),
+    ('rainbow.png', ['(R)']),
+    ('puke.png', [':-!']),
+))
diff --git a/data/emoticons/tango/emoticons.py b/data/emoticons/tango/emoticons.py
index db3376b93..3773ec32b 100644
--- a/data/emoticons/tango/emoticons.py
+++ b/data/emoticons/tango/emoticons.py
@@ -1,52 +1,54 @@
 # coding=utf-8
-emoticons = {
-        'angel.png': ['O:-)', 'o:-)', '0:-)'],
-        'curl-lip.png': [':-)', ':)', '=)'],
-        'sarcastic.png': [';D', ';-D'],
-        'sad.png': [':-(', ':(', '=('],
-        'wink.png': [';-)', ';)'],
-        'tongue.png': [':-P', ':P', ':-p', ':p'],
-        'glasses-cool': ['8-)', 'B-)', '(H)'],
-        'laugh.png': [':-D', ':D'],
-        'embarrassed.png': [':-[', ':['],
-        'shout.png': ['=-O', ':-O', ':O'],
-        'kiss.png': [':-{}', ':-*', ':*', '(K)'],
-        'crying.png': [":'-(", ":'(", ';-(', ';(', ";'-("],
-        'shut-mouth': [':-X'],
-        'hypnotized.png': ['%)', '%-)'],
-        'freaked-out.png': [':o'],
-        'thinking.png': [':-|', ':|'],
-        'arrogant.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'],
-        'devil.png': [':->', ']:->', '>:-)', '>:)', '(6)'],
-        'musical-note.png': ['[:-}'],
-        'sick.png': [':-!'],
-        'giggle.png': ['*JOKINGLY*'],
-        'cute.png': ['*KISSED*'],
-        'sleepy.png': ['*TIRED*'],
-        'terror.png': ['*STOP*'],
-        'handshake.png': ['*KISSING*'],
-        'rose.png': ['@}->--', '(F)'],
-        'good.png': ['(Y)', '*THUMBS UP*'],
-        'beer.png': ['(B)', '*DRINK*'],
-        'love.png': ['<3', '(L)', '*IN LOVE*'],
-        'bomb.png': ['@='],
-        'question.png': ['*HELP*'],
-        'cowboy.png': ['\m/'],
-        'fingers-crossed.png': ['*OK*'],
-        'alien.png': ['*WASSUP*'],
-        'disapointed.png': ['*SORRY*'],
-        'clap.png': ['*BRAVO*'],
-        'rotfl.png': ['*ROFL*'],
-        'dont-know.png': ['*PARDON*'],
-        'confused.png': ['*NO*'],
-        'silly.png': ['*CRAZY*'],
-        'doh.png': ['*DONT_KNOW*'],
-        'party.png': ['*DANCE*'],
-        'dance.png': ['*YAHOO*'],
-        'victory.png': ['*HI*'],
-        'go-away.png': ['*BYE*'],
-        'smirk.png': ['*YES*'],
-        'pissed-off.png': ['*WALL*'],
-        'mail.png': ['*WRITE*', '(E)'],
-        'tremble.png': ['*SCRATCH*'],
-}
+from collections import OrderedDict
+
+emoticons = OrderedDict((
+    ('angel.png', ['O:-)', 'o:-)', '0:-)']),
+    ('curl-lip.png', [':-)', ':)', '=)']),
+    ('sarcastic.png', [';D', ';-D']),
+    ('sad.png', [':-(', ':(', '=(']),
+    ('wink.png', [';-)', ';)']),
+    ('tongue.png', [':-P', ':P', ':-p', ':p']),
+    ('glasses-cool', ['8-)', 'B-)', '(H)']),
+    ('laugh.png', [':-D', ':D']),
+    ('embarrassed.png', [':-[', ':[']),
+    ('shout.png', ['=-O', ':-O', ':O']),
+    ('kiss.png', [':-{}', ':-*', ':*', '(K)']),
+    ('crying.png', [":'-(", ":'(", ';-(', ';(', ";'-("]),
+    ('shut-mouth', [':-X']),
+    ('hypnotized.png', ['%)', '%-)']),
+    ('freaked-out.png', [':o']),
+    ('thinking.png', [':-|', ':|']),
+    ('arrogant.png', [':-/', ':/', ':-\\', ':\\', ':-S', ':S']),
+    ('devil.png', [':->', ']:->', '>:-)', '>:)', '(6)']),
+    ('musical-note.png', ['[:-}']),
+    ('sick.png', [':-!']),
+    ('giggle.png', ['*JOKINGLY*']),
+    ('cute.png', ['*KISSED*']),
+    ('sleepy.png', ['*TIRED*']),
+    ('terror.png', ['*STOP*']),
+    ('handshake.png', ['*KISSING*']),
+    ('rose.png', ['@}->--', '(F)']),
+    ('good.png', ['(Y)', '*THUMBS UP*']),
+    ('beer.png', ['(B)', '*DRINK*']),
+    ('love.png', ['<3', '(L)', '*IN LOVE*']),
+    ('bomb.png', ['@=']),
+    ('question.png', ['*HELP*']),
+    ('cowboy.png', ['\m/']),
+    ('fingers-crossed.png', ['*OK*']),
+    ('alien.png', ['*WASSUP*']),
+    ('disapointed.png', ['*SORRY*']),
+    ('clap.png', ['*BRAVO*']),
+    ('rotfl.png', ['*ROFL*']),
+    ('dont-know.png', ['*PARDON*']),
+    ('confused.png', ['*NO*']),
+    ('silly.png', ['*CRAZY*']),
+    ('doh.png', ['*DONT_KNOW*']),
+    ('party.png', ['*DANCE*']),
+    ('dance.png', ['*YAHOO*']),
+    ('victory.png', ['*HI*']),
+    ('go-away.png', ['*BYE*']),
+    ('smirk.png', ['*YES*']),
+    ('pissed-off.png', ['*WALL*']),
+    ('mail.png', ['*WRITE*', '(E)']),
+    ('tremble.png', ['*SCRATCH*']),
+))