Skip to content

Commit 0659971

Browse files
dschepdschep
committed
actually yapfify
1 parent 4b3c230 commit 0659971

18 files changed

Lines changed: 134 additions & 140 deletions

‎ntfy/__init__.py‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@
88

99
__version__ = '2.4.3'
1010

11-
1211
_user_home = path.expanduser('~')
1312
_cwd = getcwd()
1413
if name != 'nt' and _cwd.startswith(_user_home):
15-
default_title = '{}@{}:{}'.format(getuser(), gethostname(),
16-
path.join('~', _cwd[len(_user_home)+1:]))
14+
default_title = '{}@{}:{}'.format(getuser(),
15+
gethostname(),
16+
path.join('~',
17+
_cwd[len(_user_home) + 1:]))
1718
else:
1819
default_title = '{}@{}:{}'.format(getuser(), gethostname(), _cwd)
1920

@@ -34,8 +35,8 @@ def notify(message, title, config=None, **kwargs):
3435
backend = backend_config.pop('backend')
3536

3637
if title is None:
37-
title = backend_config.pop('title', config.get('title',
38-
default_title))
38+
title = backend_config.pop('title',
39+
config.get('title', default_title))
3940
elif 'title' in backend_config:
4041
del backend_config['title']
4142

@@ -48,8 +49,11 @@ def notify(message, title, config=None, **kwargs):
4849
continue
4950

5051
try:
51-
notify_ret = notifier.notify(message=message, title=title,
52-
retcode=retcode, **backend_config)
52+
notify_ret = notifier.notify(
53+
message=message,
54+
title=title,
55+
retcode=retcode,
56+
**backend_config)
5357
if notify_ret:
5458
ret = notify_ret
5559
except (SystemExit, KeyboardInterrupt):

‎ntfy/backends/insta.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ def notify(title, message, event_name, appid, secret, trackers, retcode=None):
3131
if len(msgs) != len(trackers):
3232
logger.error(('Wrong number of messages! There are {} trackers so you '
3333
'have to provide {} messages. Remember to separate each '
34-
'message with \':\' (example: send "msg1:msg2")'
35-
).format(len(trackers), len(trackers)))
34+
'message with \':\' (example: send "msg1:msg2")').format(
35+
len(trackers), len(trackers)))
3636
raise WrongMessageCountException()
3737

3838
to_send = {}

‎ntfy/backends/linux.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ def notify(title, message, icon=icon.png, urgency=None, retcode=0):
2525
bus = dbus.SessionBus()
2626
dbus_obj = bus.get_object('org.freedesktop.Notifications',
2727
'/org/freedesktop/Notifications')
28-
dbus_iface = dbus.Interface(dbus_obj,
29-
dbus_interface='org.freedesktop.Notifications')
28+
dbus_iface = dbus.Interface(
29+
dbus_obj, dbus_interface='org.freedesktop.Notifications')
3030

3131
hints = {}
3232

@@ -42,5 +42,5 @@ def notify(title, message, icon=icon.png, urgency=None, retcode=0):
4242
hints = {'urgency': dbus.Byte(2)}
4343

4444
message = message.replace('&', '&')
45-
dbus_iface.Notify('ntfy', 0, path.abspath(icon), title, message, [], hints,
46-
-1)
45+
dbus_iface.Notify('ntfy', 0,
46+
path.abspath(icon), title, message, [], hints, -1)

‎ntfy/backends/notifico.py‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@ def notify(title, message, retcode=None, webhook=None):
1111

1212
logger = logging.getLogger(__name__)
1313
if webhook is None:
14-
logger.error(
15-
'please set webhook variable under '
16-
'notifico backend of the config file')
14+
logger.error('please set webhook variable under '
15+
'notifico backend of the config file')
1716
return
18-
response = requests.get(webhook, params={
19-
'payload': '{title}\n{message}'.format(title=title, message=message)
20-
})
17+
response = requests.get(
18+
webhook,
19+
params={
20+
'payload': '{title}\n{message}'.format(
21+
title=title, message=message)
22+
})
2123
response.raise_for_status()

‎ntfy/backends/prowl.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
from ..config import USER_AGENT
44

5-
65
NTFY_API_KEY = '7fb59b2bedc4df26afa306d5dc54495b6394295a'
76
API_URL = 'https://api.prowlapp.com/publicapi/add'
87
MIN_PRIORITY = -2
@@ -43,8 +42,7 @@ def notify(title,
4342
if provider_key is not None:
4443
data['providerkey'] = provider_key
4544

46-
resp = requests.post(API_URL,
47-
data=data,
48-
headers={'User-Agent': USER_AGENT})
45+
resp = requests.post(
46+
API_URL, data=data, headers={'User-Agent': USER_AGENT})
4947

5048
resp.raise_for_status()

‎ntfy/backends/pushalot.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
from ..config import USER_AGENT
44

5-
65
# URL to pushalot.com notification sending endpoint
76
PUSHALOT_API_URL = 'https://pushalot.com/api/sendmessage'
87

@@ -54,7 +53,5 @@ def notify(title,
5453
data['IsSilent'] = 'True'
5554

5655
headers = {'User-Agent': USER_AGENT}
57-
response = requests.post(PUSHALOT_API_URL,
58-
data=data,
59-
headers=headers)
56+
response = requests.post(PUSHALOT_API_URL, data=data, headers=headers)
6057
response.raise_for_status()

‎ntfy/backends/pushbullet.py‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,19 @@ def notify(title,
2121
email or send an email if they aren't a pushullet user
2222
"""
2323

24-
data = {'type': 'note', 'title': title, 'body': message, }
24+
data = {
25+
'type': 'note',
26+
'title': title,
27+
'body': message,
28+
}
2529
if device_iden is not None:
2630
data['device_iden'] = device_iden
2731
if email is not None:
2832
data['email'] = email
2933

3034
headers = {'Access-Token': access_token, 'User-Agent': USER_AGENT}
3135

32-
resp = requests.post('https://api.pushbullet.com/v2/pushes',
33-
data=data,
34-
headers=headers)
36+
resp = requests.post(
37+
'https://api.pushbullet.com/v2/pushes', data=data, headers=headers)
3538

3639
resp.raise_for_status()

‎ntfy/backends/pushjet.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ def notify(title,
3737
if endpoint is None:
3838
endpoint = 'https://api.pushjet.io'
3939

40-
resp = requests.post(endpoint + '/message',
41-
data=data,
42-
headers=headers)
40+
resp = requests.post(endpoint + '/message', data=data, headers=headers)
4341

4442
resp.raise_for_status()

‎ntfy/backends/pushover.py‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ def notify(title,
7171
if priority == 2:
7272
# Retry can not be less than 30 per the API
7373
if not retry or retry < 30:
74-
logging.getLogger(
75-
__name__).error('retry is less than 30 or is not set, '
76-
'setting retry to 30 to comply with '
77-
'pushover API requirements')
74+
logging.getLogger(__name__).error(
75+
'retry is less than 30 or is not set, '
76+
'setting retry to 30 to comply with '
77+
'pushover API requirements')
7878
data['retry'] = 30
7979
else:
8080
data['retry'] = retry
@@ -105,9 +105,10 @@ def notify(title,
105105
else:
106106
raise ValueError('priority must be an integer from -2 to 2')
107107

108-
resp = requests.post('https://api.pushover.net/1/messages.json',
109-
data=data,
110-
headers={'User-Agent': USER_AGENT})
108+
resp = requests.post(
109+
'https://api.pushover.net/1/messages.json',
110+
data=data,
111+
headers={'User-Agent': USER_AGENT})
111112

112113
if resp.status_code == 429:
113114
print("ntfy's default api_token has reached pushover's rate limit")

‎ntfy/backends/simplepush.py‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33
from ..config import USER_AGENT
44

55

6-
def notify(title,
7-
message,
8-
key,
9-
event=None,
10-
retcode=None):
6+
def notify(title, message, key, event=None, retcode=None):
117
"""
128
Required paramter:
139
* ``key`` - The Simplepush identification key, created by
@@ -30,8 +26,6 @@ def notify(title,
3026

3127
endpoint = "https://api.simplepush.io"
3228

33-
resp = requests.post(endpoint + '/send',
34-
data=data,
35-
headers=headers)
29+
resp = requests.post(endpoint + '/send', data=data, headers=headers)
3630

3731
resp.raise_for_status()

0 commit comments

Comments
 (0)