From da7998462ff04394bb1d575c321c04b86abf69e3 Mon Sep 17 00:00:00 2001 From: Abhay Rana Date: Sat, 7 Jun 2014 10:57:48 +0530 Subject: [PATCH] Don't try to import Appindicator on TRAVIS. --- hackertray/__init__.py | 15 ++++++++------- test/chrome_test.py | 1 - 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hackertray/__init__.py b/hackertray/__init__.py index 6976694..c5563ec 100644 --- a/hackertray/__init__.py +++ b/hackertray/__init__.py @@ -9,18 +9,19 @@ if(os.environ.get('TRAVIS')!='true'): import gtk import webbrowser + + try: + import appindicator + except ImportError: + import appindicator_replacement as appindicator + + from appindicator_replacement import get_icon_filename + import json import argparse from os.path import expanduser import signal -try: - import appindicator -except ImportError: - import appindicator_replacement as appindicator - -from appindicator_replacement import get_icon_filename - ##This is to get --version to work try: import pkg_resources diff --git a/test/chrome_test.py b/test/chrome_test.py index 554f4f9..ce37e37 100644 --- a/test/chrome_test.py +++ b/test/chrome_test.py @@ -6,7 +6,6 @@ from hackertray import Chrome class ChromeTest(unittest.TestCase): def runTest(self): config_folder_path = os.getcwd()+'/test/' - print config_folder_path data = Chrome.search([ "https://github.com/", "https://news.ycombinator.com/",