6 Commits

Author	SHA1	Message	Date
Jim Shaver	b51363b3ca	Merge remote-tracking branch 'upstream/master' into print-bracket-fix ... Conflicts: examples/har_extractor.py examples/nonblocking.py examples/read_dumpfile libmproxy/web/app.py	2015-05-31 01:21:44 -04:00
Jim Shaver	4fe2c069cc	Fixed print function to be inline with python 3	2015-05-29 23:17:48 -04:00
Aldo Cortesi	a05a70d816	Add coding style check, reformat.	2015-05-30 12:03:28 +12:00
Aldo Cortesi	d998790c2f	Clean up and clarify StateObject ... - Flatten the class hierarchy - get_state, load_state, from_state are public - Simplify code - Remove __eq__ and __neq__. This fundamentally changes the semantics of inherited objects in a way that's not part of the core function of the class	2014-09-17 11:41:42 +12:00
Maximilian Hils	ebd539b49f	update examples, fix #353	2014-09-08 17:03:34 +02:00
Maximilian Hils	a17a53269d	fix #253	2014-05-15 14:37:05 +02:00