Remove manipulation of paths and environments

fallback to sys.prefix if GRAPHITE_ROOT is not set, instead of the directory above
the location where the binaries are installed.

Author: piotr1212

.gitignore

@@ -14,3 +14,5 @@ storage
 _trial_temp
 htmlcov
 *.swp
+lib/twisted/plugins/dropin.cache
+lib/carbon.egg-info/

bin/carbon-aggregator-cache.py

@@ -13,18 +13,6 @@
 See the License for the specific language governing permissions and
 limitations under the License."""
 
-import sys
-import os.path
-
-# Figure out where we're installed
-BIN_DIR = os.path.dirname(os.path.abspath(__file__))
-ROOT_DIR = os.path.dirname(BIN_DIR)
-
-# Make sure that carbon's 'lib' dir is in the $PYTHONPATH if we're running from
-# source.
-LIB_DIR = os.path.join(ROOT_DIR, "lib")
-sys.path.insert(0, LIB_DIR)
-
 from carbon.util import run_twistd_plugin  # noqa
 from carbon.exceptions import CarbonConfigException  # noqa
 

bin/carbon-aggregator.py

@@ -13,18 +13,6 @@
 See the License for the specific language governing permissions and
 limitations under the License."""
 
-import sys
-import os.path
-
-# Figure out where we're installed
-BIN_DIR = os.path.dirname(os.path.abspath(__file__))
-ROOT_DIR = os.path.dirname(BIN_DIR)
-
-# Make sure that carbon's 'lib' dir is in the $PYTHONPATH if we're running from
-# source.
-LIB_DIR = os.path.join(ROOT_DIR, "lib")
-sys.path.insert(0, LIB_DIR)
-
 from carbon.util import run_twistd_plugin  # noqa
 from carbon.exceptions import CarbonConfigException  # noqa
 

bin/carbon-cache.py

@@ -13,18 +13,6 @@
 See the License for the specific language governing permissions and
 limitations under the License."""
 
-import sys
-import os.path
-
-# Figure out where we're installed
-BIN_DIR = os.path.dirname(os.path.abspath(__file__))
-ROOT_DIR = os.path.dirname(BIN_DIR)
-
-# Make sure that carbon's 'lib' dir is in the $PYTHONPATH if we're running from
-# source.
-LIB_DIR = os.path.join(ROOT_DIR, "lib")
-sys.path.insert(0, LIB_DIR)
-
 from carbon.util import run_twistd_plugin  # noqa
 from carbon.exceptions import CarbonConfigException  # noqa
 

bin/carbon-client.py

@@ -14,20 +14,12 @@
 limitations under the License."""
 
 import sys
-from os.path import dirname, join, abspath, exists
+from os.path import join, exists
 from optparse import OptionParser
 
-# Figure out where we're installed
-BIN_DIR = dirname(abspath(__file__))
-ROOT_DIR = dirname(BIN_DIR)
-CONF_DIR = join(ROOT_DIR, 'conf')
+CONF_DIR = join(sys.prefix, 'conf')
 default_relayrules = join(CONF_DIR, 'relay-rules.conf')
 
-# Make sure that carbon's 'lib' dir is in the $PYTHONPATH if we're running from
-# source.
-LIB_DIR = join(ROOT_DIR, 'lib')
-sys.path.insert(0, LIB_DIR)
-
 try:
   from twisted.internet import epollreactor
   epollreactor.install()

bin/carbon-relay.py

@@ -13,18 +13,6 @@
 See the License for the specific language governing permissions and
 limitations under the License."""
 
-import sys
-import os.path
-
-# Figure out where we're installed
-BIN_DIR = os.path.dirname(os.path.abspath(__file__))
-ROOT_DIR = os.path.dirname(BIN_DIR)
-
-# Make sure that carbon's 'lib' dir is in the $PYTHONPATH if we're running from
-# source.
-LIB_DIR = os.path.join(ROOT_DIR, "lib")
-sys.path.insert(0, LIB_DIR)
-
 from carbon.util import run_twistd_plugin  # noqa
 from carbon.exceptions import CarbonConfigException  # noqa
 

lib/carbon/conf.py

@@ -583,8 +583,7 @@ def read_config(program, options, **kwargs):
     if graphite_root is None:
         graphite_root = os.environ.get('GRAPHITE_ROOT')
     if graphite_root is None:
-        raise CarbonConfigException("Either ROOT_DIR or GRAPHITE_ROOT "
-                                    "needs to be provided.")
+        graphite_root = sys.prefix
 
     # Default config directory to root-relative, unless overriden by the
     # 'GRAPHITE_CONF_DIR' environment variable.

lib/carbon/tests/test_conf.py

@@ -101,18 +101,6 @@ def makeFile(self, content=None, basename=None, dirname=None):
 
         return path
 
-    def test_root_dir_is_required(self):
-        """
-        At minimum, the caller must provide a 'ROOT_DIR' setting.
-        """
-        try:
-            read_config("carbon-foo", FakeOptions(config=None))
-        except CarbonConfigException as e:
-            self.assertEqual("Either ROOT_DIR or GRAPHITE_ROOT "
-                             "needs to be provided.", str(e))
-        else:
-            self.fail("Did not raise exception.")
-
     def test_config_is_not_required(self):
         """
         If the '--config' option is not provided, it defaults to

lib/carbon/util.py

@@ -9,7 +9,7 @@
   import __builtin__
 
 from hashlib import sha256
-from os.path import abspath, basename, dirname
+from os.path import basename
 import socket
 from time import sleep, time
 from twisted.python.util import initgroups
@@ -71,10 +71,6 @@ def run_twistd_plugin(filename):
     from carbon.conf import get_parser
     from twisted.scripts.twistd import ServerOptions
 
-    bin_dir = dirname(abspath(filename))
-    root_dir = dirname(bin_dir)
-    os.environ.setdefault('GRAPHITE_ROOT', root_dir)
-
     program = basename(filename).split('.')[0]
 
     # First, parse command line options as the legacy carbon scripts used to