From 0d05068f911adf619522b67c49c7a1fe24ecf70c Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Sat, 24 Mar 2012 11:21:58 +1300 Subject: Factor out content view apparatus into contentview.py --- libmproxy/console/__init__.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libmproxy/console/__init__.py') diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index 3ba555f5..fe81dc26 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -17,7 +17,7 @@ import mailcap, mimetypes, tempfile, os, subprocess, glob, time, shlex import os.path, sys import urwid from .. import controller, utils, flow -import flowlist, flowview, help, common, grideditor, palettes +import flowlist, flowview, help, common, grideditor, palettes, contentview EVENTLOG_SIZE = 500 @@ -231,7 +231,7 @@ class ConsoleState(flow.State): def __init__(self): flow.State.__init__(self) self.focus = None - self.view_body_mode = common.VIEW_BODY_PRETTY + self.view_body_mode = contentview.VIEW_CONTENT_PRETTY self.view_flow_mode = common.VIEW_FLOW_REQUEST self.last_script = "" self.last_saveload = "" @@ -679,11 +679,11 @@ class ConsoleMaster(flow.FlowMaster): def changeview(self, v): if v == "r": - self.state.view_body_mode = common.VIEW_BODY_RAW + self.state.view_body_mode = contentview.VIEW_CONTENT_RAW elif v == "h": - self.state.view_body_mode = common.VIEW_BODY_HEX + self.state.view_body_mode = contentview.VIEW_CONTENT_HEX elif v == "p": - self.state.view_body_mode = common.VIEW_BODY_PRETTY + self.state.view_body_mode = contentview.VIEW_CONTENT_PRETTY self.refresh_flow(self.currentflow) def drawscreen(self): -- cgit v1.2.3