[svn] fixed vim2pygments and the fruity file generated with it

1 files changed, 19 insertions, 16 deletions

diff --git a/pygments/styles/fruity.py b/pygments/styles/fruity.py
index 8031ce97..fff1072b 100644
--- a/pygments/styles/fruity.py
+++ b/pygments/styles/fruity.py
@@ -9,23 +9,26 @@
     :license: BSD, see LICENSE for more details.
 """
 
-from pykleur.style import Style
-from pykleur.token import Comment, Name, Keyword, Generic, Number, Operator, String
+from pygments.style import Style
+from pygments.token import Token, Comment, Name, Keyword, Generic, Number, Operator, String
 
 class FruityStyle(Style):
-    default_style = 'ffffff bg:111111'
+
+    background_color = '#111111'
+
     styles = {
-        Generic.Output:     '444444 bg:222222',
-        Keyword:            'fb660a bold',
-        Number:             '0086f7 bold',
-        Name.Tag:           'fb660a bold',
-        Comment:            '008800 bg:0f140f italic',
-        Name.Attribute:     'ff0086 bold',
-        String:             '0086d2',
-        Name.Function:      'ff0086 bold',
-        Generic.Heading:    'ffffff bold',
-        Keyword.Type:       'cdcaa9 bold',
-        Generic.Subheading: 'ffffff bold',
-        Name.Constant:      '0086d2',
-        Comment.Preproc:    'ff0007 bold'
+        Token:              '#ffffff',
+        Generic.Output:     '#444444 bg:#222222',
+        Keyword:            '#fb660a bold',
+        Number:             '#0086f7 bold',
+        Name.Tag:           '#fb660a bold',
+        Comment:            '#008800 bg:#0f140f italic',
+        Name.Attribute:     '#ff0086 bold',
+        String:             '#0086d2',
+        Name.Function:      '#ff0086 bold',
+        Generic.Heading:    '#ffffff bold',
+        Keyword.Type:       '#cdcaa9 bold',
+        Generic.Subheading: '#ffffff bold',
+        Name.Constant:      '#0086d2',
+        Comment.Preproc:    '#ff0007 bold'
     }