From fa6f7622e06e22a3cd0693a9e6bf72cc56f0e52b Mon Sep 17 00:00:00 2001
From: Thomas Scholtes <thomas-scholtes@gmx.de>
Date: Sun, 23 Feb 2014 22:16:59 +0100
Subject: [PATCH] Move completion into beets.ui package and use pkg_resources

---
 beets/ui/commands.py              | 2 +-
 beets/{ => ui}/completion.py      | 6 ++----
 beets/{ => ui}/completion_base.sh | 0
 3 files changed, 3 insertions(+), 5 deletions(-)
 rename beets/{ => ui}/completion.py (90%)
 rename beets/{ => ui}/completion_base.sh (100%)

diff --git a/beets/ui/commands.py b/beets/ui/commands.py
index 9572dcb70..42b06c5d5 100644
--- a/beets/ui/commands.py
+++ b/beets/ui/commands.py
@@ -37,7 +37,7 @@ from beets.util import syspath, normpath, ancestry, displayable_path
 from beets.util.functemplate import Template
 from beets import library
 from beets import config
-from beets.completion import completion_script
+from beets.ui.completion import completion_script
 
 # Global logger.
 log = logging.getLogger('beets')
diff --git a/beets/completion.py b/beets/ui/completion.py
similarity index 90%
rename from beets/completion.py
rename to beets/ui/completion.py
index e06e52eda..8714b4a44 100644
--- a/beets/completion.py
+++ b/beets/ui/completion.py
@@ -1,9 +1,7 @@
-import os.path
+from pkg_resources import resource_string
 
 def completion_script(commands):
-    base_script = os.path.join(os.path.dirname(__file__), 'completion_base.sh')
-    for line in  open(base_script, 'r'):
-        yield line
+    yield resource_string(__name__, 'completion_base.sh')
 
     options = {}
     aliases = {}
diff --git a/beets/completion_base.sh b/beets/ui/completion_base.sh
similarity index 100%
rename from beets/completion_base.sh
rename to beets/ui/completion_base.sh