projects
/
rss2maildir.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Further reformatting to < 80 chars per line
[rss2maildir.git]
/
rss2maildir.py
diff --git
a/rss2maildir.py
b/rss2maildir.py
index 6a319f47ad2ba14a44df777dfd83b21c7cf0d9da..268d1922561cb8aacde58ba3d0fa7bbec812b8f8 100755
(executable)
--- a/
rss2maildir.py
+++ b/
rss2maildir.py
@@
-132,7
+132,8
@@
class HTML2Text(HTMLParser):
else:
self.text = self.text \
+ u' * ' \
else:
self.text = self.text \
+ u' * ' \
- + u'\n '.join([a.strip() for a in textwrap.wrap(self.item, 67)]) \
+ + u'\n '.join([a.strip() for a in \
+ textwrap.wrap(self.item, 67)]) \
+ u'\n'
self.item = u''
+ u'\n'
self.item = u''
@@
-199,8
+200,10
@@
class HTML2Text(HTMLParser):
self.text = self.text \
+ u'\n> ' \
+ u'\n> '.join( \
self.text = self.text \
+ u'\n> ' \
+ u'\n> '.join( \
- [a.strip() for a in textwrap.wrap(self.blockquote, 68)] \
- ).encode("utf-8") \
+ [a.strip() \
+ for a in textwrap.wrap( \
+ self.blockquote, 68)] \
+ ) \
+ u'\n'
self.inblockquote = False
self.blockquote = u''
+ u'\n'
self.inblockquote = False
self.blockquote = u''
@@
-248,11
+251,12
@@
class HTML2Text(HTMLParser):
entity = "&" + name + ";"
if self.inparagraph:
entity = "&" + name + ";"
if self.inparagraph:
- self.currentparagraph = self.currentparagraph + entity
+ self.currentparagraph = self.currentparagraph \
+ + unicode(entity, "utf-8")
elif self.inblockquote:
elif self.inblockquote:
- self.blockquote = self.blockquote +
entity
+ self.blockquote = self.blockquote +
unicode(entity, "utf-8")
else:
else:
- self.text = self.text +
entity
+ self.text = self.text +
unicode(entity, "utf-8")
def gettext(self):
data = self.text
def gettext(self):
data = self.text
@@
-367,7
+371,8
@@
if options.conf != None:
configfile = options.conf
except:
# should exit here as the specified file doesn't exist
configfile = options.conf
except:
# should exit here as the specified file doesn't exist
- sys.stderr.write("Config file %s does not exist. Exiting.\n" %(options.conf,))
+ sys.stderr.write( \
+ "Config file %s does not exist. Exiting.\n" %(options.conf,))
sys.exit(2)
else:
# check through the default locations
sys.exit(2)
else:
# check through the default locations
@@
-396,7
+401,8
@@
if options.statedir != None:
try:
mode = os.stat(state_dir)[stat.ST_MODE]
if not stat.S_ISDIR(mode):
try:
mode = os.stat(state_dir)[stat.ST_MODE]
if not stat.S_ISDIR(mode):
- sys.stderr.write("State directory (%s) is not a directory\n" %(state_dir))
+ sys.stderr.write( \
+ "State directory (%s) is not a directory\n" %(state_dir))
sys.exit(1)
except:
# try to make the directory
sys.exit(1)
except:
# try to make the directory
@@
-410,7
+416,8
@@
elif scp.has_option("general", "state_dir"):
try:
mode = os.stat(state_dir)[stat.ST_MODE]
if not stat.S_ISDIR(mode):
try:
mode = os.stat(state_dir)[stat.ST_MODE]
if not stat.S_ISDIR(mode):
- sys.stderr.write("State directory (%s) is not a directory\n" %(state_dir))
+ sys.stderr.write( \
+ "State directory (%s) is not a directory\n" %(state_dir))
sys.exit(1)
except:
# try to create it
sys.exit(1)
except:
# try to create it
@@
-418,19
+425,22
@@
elif scp.has_option("general", "state_dir"):
os.mkdir(new_state_dir)
state_dir = new_state_dir
except:
os.mkdir(new_state_dir)
state_dir = new_state_dir
except:
- sys.stderr.write("Couldn't create state directory %s\n" %(new_state_dir))
+ sys.stderr.write( \
+ "Couldn't create state directory %s\n" %(new_state_dir))
sys.exit(1)
else:
try:
mode = os.stat(state_dir)[stat.ST_MODE]
if not stat.S_ISDIR(mode):
sys.exit(1)
else:
try:
mode = os.stat(state_dir)[stat.ST_MODE]
if not stat.S_ISDIR(mode):
- sys.stderr.write("State directory %s is not a directory\n" %(state_dir))
+ sys.stderr.write( \
+ "State directory %s is not a directory\n" %(state_dir))
sys.exit(1)
except:
try:
os.mkdir(state_dir)
except:
sys.exit(1)
except:
try:
os.mkdir(state_dir)
except:
- sys.stderr.write("State directory %s could not be created\n" %(state_dir))
+ sys.stderr.write( \
+ "State directory %s could not be created\n" %(state_dir))
sys.exit(1)
if scp.has_option("general", "maildir_root"):
sys.exit(1)
if scp.has_option("general", "maildir_root"):
@@
-439,7
+449,9
@@
if scp.has_option("general", "maildir_root"):
try:
mode = os.stat(maildir_root)[stat.ST_MODE]
if not stat.S_ISDIR(mode):
try:
mode = os.stat(maildir_root)[stat.ST_MODE]
if not stat.S_ISDIR(mode):
- sys.stderr.write("Maildir Root %s is not a directory\n" %(maildir_root))
+ sys.stderr.write( \
+ "Maildir Root %s is not a directory\n" \
+ %(maildir_root))
sys.exit(1)
except:
try:
sys.exit(1)
except:
try:
@@
-500,7
+512,9
@@
for section in feeds:
os.mkdir(os.path.join(maildir, "cur"))
os.mkdir(os.path.join(maildir, "tmp"))
except:
os.mkdir(os.path.join(maildir, "cur"))
os.mkdir(os.path.join(maildir, "tmp"))
except:
- sys.stderr.write("Couldn't create required maildir directories for %s\n" %(section,))
+ sys.stderr.write( \
+ "Couldn't create required maildir directories for %s\n" \
+ %(section,))
sys.exit(1)
# right - we've got the directories, we've got the section, we know the
sys.exit(1)
# right - we've got the directories, we've got the section, we know the