From f48961a7e4eefa4e6db59afda174c74ec9bff5b4 Mon Sep 17 00:00:00 2001 From: pictuga Date: Thu, 19 Mar 2020 10:13:22 +0100 Subject: [PATCH] feeds: small code cleanups --- morss/feeds.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/morss/feeds.py b/morss/feeds.py index 896dd3b..03ce45c 100644 --- a/morss/feeds.py +++ b/morss/feeds.py @@ -21,18 +21,21 @@ import lxml.html json.encoder.c_make_encoder = None try: + # python 2 from StringIO import StringIO from urllib2 import urlopen from ConfigParser import RawConfigParser except ImportError: - # python > 3 + # python 3 from io import StringIO from urllib.request import urlopen from configparser import RawConfigParser try: + # python 2 basestring except NameError: + # python 3 basestring = unicode = str @@ -109,13 +112,13 @@ def parse(data, url=None, mimetype=None): # it worked! return feed - raise Exception('no way to handle this feed') + raise TypeError('no way to handle this feed') class ParserBase(object): def __init__(self, data=None, rules=None, parent=None): if rules is None: - rules = parse_rules()[self.default_ruleset] # FIXME + rules = parse_rules()[self.default_ruleset] self.rules = rules @@ -488,7 +491,7 @@ class ParserJSON(ParserBase): def tostring(self): return json.dumps(self.root, indent=True, ensure_ascii=False) - # ensure_ascii = False to have proper utf-8 string and not \u00 + # ensure_ascii = False to have proper (unicode?) string and not \u00 def _rule_parse(self, rule): return rule.split(".") @@ -558,7 +561,7 @@ class ParserJSON(ParserBase): def rule_str(self, rule): out = self.rule_search(rule) - return str(out).replace('\n', '
') if out else out + return out.replace('\n', '
') if out else out class Uniq(object): @@ -576,7 +579,7 @@ class Uniq(object): return cls._map[tmp_id] else: - obj = object.__new__(cls, *args, **kwargs) + obj = object.__new__(cls) #, *args, **kwargs) cls._map[tmp_id] = obj return obj