diff --git a/src/calibre/__init__.py b/src/calibre/__init__.py index 61d7801cb4..ea0cde9a2c 100644 --- a/src/calibre/__init__.py +++ b/src/calibre/__init__.py @@ -186,7 +186,7 @@ class CurrentDir(object): def __enter__(self, *args): self.cwd = os.getcwd() os.chdir(self.path) - return self.cwd + return self.cwd def __exit__(self, *args): os.chdir(self.cwd) diff --git a/src/calibre/ebooks/lrf/__init__.py b/src/calibre/ebooks/lrf/__init__.py index 3515c75c7d..cb7eae9067 100644 --- a/src/calibre/ebooks/lrf/__init__.py +++ b/src/calibre/ebooks/lrf/__init__.py @@ -165,7 +165,7 @@ def option_parser(usage, gui_mode=False): help=_('''The regular expression used to detect chapter titles.''' ''' It is searched for in heading tags (h1-h6). Defaults to %default''')) chapter.add_option('--chapter-attr', default='$,,$', - help=_('Detect a chapter beginning at an element having the specified attribute. The format for this option is tagname regexp,attribute name,attribute value regexp. For example to match all heading tags that have the attribute class="chapter" you would use "h\d,class,chapter". You can set the attribute to "none" to match only on tag names. So for example, to match all

tags, you would use "h2,none,". Default is %default''')) + help=_('Detect a chapter beginning at an element having the specified attribute. The format for this option is tagname regexp,attribute name,attribute value regexp. For example to match all heading tags that have the attribute class="chapter" you would use "h\d,class,chapter". You can set the attribute to "none" to match only on tag names. So for example, to match all h2 tags, you would use "h2,none,". Default is %default''')) chapter.add_option('--page-break-before-tag', dest='page_break', default='h[12]', help=_('''If html2lrf does not find any page breaks in the ''' '''html file and cannot detect chapter headings, it will '''