From fb22f2ff4f75783ba786935c93b75f372ede21f5 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Mon, 17 Oct 2016 17:11:21 +1300 Subject: Zap object base class --- pathod/language/base.py | 4 ++-- pathod/language/generators.py | 6 +++--- pathod/language/http.py | 2 +- pathod/language/http2.py | 2 +- pathod/language/message.py | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) (limited to 'pathod/language') diff --git a/pathod/language/base.py b/pathod/language/base.py index bdcc6d2f..4483c3df 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..6a543907 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..1f1a3db3 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..7cb82916 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..7a8594d6 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 = [] -- cgit v1.2.3 From a647b30365593a4a3056fcf6936f5441ab9eda88 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Mon, 17 Oct 2016 17:29:45 +1300 Subject: python3: clean up class brackets --- pathod/language/base.py | 4 ++-- pathod/language/generators.py | 6 +++--- pathod/language/http.py | 2 +- pathod/language/http2.py | 2 +- pathod/language/message.py | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) (limited to 'pathod/language') diff --git a/pathod/language/base.py b/pathod/language/base.py index 4483c3df..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(): +class Settings: def __init__( self, @@ -60,7 +60,7 @@ v_naked_literal = pp.MatchFirst( ) -class Token(): +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 6a543907..4e19ecd9 100644 --- a/pathod/language/generators.py +++ b/pathod/language/generators.py @@ -18,7 +18,7 @@ DATATYPES = dict( ) -class TransformGenerator(): +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(): +class RandomGenerator: def __init__(self, dtype, length): self.dtype = dtype @@ -73,7 +73,7 @@ class RandomGenerator(): return "%s random from %s" % (self.length, self.dtype) -class FileGenerator(): +class FileGenerator: def __init__(self, path): self.path = path diff --git a/pathod/language/http.py b/pathod/language/http.py index 1f1a3db3..8b5fa828 100644 --- a/pathod/language/http.py +++ b/pathod/language/http.py @@ -53,7 +53,7 @@ class Method(base.OptionsOrValue): ] -class _HeaderMixin(): +class _HeaderMixin: unique_name = None def format_header(self, key, value): diff --git a/pathod/language/http2.py b/pathod/language/http2.py index 7cb82916..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(): +class _HeaderMixin: unique_name = None def values(self, settings): diff --git a/pathod/language/message.py b/pathod/language/message.py index 7a8594d6..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(): +class Message: __metaclass__ = abc.ABCMeta logattrs = [] -- cgit v1.2.3 From c774a9fec93feedc37a450400a03b83f5f4cb4b9 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Mon, 17 Oct 2016 17:34:46 +1300 Subject: python3: clean up super and __future__ --- pathod/language/__init__.py | 1 - 1 file changed, 1 deletion(-) (limited to 'pathod/language') 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 -- cgit v1.2.3