From ebbeeeaf56374f9dae5c55d3b011f9941a6095e0 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 3 Oct 2012 14:30:24 +0530 Subject: [PATCH] ... --- recipes/freenature.recipe | 2 -- src/calibre/devices/cli.py | 2 ++ src/calibre/gui2/dialogs/smartdevice.py | 3 +-- src/calibre/gui2/library/models.py | 2 +- src/calibre/library/catalogs/epub_mobi_builder.py | 1 + 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes/freenature.recipe b/recipes/freenature.recipe index 34ac919f4e..e67cfab736 100644 --- a/recipes/freenature.recipe +++ b/recipes/freenature.recipe @@ -1,6 +1,4 @@ from calibre.web.feeds.news import BasicNewsRecipe -from calibre.ebooks.BeautifulSoup import Tag -import re class NatureNews(BasicNewsRecipe): title = u'Nature News' diff --git a/src/calibre/devices/cli.py b/src/calibre/devices/cli.py index c7b105998d..0d5c7f2f19 100755 --- a/src/calibre/devices/cli.py +++ b/src/calibre/devices/cli.py @@ -15,6 +15,7 @@ from calibre.utils.terminfo import TerminalController from calibre.devices.errors import ArgumentError, DeviceError, DeviceLocked from calibre.customize.ui import device_plugins from calibre.devices.scanner import DeviceScanner +from calibre.utils.config import device_prefs MINIMUM_COL_WIDTH = 12 #: Minimum width of columns in ls output @@ -228,6 +229,7 @@ def main(): continue else: dev = d + d.specialize_global_preferences(device_prefs) break diff --git a/src/calibre/gui2/dialogs/smartdevice.py b/src/calibre/gui2/dialogs/smartdevice.py index 8efe9bb41e..bebec4abee 100644 --- a/src/calibre/gui2/dialogs/smartdevice.py +++ b/src/calibre/gui2/dialogs/smartdevice.py @@ -5,11 +5,10 @@ from __future__ import (unicode_literals, division, absolute_import, __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal ' -from PyQt4.Qt import (QDialog, QLineEdit, Qt, QPushButton, QDialogButtonBox) +from PyQt4.Qt import (QDialog, QLineEdit, Qt) from calibre.gui2 import error_dialog from calibre.gui2.dialogs.smartdevice_ui import Ui_Dialog -from calibre.utils.config import prefs from calibre.utils.mdns import get_all_ips def _cmp_ipaddr(l, r): diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index 9d24ef7974..68031c8dd9 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -16,7 +16,7 @@ from calibre.utils.pyparsing import ParseException from calibre.ebooks.metadata import fmt_sidx, authors_to_string, string_to_authors from calibre.ebooks.metadata.book.base import SafeFormat from calibre.ptempfile import PersistentTemporaryFile -from calibre.utils.config import tweaks, prefs, device_prefs +from calibre.utils.config import tweaks, device_prefs from calibre.utils.date import dt_factory, qt_to_dt, as_local_time from calibre.utils.icu import sort_key from calibre.utils.search_query_parser import SearchQueryParser diff --git a/src/calibre/library/catalogs/epub_mobi_builder.py b/src/calibre/library/catalogs/epub_mobi_builder.py index baa28d5974..1e23e09b1d 100644 --- a/src/calibre/library/catalogs/epub_mobi_builder.py +++ b/src/calibre/library/catalogs/epub_mobi_builder.py @@ -648,6 +648,7 @@ class CatalogBuilder(object): # Hackhackhackhackhack # icu returns bogus results with curly apostrophes, maybe others under OS X 10.6.x # When we see the magic combo of 0/-1 for ordnum/ordlen, special case the logic + last_c = u'' if ordnum == 0 and ordlen == -1: if icu_upper(c[0]) != last_c: last_c = icu_upper(c[0])