From 419ca85e625bc13d8934998e3f311d3f05e00ecd Mon Sep 17 00:00:00 2001 From: Jakub Roztocil Date: Sat, 14 Feb 2015 18:18:04 +0100 Subject: [PATCH] The default color --style is now "fruity" It's experimental - please let me know should you dislike this change. To make Solarized default again, add this to your ~/.config.json: "default_options": [ "--style=solarized" ], --- README.rst | 1 + httpie/output/formatters/colors.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index b72a8427..def1158d 100644 --- a/README.rst +++ b/README.rst @@ -1314,6 +1314,7 @@ Changelog *You can click a version name to see a diff with the previous one.* * `1.0.0-dev`_ + * The default color ``--style`` is now ``fruity`` (was ``solarized``). * Changed the default JSON ``Content-Type`` from ``application/json; charset=utf-8`` to ``application/json`` as UTF-8 is the default encoding for JSON. diff --git a/httpie/output/formatters/colors.py b/httpie/output/formatters/colors.py index 667ae91a..1fe1c413 100644 --- a/httpie/output/formatters/colors.py +++ b/httpie/output/formatters/colors.py @@ -7,7 +7,6 @@ from pygments.formatters.terminal import TerminalFormatter from pygments.formatters.terminal256 import Terminal256Formatter from pygments.util import ClassNotFound -from httpie.compat import is_windows from httpie.plugins import FormatterPlugin @@ -15,7 +14,7 @@ from httpie.plugins import FormatterPlugin # great and fruity seems to give the best result there. AVAILABLE_STYLES = set(pygments.styles.STYLE_MAP.keys()) AVAILABLE_STYLES.add('solarized') -DEFAULT_STYLE = 'solarized' if not is_windows else 'fruity' +DEFAULT_STYLE = 'fruity' class ColorFormatter(FormatterPlugin): @@ -144,6 +143,8 @@ class HTTPLexer(pygments.lexer.RegexLexer): } +# TODO: As Solarized is not the default theme any longer, it should be removed +# or bundled directly with Pygments so that we don't need to support it. class Solarized256Style(pygments.style.Style): """ solarized256