From 201bbafc647595b33cde31ba988d5d61a5545b9c Mon Sep 17 00:00:00 2001 From: Sam Birch Date: Wed, 23 Jul 2014 23:34:32 -0400 Subject: Addressed changes --- pushover.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pushover.py b/pushover.py index 2284c7a..8b840df 100644 --- a/pushover.py +++ b/pushover.py @@ -12,6 +12,8 @@ A typical use of the module looks like this:: import requests import time +from ConfigParser import RawConfigParser +import os __all__ = ["init", "get_sounds", "Client", "MessageRequest", "InitError", "RequestError", "get_client"] @@ -226,24 +228,23 @@ def get_client(profile=None, config_path='~/.pushover'): * ``profile``: the profile to load as a client (`Default` by default.) * ``config_path``: path of the configuration file (`~/.pushover` by default.) """ - import ConfigParser - import os + config_path = os.path.expanduser(config_path) if not os.path.exists(config_path): - raise Exception("Configuration file not found ({0})".format(config_path)) + raise IOError(2, "No such file", config_path) - config = ConfigParser.RawConfigParser() + config = RawConfigParser({"device": None}) config.read(config_path) - section = profile if profile is not None else 'Default' + section = profile or 'Default' init(config.get(section, 'api_token'), sound=False) return Client( config.get(section, 'user_key'), - device=config.get(section, 'device') if config.has_option(section, 'device') else None + device=config.get(section, 'device') ) -- cgit v1.2.3-70-g09d2