summaryrefslogtreecommitdiff
path: root/src/config.py
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2015-02-10 17:40:53 +0100
committermathieui <mathieui@mathieui.net>2015-02-10 21:08:36 +0100
commit14b58c528e630ad8528099525f59e896a1cdaec2 (patch)
treee63447f6c4b346e536e07aa08e2c21b7cfdd44d1 /src/config.py
parentc38cddd0ff0fb6e23538131e0d844cf159852c73 (diff)
downloadpoezio-14b58c528e630ad8528099525f59e896a1cdaec2.tar.gz
poezio-14b58c528e630ad8528099525f59e896a1cdaec2.tar.bz2
poezio-14b58c528e630ad8528099525f59e896a1cdaec2.tar.xz
poezio-14b58c528e630ad8528099525f59e896a1cdaec2.zip
Update setup files
- remove “make uninstall” target which was broken a long time ago - move very install action to the setup.py (alias “make install” to “python setup.py install” - add some stuff to “make clean” - update the config.py to search the default config file using pkg_resources (more reliable than dirname(__file__)) - install the html doc only if available - use README.rst for the setup.py long_description - also, update the copyright notice to 2015
Diffstat (limited to 'src/config.py')
-rw-r--r--src/config.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/config.py b/src/config.py
index 43b88c98..2980e50b 100644
--- a/src/config.py
+++ b/src/config.py
@@ -15,6 +15,7 @@ DEFSECTION = "Poezio"
import logging.config
import os
import sys
+import pkg_resources
from gettext import gettext as _
from configparser import RawConfigParser, NoOptionError, NoSectionError
@@ -527,9 +528,8 @@ def run_cmdline_args(CONFIG_PATH):
# Copy a default file if none exists
if not path.isfile(options.filename):
- default = path.join(path.dirname(__file__),
- '../data/default_config.cfg')
- other = path.join(path.dirname(__file__), 'default_config.cfg')
+ default = path.join(path.dirname(__file__), '../data/default_config.cfg')
+ other = pkg_resources.resource_filename('poezio', 'default_config.cfg')
if path.isfile(default):
copy2(default, options.filename)
elif path.isfile(other):