Issue #7: fix for path to marionette.conf

marionette-tg · May 27, 2015 · 2fec179 · 2fec179
1 parent ca7a980
commit 2fec179
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,6 +12,4 @@ python:
 install:
   - "pip install -r requirements.txt"
 script: 
-  - echo 'pwd'
-  - cd $TRAVIS_BUILD_DIR/kpdyer/marionette
   - "python setup.py test"
diff --git a/marionette_tg/conf.py b/marionette_tg/conf.py
@@ -3,15 +3,15 @@
 
 import os
 import sys
-import site
 
 import ConfigParser
 
 def find_conf_file():
     search_dirs = [sys.prefix,
                    '/etc',
                    '.',
-                  ] + site.getsitepackages()
+                   os.path.dirname(__file__),
+                  ]
     for dir in search_dirs:
         conf_path = os.path.join(dir, 'marionette.conf')
         if os.path.exists(conf_path):

diff --git a/setup.py b/setup.py
@@ -10,7 +10,7 @@
       package_data={'marionette_tg': ['marionette.conf','formats/*.mar']},
       include_package_data=True,
       install_requires=['importlib','twisted','fte','regex2dfa','ply'],
-      version='0.0.1-5',
+      version='0.0.1-6',
       description='Marionette',
       long_description='The polymorphic, programmable proxy.',
       author='Kevin P. Dyer',