diff options
| author | Aldo Cortesi <aldo@corte.si> | 2016-10-17 18:21:23 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-17 18:21:23 +1300 |
| commit | 00071238d2e79ff91132b7e5a3bcc8019d9191ec (patch) | |
| tree | 507c346e8f8c605d428140274678fced2e6bbc16 /pathod/language | |
| parent | 666c59cbfbcbd28062c201c3cb5d6cb928e90aee (diff) | |
| parent | c774a9fec93feedc37a450400a03b83f5f4cb4b9 (diff) | |
| download | mitmproxy-00071238d2e79ff91132b7e5a3bcc8019d9191ec.tar.gz mitmproxy-00071238d2e79ff91132b7e5a3bcc8019d9191ec.tar.bz2 mitmproxy-00071238d2e79ff91132b7e5a3bcc8019d9191ec.zip | |
Merge pull request #1617 from cortesi/object
python3
Diffstat (limited to 'pathod/language')
| -rw-r--r-- | pathod/language/__init__.py | 1 | ||||
| -rw-r--r-- | pathod/language/base.py | 4 | ||||
| -rw-r--r-- | pathod/language/generators.py | 6 | ||||
| -rw-r--r-- | pathod/language/http.py | 2 | ||||
| -rw-r--r-- | pathod/language/http2.py | 2 | ||||
| -rw-r--r-- | pathod/language/message.py | 2 |
6 files changed, 8 insertions, 9 deletions
diff --git a/pathod/language/__init__.py b/pathod/language/__init__.py index 15c2895b..b7897ed2 100644 --- a/pathod/language/__init__.py +++ b/pathod/language/__init__.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import itertools import time diff --git a/pathod/language/base.py b/pathod/language/base.py index bdcc6d2f..11f0899d 100644 --- a/pathod/language/base.py +++ b/pathod/language/base.py @@ -10,7 +10,7 @@ from netlib import human from . import generators, exceptions -class Settings(object): +class Settings: def __init__( self, @@ -60,7 +60,7 @@ v_naked_literal = pp.MatchFirst( ) -class Token(object): +class Token: """ A token in the specification language. Tokens are immutable. The token diff --git a/pathod/language/generators.py b/pathod/language/generators.py index 4040e099..4e19ecd9 100644 --- a/pathod/language/generators.py +++ b/pathod/language/generators.py @@ -18,7 +18,7 @@ DATATYPES = dict( ) -class TransformGenerator(object): +class TransformGenerator: """ Perform a byte-by-byte transform another generator - that is, for each @@ -54,7 +54,7 @@ def rand_byte(chars): return bytes([random.choice(chars)]) -class RandomGenerator(object): +class RandomGenerator: def __init__(self, dtype, length): self.dtype = dtype @@ -73,7 +73,7 @@ class RandomGenerator(object): return "%s random from %s" % (self.length, self.dtype) -class FileGenerator(object): +class FileGenerator: def __init__(self, path): self.path = path diff --git a/pathod/language/http.py b/pathod/language/http.py index 46027ca3..8b5fa828 100644 --- a/pathod/language/http.py +++ b/pathod/language/http.py @@ -53,7 +53,7 @@ class Method(base.OptionsOrValue): ] -class _HeaderMixin(object): +class _HeaderMixin: unique_name = None def format_header(self, key, value): diff --git a/pathod/language/http2.py b/pathod/language/http2.py index 519ee699..35fc5ba8 100644 --- a/pathod/language/http2.py +++ b/pathod/language/http2.py @@ -40,7 +40,7 @@ def get_header(val, headers): return None -class _HeaderMixin(object): +class _HeaderMixin: unique_name = None def values(self, settings): diff --git a/pathod/language/message.py b/pathod/language/message.py index fea4f4de..03b4a2cf 100644 --- a/pathod/language/message.py +++ b/pathod/language/message.py @@ -5,7 +5,7 @@ from netlib import strutils LOG_TRUNCATE = 1024 -class Message(object): +class Message: __metaclass__ = abc.ABCMeta logattrs = [] |