From 84a89c75011d7f4c842c9f91d5f6b9909df39588 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Sat, 11 Oct 2014 17:00:59 +0100 Subject: [PATCH] Fix imports errors caused by previous commit. Signed-off-by: Stephen Finucane --- ctagsplugin.py | 3 +-- test_ctags.py | 5 ++++- test_ctagsplugin.py | 8 ++++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ctagsplugin.py b/ctagsplugin.py index 8274cfa..260fa02 100644 --- a/ctagsplugin.py +++ b/ctagsplugin.py @@ -5,6 +5,7 @@ import functools import codecs import locale +import sys import os import pprint import re @@ -21,8 +22,6 @@ import sublime_plugin from sublime import status_message, error_message except ImportError: # running tests - import sys - from tests.sublime_fake import sublime from tests.sublime_fake import sublime_plugin diff --git a/test_ctags.py b/test_ctags.py index 9b7233e..6f07d53 100644 --- a/test_ctags.py +++ b/test_ctags.py @@ -13,7 +13,10 @@ else: import unittest -import ctags +if sys.version_info < (3, 0): + import ctags +else: + from CTags import ctags class CTagsTest(unittest.TestCase): # diff --git a/test_ctagsplugin.py b/test_ctagsplugin.py index f393ece..4dea05a 100644 --- a/test_ctagsplugin.py +++ b/test_ctagsplugin.py @@ -12,8 +12,12 @@ else: import unittest -import ctags -import ctagsplugin +if sys.version_info < (3, 0): + import ctags + import ctagsplugin +else: + from CTags import ctags + from CTags import ctagsplugin class CTagsPluginTest(unittest.TestCase): """