distribute sample-config and make locatable

thomasballinger · thomasballinger · commit 02c2412e3b6e · 2015-01-22T22:16:49.000-05:00
fixes bpython#456
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -2,18 +2,15 @@ include .pycheckrc
 include AUTHORS
 include CHANGELOG
 include LICENSE
-include data/bpython
+include data/bpython.png
 include data/bpython.desktop
 include data/bpython.appdata.xml
 include doc/sphinx/source/conf.py
 include doc/sphinx/source/*.rst
 include doc/sphinx/source/logo.png
-include sample-config
 include *.theme
-include bpython/logo.png
-include ROADMAP
-include TODO
 include bpython/test/*.py
 include bpython/test/*.theme
 include bpython/translations/*/LC_MESSAGES/bpython.po
 include bpython/translations/*/LC_MESSAGES/bpython.mo
+include bpython/sample-config
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -23,10 +23,10 @@
 
 from __future__ import with_statement
 import code
-import codecs
 import errno
 import inspect
 import os
+import pkgutil
 import pydoc
 import requests
 import shlex
@@ -952,10 +952,8 @@ def edit_config(self):
         if not (os.path.isfile(self.config.config_path)):
             if self.interact.confirm(_("Config file does not exist - create new from default? (y/N)")):
                 try:
+                    default_config = pkgutil.get_data('bpython', 'sample-config')
                     bpython_dir, script_name = os.path.split(__file__)
-                    with open(os.path.join(bpython_dir, "sample-config")) as f:
-                        default_config = f.read()
-
                     containing_dir = os.path.dirname(os.path.abspath(self.config.config_path))
                     if not os.path.exists(containing_dir):
                         os.makedirs(containing_dir)
