Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Kovid Goyal 2013-02-11 08:34:04 +05:30
parent d99327ba30
commit c10ae4ae3f
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/ebooks/oeb/polish/main.py
View File

@ -7,7 +7,7 @@ __license__ = 'GPL v3'
__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>' __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
__docformat__ = 'restructuredtext en' __docformat__ = 'restructuredtext en'
import re import re, sys
from collections import namedtuple from collections import namedtuple
from functools import partial from functools import partial
@ -122,9 +122,9 @@ def option_parser():
return parser return parser
def main(): def main(args=None):
parser = option_parser() parser = option_parser()
opts, args = parser.parse_args() opts, args = parser.parse_args(args or sys.argv[1:])
log = Log(level=Log.DEBUG if opts.verbose else Log.INFO) log = Log(level=Log.DEBUG if opts.verbose else Log.INFO)
if not args: if not args:
parser.print_help() parser.print_help()

4
src/calibre/ebooks/oeb/polish/stats.py
View File

@ -107,6 +107,8 @@ class Page(QWebPage): # {{{
self.js = None self.js = None
self.evaljs = self.mainFrame().evaluateJavaScript self.evaljs = self.mainFrame().evaluateJavaScript
self.bridge_value = None self.bridge_value = None
nam = self.networkAccessManager()
nam.setNetworkAccessible(nam.NotAccessible)
def javaScriptConsoleMessage(self, msg, lineno, msgid): def javaScriptConsoleMessage(self, msg, lineno, msgid):
self.log(u'JS:', unicode(msg)) self.log(u'JS:', unicode(msg))
@ -203,7 +205,7 @@ class StatsCollector(object):
self.log.warn('Non-local URI in', warn_name, ':', href, 'ignoring') self.log.warn('Non-local URI in', warn_name, ':', href, 'ignoring')
return None return None
src = href[len('file://'):] src = href[len('file://'):]
if iswindows and src.startswith('/'): if iswindows and len(src) > 2 and (src[0], src[2]) == ('/', ':'):
src = src[1:] src = src[1:]
src = src.replace('/', os.sep) src = src.replace('/', os.sep)
src = unquote(src) src = unquote(src)