From 5b183a188be72c7dd56957dbe8ad2f4b9ee25731 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Thu, 26 Feb 2015 12:26:00 -0600 Subject: [PATCH] changed imports to relative imports --- pystache/__init__.py | 3 +-- pystache/context.py | 2 +- pystache/defaults.py | 2 +- pystache/init.py | 6 +++--- pystache/loader.py | 6 +++--- pystache/locator.py | 4 ++-- pystache/parser.py | 4 ++-- pystache/renderengine.py | 4 ++-- pystache/renderer.py | 16 ++++++++-------- pystache/specloader.py | 2 +- 10 files changed, 24 insertions(+), 25 deletions(-) diff --git a/pystache/__init__.py b/pystache/__init__.py index 4cf24344..39877e02 100644 --- a/pystache/__init__.py +++ b/pystache/__init__.py @@ -1,4 +1,3 @@ - """ TODO: add a docstring. @@ -6,7 +5,7 @@ # We keep all initialization code in a separate module. -from pystache.init import parse, render, Renderer, TemplateSpec +from .init import parse, render, Renderer, TemplateSpec __all__ = ['parse', 'render', 'Renderer', 'TemplateSpec'] diff --git a/pystache/context.py b/pystache/context.py index 67159160..8b9d2eb6 100644 --- a/pystache/context.py +++ b/pystache/context.py @@ -14,7 +14,7 @@ """ -from pystache.common import PystacheError +from .common import PystacheError # This equals '__builtin__' in Python 2 and 'builtins' in Python 3. diff --git a/pystache/defaults.py b/pystache/defaults.py index bcfdf4cd..7f60d651 100644 --- a/pystache/defaults.py +++ b/pystache/defaults.py @@ -17,7 +17,7 @@ import os import sys -from pystache.common import MissingTags +from .common import MissingTags # How to handle encoding errors when decoding strings from str to unicode. diff --git a/pystache/init.py b/pystache/init.py index 38bb1f5a..467aa493 100644 --- a/pystache/init.py +++ b/pystache/init.py @@ -5,9 +5,9 @@ """ -from pystache.parser import parse -from pystache.renderer import Renderer -from pystache.template_spec import TemplateSpec +from .parser import parse +from .renderer import Renderer +from .template_spec import TemplateSpec def render(template, context=None, **kwargs): diff --git a/pystache/loader.py b/pystache/loader.py index d4a7e531..dc137a91 100644 --- a/pystache/loader.py +++ b/pystache/loader.py @@ -8,9 +8,9 @@ import os import sys -from pystache import common -from pystache import defaults -from pystache.locator import Locator +from . import common +from . import defaults +from .locator import Locator # We make a function so that the current defaults take effect. diff --git a/pystache/locator.py b/pystache/locator.py index 30c5b01e..b2a48d9d 100644 --- a/pystache/locator.py +++ b/pystache/locator.py @@ -9,8 +9,8 @@ import re import sys -from pystache.common import TemplateNotFoundError -from pystache import defaults +from .common import TemplateNotFoundError +from . import defaults class Locator(object): diff --git a/pystache/parser.py b/pystache/parser.py index 9a4fba23..c32b5ce9 100644 --- a/pystache/parser.py +++ b/pystache/parser.py @@ -7,8 +7,8 @@ import re -from pystache import defaults -from pystache.parsed import ParsedTemplate +from . import defaults +from .parsed import ParsedTemplate END_OF_LINE_CHARACTERS = [u'\r', u'\n'] diff --git a/pystache/renderengine.py b/pystache/renderengine.py index c797b176..39926318 100644 --- a/pystache/renderengine.py +++ b/pystache/renderengine.py @@ -7,8 +7,8 @@ import re -from pystache.common import is_string -from pystache.parser import parse +from .common import is_string +from .parser import parse def context_get(stack, name): diff --git a/pystache/renderer.py b/pystache/renderer.py index ff6a90c6..0da37558 100644 --- a/pystache/renderer.py +++ b/pystache/renderer.py @@ -7,14 +7,14 @@ import sys -from pystache import defaults -from pystache.common import TemplateNotFoundError, MissingTags, is_string -from pystache.context import ContextStack, KeyNotFoundError -from pystache.loader import Loader -from pystache.parsed import ParsedTemplate -from pystache.renderengine import context_get, RenderEngine -from pystache.specloader import SpecLoader -from pystache.template_spec import TemplateSpec +from . import defaults +from .common import TemplateNotFoundError, MissingTags, is_string +from .context import ContextStack, KeyNotFoundError +from .loader import Loader +from .parsed import ParsedTemplate +from .renderengine import context_get, RenderEngine +from .specloader import SpecLoader +from .template_spec import TemplateSpec class Renderer(object): diff --git a/pystache/specloader.py b/pystache/specloader.py index 3a77d4c5..fb14256e 100644 --- a/pystache/specloader.py +++ b/pystache/specloader.py @@ -7,7 +7,7 @@ import os.path -from pystache.loader import Loader +from .loader import Loader # TODO: add test cases for this class.