patrick/feediverse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed a stray diff boundary and reorganized imports

Browse Source
This commit is contained in:
Ed Summers
2020-09-29 11:28:08 -04:00
parent d75ecf5377
commit a2b196bc25
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
feediverse.py
View File

@ -1,18 +1,18 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import os import os
import re
import sys import sys
import yaml
import codecs import codecs
import argparse import argparse
import yaml import urllib3
import dateutil import dateutil
import feedparser import feedparser
from bs4 import BeautifulSoup
from bs4 import BeautifulSoup
from mastodon import Mastodon from mastodon import Mastodon
from datetime import datetime, timezone, MINYEAR from datetime import datetime, timezone, MINYEAR
import urllib3
import re
DEFAULT_CONFIG_FILE = os.path.join("~", ".feediverse") DEFAULT_CONFIG_FILE = os.path.join("~", ".feediverse")
@ -204,10 +204,8 @@ def get_entry(entry, include_images, generator=None):
links = [l for l in entry.links if l.get("type") == "text/html"] links = [l for l in entry.links if l.get("type") == "text/html"]
if links: if links:
url = links[0]["href"] url = links[0]["href"]
=======
t = tag['term'].replace(' ', '_').replace('.', '').replace('-', '') t = tag['term'].replace(' ', '_').replace('.', '').replace('-', '')
hashtags.append('#{}'.format(t)) hashtags.append('#{}'.format(t))
>>>>>>> steinarb/fix-space-in-hashtags
return { return {
'url': url, 'url': url,
'link': entry.link, 'link': entry.link,