diff options
Diffstat (limited to 'pathod/language')
-rw-r--r-- | pathod/language/__init__.py | 5 | ||||
-rw-r--r-- | pathod/language/base.py | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pathod/language/__init__.py b/pathod/language/__init__.py index 32199e08..e27452dd 100644 --- a/pathod/language/__init__.py +++ b/pathod/language/__init__.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import + import itertools import time @@ -5,8 +7,7 @@ import pyparsing as pp from . import http, http2, websockets, writer, exceptions -from exceptions import * -from base import Settings +from .base import Settings assert Settings # prevent pyflakes from messing with this diff --git a/pathod/language/base.py b/pathod/language/base.py index a4302998..c53e6b20 100644 --- a/pathod/language/base.py +++ b/pathod/language/base.py @@ -3,9 +3,12 @@ import os import abc import pyparsing as pp +from six.moves import reduce + from .. import utils from . import generators, exceptions + class Settings(object): def __init__( @@ -105,7 +108,7 @@ class Token(object): class _TokValueLiteral(Token): def __init__(self, val): - self.val = val.decode("string_escape") + self.val = val def get_generator(self, settings_): return self.val |