Change appname to calibre

Makefile

@@ -3,19 +3,19 @@ PYTHON = python
 all : gui2 translations resources
 
 clean : 
-	cd src/libprs500/gui2 && ${PYTHON} make.py clean
+	cd src/calibre/gui2 && ${PYTHON} make.py clean
 
 gui2 :
-	 cd src/libprs500/gui2 && ${PYTHON} make.py
+	 cd src/calibre/gui2 && ${PYTHON} make.py
 
 test : gui2
-	cd src/libprs500/gui2 && ${PYTHON} make.py test
+	cd src/calibre/gui2 && ${PYTHON} make.py test
 
 translations :
-	cd src/libprs500 && ${PYTHON} translations/__init__.py
+	cd src/calibre && ${PYTHON} translations/__init__.py
 
 resources:	
 	${PYTHON} resources.py
     
 manual:
-	make -C src/libprs500/manual clean html
+	make -C src/calibre/manual clean html

epydoc-pdf.conf

@@ -1,13 +1,13 @@
 [epydoc] # Epydoc section marker (required by ConfigParser)
 
 # Information about the project.
-name: libprs500
-url: http://libprs500.kovidgoyal.net
+name: calibre
+url: http://calibre.kovidgoyal.net
 
 # The list of modules to document.  Modules can be named using
 # dotted names, module filenames, or package directory names.
 # This option may be repeated.
-modules: libprs500.devices, libprs500.ebooks.lrf.web.profiles
+modules: calibre.devices, calibre.ebooks.lrf.web.profiles
 
 output: pdf
 target: docs/pdf
@@ -36,7 +36,7 @@ css: white
 #   The "top" page for the documentation.  Can be a URL, the name
 #   of a module or class, or one of the special names "trees.html",
 #   "indices.html", or "help.html"
-# top: libprs500
+# top: calibre
 
 # verbosity
 #   An integer indicating how verbose epydoc should be.  The default

epydoc.conf

@@ -1,13 +1,13 @@
 [epydoc] # Epydoc section marker (required by ConfigParser)
 
 # Information about the project.
-name: libprs500 - API documentation
-url: http://libprs500.kovidgoyal.net
+name: calibre - API documentation
+url: http://calibre.kovidgoyal.net
 
 # The list of modules to document.  Modules can be named using
 # dotted names, module filenames, or package directory names.
 # This option may be repeated.
-modules: libprs500.devices, libprs500.ebooks.lrf.web.profiles 
+modules: calibre.devices, calibre.ebooks.lrf.web.profiles 
 
 # Write html output to the directory "docs"
 output: html
@@ -31,7 +31,7 @@ css: white
 #   HTML code for the project link in the navigation bar.  If left
 #   unspecified, the project link will be generated based on the
 #   project's name and URL.
-link: <a href="http://libprs500.kovidgoyal.net">libprs500</a>
+link: <a href="http://calibre.kovidgoyal.net">calibre</a>
 
 # top
 #   The "top" page for the documentation.  Can be a URL, the name

osx_installer.py

@@ -233,12 +233,12 @@ def main():
                          'frameworks': ['libusb.dylib', 'libunrar.dylib'],
                          'includes' : ['sip', 'pkg_resources', 'PyQt4.QtSvg', 
                                        'mechanize', 'ClientForm', 'usbobserver', 
-                                       'genshi', 'libprs500.web.feeds.recipes.*',
+                                       'genshi', 'calibre.web.feeds.recipes.*',
                                        'IPython.Extensions.*', 'pydoc'],
                          'packages' : ['PIL', 'Authorization', 'rtf2xml', 'lxml'],
                          'excludes' : [],
-                         'plist'    : { 'CFBundleGetInfoString' : '''libprs500, an E-book management application.'''
-                                        ''' Visit http://libprs500.kovidgoyal.net for details.''',
+                         'plist'    : { 'CFBundleGetInfoString' : '''calibre, an E-book management application.'''
+                                        ''' Visit http://calibre.kovidgoyal.net for details.''',
                                         'CFBundleIdentifier':'net.kovidgoyal.librs500',
                                         'CFBundleShortVersionString':VERSION,
                                         'CFBundleVersion':APPNAME + ' ' + VERSION,
@@ -255,4 +255,4 @@ def main():
     return 0
 
 if __name__ == '__main__':
-    sys.exit(main())
+    sys.exit(main())

resources.py

@@ -7,7 +7,7 @@ Compile resource files.
 '''
 import os, sys
 sys.path.insert(1, os.path.join(os.getcwd(), 'src'))
-from libprs500 import __appname__
+from calibre import __appname__
 
 RESOURCES = dict(
     opf_template = '%p/ebooks/metadata/opf.xml',

setup.py

@@ -5,16 +5,16 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 import sys, re, os, shutil
 sys.path.append('src')
 islinux = not ('win32' in sys.platform or 'win64' in sys.platform or 'darwin' in sys.platform)
-src = open('src/libprs500/__init__.py', 'rb').read()
+src = open('src/calibre/__init__.py', 'rb').read()
 VERSION = re.search(r'__version__\s+=\s+[\'"]([^\'"]+)[\'"]', src).group(1)
 APPNAME = re.search(r'__appname__\s+=\s+[\'"]([^\'"]+)[\'"]', src).group(1)
 print 'Setup', APPNAME, 'version:', VERSION
 
-epsrc = re.compile(r'entry_points = (\{.*?\})', re.DOTALL).search(open('src/libprs500/linux.py', 'rb').read()).group(1)
+epsrc = re.compile(r'entry_points = (\{.*?\})', re.DOTALL).search(open('src/%s/linux.py'%APPNAME, 'rb').read()).group(1)
 entry_points = eval(epsrc, {'__appname__': APPNAME})
 
 if 'win32' in sys.platform.lower() or 'win64' in sys.platform.lower():
-    entry_points['console_scripts'].append('parallel = libprs500.parallel:main')
+    entry_points['console_scripts'].append('parallel = %s.parallel:main'%APPNAME)
 
 def _ep_to_script(ep, base='src'):
     return (base+os.path.sep+re.search(r'.*=\s*(.*?):', ep).group(1).replace('.', '/')+'.py').strip()
@@ -50,16 +50,16 @@ if __name__ == '__main__':
     from setuptools import setup, find_packages
     import subprocess
     
-    entry_points['console_scripts'].append('libprs500_postinstall = libprs500.linux:post_install')
+    entry_points['console_scripts'].append('calibre_postinstall = calibre.linux:post_install')
     
     setup(
-          name='libprs500', 
+          name=APPNAME, 
           packages = find_packages('src'), 
           package_dir = { '' : 'src' }, 
           version=VERSION, 
           author='Kovid Goyal', 
           author_email='kovid@kovidgoyal.net', 
-          url = 'http://libprs500.kovidgoyal.net', 
+          url = 'http://%s.kovidgoyal.net'%APPNAME, 
           include_package_data = True,
           entry_points = entry_points, 
           zip_safe = True,
@@ -99,4 +99,4 @@ if __name__ == '__main__':
          )
     
     if 'develop' in ' '.join(sys.argv) and islinux:
-        subprocess.check_call('libprs500_postinstall', shell=True)
+        subprocess.check_call('calibre_postinstall', shell=True)

src/calibre/__init__.py

@@ -4,7 +4,7 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 __version__   = '0.4.49'
 __docformat__ = "epytext"
 __author__    = "Kovid Goyal <kovid at kovidgoyal.net>"
-__appname__   = 'libprs500'
+__appname__   = 'calibre'
 
 import sys, os, logging, mechanize, locale, copy, cStringIO, re, subprocess, \
        textwrap, atexit, cPickle
@@ -17,9 +17,9 @@ from logging import Formatter
 from ttfquery import findsystem, describe
 from PyQt4.QtCore import QSettings, QVariant
 
-from libprs500.translations.msgfmt import make
-from libprs500.ebooks.chardet import detect
-from libprs500.terminfo import TerminalController
+from calibre.translations.msgfmt import make
+from calibre.ebooks.chardet import detect
+from calibre.terminfo import TerminalController
 terminal_controller = TerminalController(sys.stdout)
 
 iswindows = 'win32' in sys.platform.lower() or 'win64' in sys.platform.lower()
@@ -216,10 +216,10 @@ def extract(path, dir):
     ext = os.path.splitext(path)[1][1:].lower()
     extractor = None
     if ext == 'zip':
-        from libprs500.libunzip import extract as zipextract
+        from calibre.libunzip import extract as zipextract
         extractor = zipextract
     elif ext == 'rar':
-        from libprs500.libunrar import extract as rarextract
+        from calibre.libunrar import extract as rarextract
         extractor = rarextract
     if extractor is None:
         raise Exception('Unknown archive type')
@@ -262,7 +262,7 @@ def fit_image(width, height, pwidth, pheight):
 def set_translator():
     # To test different translations invoke as
     # LC_ALL=de_DE.utf8 program
-    from libprs500.translations.data import translations
+    from calibre.translations.data import translations
     lang = locale.getdefaultlocale()[0]
     if lang is None and os.environ.has_key('LANG'): # Needed for OS X
         try:

src/calibre/devices/__init__.py

@@ -5,9 +5,9 @@ Device drivers.
 '''
 
 def devices():
-    from libprs500.devices.prs500.driver import PRS500
-    from libprs500.devices.prs505.driver import PRS505
-    from libprs500.devices.kindle.driver import KINDLE
+    from calibre.devices.prs500.driver import PRS500
+    from calibre.devices.prs505.driver import PRS505
+    from calibre.devices.kindle.driver import KINDLE
     return (PRS500, PRS505, KINDLE)
 
 import time

src/calibre/devices/kindle/books.py

@@ -6,8 +6,8 @@ import re, time, functools
 import os
 
 
-from libprs500.devices.interface import BookList as _BookList
-from libprs500.devices import strftime as _strftime
+from calibre.devices.interface import BookList as _BookList
+from calibre.devices import strftime as _strftime
 
 strftime = functools.partial(_strftime, zone=time.localtime)
 MIME_MAP   = { 

src/calibre/devices/kindle/driver.py

@@ -6,11 +6,11 @@ Device driver for the Amazon Kindle
 import sys, os, shutil, time, subprocess, re
 from itertools import cycle
 
-from libprs500.devices.interface import Device
-from libprs500.devices.errors import DeviceError, FreeSpaceError
-from libprs500.devices.kindle.books import BookList
-from libprs500 import iswindows, islinux, isosx
-from libprs500.devices.errors import PathError
+from calibre.devices.interface import Device
+from calibre.devices.errors import DeviceError, FreeSpaceError
+from calibre.devices.kindle.books import BookList
+from calibre import iswindows, islinux, isosx
+from calibre.devices.errors import PathError
 
 class File(object):
     def __init__(self, path):

src/calibre/devices/libusb.py

@@ -8,7 +8,7 @@ from ctypes import cdll, POINTER, byref, pointer, Structure, \
                    c_ubyte, c_ushort, c_int, c_char, c_void_p, c_byte, c_uint
 from errno import EBUSY, ENOMEM
 
-from libprs500 import iswindows, isosx, load_library
+from calibre import iswindows, isosx, load_library
 
 _libusb_name = 'libusb'
 PATH_MAX = 511 if iswindows else 1024 if isosx else 4096

src/calibre/devices/manager.py

@@ -8,8 +8,8 @@ Define a threaded interface for working with devices.
 
 import threading, Queue
 
-from libprs500.devices.device import Device
-from libprs500.devices.prs500.driver import PRS500
+from calibre.devices.device import Device
+from calibre.devices.prs500.driver import PRS500
 
 class DeviceManager(object):
     

src/calibre/devices/prs500/books.py

@@ -9,8 +9,8 @@ from base64 import b64decode as decode
 from base64 import b64encode as encode
 import re
 
-from libprs500.devices.interface import BookList as _BookList
-from libprs500.devices import strftime, strptime
+from calibre.devices.interface import BookList as _BookList
+from calibre.devices import strftime, strptime
 
 MIME_MAP   = { \
                         "lrf":"application/x-sony-bbeb", \

src/calibre/devices/prs500/cli/main.py

@@ -9,12 +9,12 @@ For usage information run the script.
 import StringIO, sys, time, os
 from optparse import OptionParser
 
-from libprs500 import __version__, iswindows, __appname__
-from libprs500.devices.errors import PathError 
-from libprs500.terminfo import TerminalController
-from libprs500.devices.errors import ArgumentError, DeviceError, DeviceLocked
-from libprs500.devices import devices
-from libprs500.devices.scanner import DeviceScanner
+from calibre import __version__, iswindows, __appname__
+from calibre.devices.errors import PathError 
+from calibre.terminfo import TerminalController
+from calibre.devices.errors import ArgumentError, DeviceError, DeviceLocked
+from calibre.devices import devices
+from calibre.devices.scanner import DeviceScanner
 
 MINIMUM_COL_WIDTH = 12 #: Minimum width of columns in ls output
 

src/calibre/devices/prs500/driver.py

@@ -40,13 +40,13 @@ from array import array
 from functools import wraps
 from StringIO import StringIO
 
-from libprs500.devices.interface import Device
-from libprs500.devices.libusb import Error as USBError
-from libprs500.devices.libusb import get_device_by_id
-from libprs500.devices.prs500.prstypes import *
-from libprs500.devices.errors import *
-from libprs500.devices.prs500.books import BookList, fix_ids
-from libprs500 import __author__, __appname__
+from calibre.devices.interface import Device
+from calibre.devices.libusb import Error as USBError
+from calibre.devices.libusb import get_device_by_id
+from calibre.devices.prs500.prstypes import *
+from calibre.devices.errors import *
+from calibre.devices.prs500.books import BookList, fix_ids
+from calibre import __author__, __appname__
 
 # Protocol versions this driver has been tested with
 KNOWN_USB_PROTOCOL_VERSIONS = [0x3030303030303130L] 

src/calibre/devices/prs500/prstypes.py

@@ -33,7 +33,7 @@ import struct
 import time
 from datetime import datetime
 
-from libprs500.devices.errors import PacketError
+from calibre.devices.errors import PacketError
 
 WORD      = "<H"    #: Unsigned integer little endian encoded in 2 bytes
 DWORD     = "<I"    #: Unsigned integer little endian encoded in 4 bytes

src/calibre/devices/prs505/books.py

@@ -9,9 +9,9 @@ from base64 import b64decode as decode
 from base64 import b64encode as encode
 
 
-from libprs500.devices.interface import BookList as _BookList
-from libprs500.devices import strftime as _strftime
-from libprs500.devices import strptime
+from calibre.devices.interface import BookList as _BookList
+from calibre.devices import strftime as _strftime
+from calibre.devices import strptime
 
 strftime = functools.partial(_strftime, zone=time.localtime)
 

src/calibre/devices/prs505/driver.py

@@ -6,11 +6,11 @@ Device driver for the SONY PRS-505
 import sys, os, shutil, time, subprocess, re
 from itertools import cycle
 
-from libprs500.devices.interface import Device
-from libprs500.devices.errors import DeviceError, FreeSpaceError
-from libprs500.devices.prs505.books import BookList, fix_ids
-from libprs500 import iswindows, islinux, isosx, __appname__
-from libprs500.devices.errors import PathError
+from calibre.devices.interface import Device
+from calibre.devices.errors import DeviceError, FreeSpaceError
+from calibre.devices.prs505.books import BookList, fix_ids
+from calibre import iswindows, islinux, isosx, __appname__
+from calibre.devices.errors import PathError
 
 class File(object):
     def __init__(self, path):

src/calibre/devices/scanner.py

@@ -7,8 +7,8 @@ manner.
 
 import sys
 
-from libprs500 import iswindows, isosx
-from libprs500.devices import libusb
+from calibre import iswindows, isosx
+from calibre.devices import libusb
 
 osx_scanner = None
 try:

src/calibre/ebooks/BeautifulSoup.py

@@ -83,11 +83,11 @@ __version__ = "3.0.5"
 __copyright__ = "Copyright (c) 2004-2007 Leonard Richardson"
 __license__ = "New-style BSD"
 
-from libprs500.ebooks.sgmllib import SGMLParser, SGMLParseError
+from calibre.ebooks.sgmllib import SGMLParser, SGMLParseError
 import codecs
 import types
 import re
-import libprs500.ebooks.sgmllib as sgmllib
+import calibre.ebooks.sgmllib as sgmllib
 from htmlentitydefs import name2codepoint
 
 #This hack makes Beautiful Soup able to parse XML with namespaces
@@ -1639,7 +1639,7 @@ class SimplifyingSOAPParser(BeautifulSOAP):
 
 # Autodetects character encodings.
 # Download from http://chardet.feedparser.org/
-import libprs500.ebooks.chardet as chardet
+import calibre.ebooks.chardet as chardet
 
 class UnicodeDammit:
     """A class for detecting the encoding of a *ML document and

src/calibre/ebooks/lrf/__init__.py

@@ -12,12 +12,12 @@ from uuid import uuid4
 from ttfquery import describe, findsystem
 from fontTools.ttLib import TTLibError
 
-from libprs500.ebooks.lrf.pylrs.pylrs import Book as _Book
-from libprs500.ebooks.lrf.pylrs.pylrs import TextBlock, Header, PutObj, \
+from calibre.ebooks.lrf.pylrs.pylrs import Book as _Book
+from calibre.ebooks.lrf.pylrs.pylrs import TextBlock, Header, PutObj, \
                                              Paragraph, TextStyle, BlockStyle
-from libprs500.ebooks.lrf.fonts import FONT_FILE_MAP
-from libprs500.ebooks import ConversionError
-from libprs500 import __appname__, __version__, __author__, iswindows, OptionParser
+from calibre.ebooks.lrf.fonts import FONT_FILE_MAP
+from calibre.ebooks import ConversionError
+from calibre import __appname__, __version__, __author__, iswindows, OptionParser
 
 __docformat__ = "epytext"
 

src/calibre/ebooks/lrf/any/convert_from.py

@@ -4,16 +4,16 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import sys, os, logging, shutil, tempfile, glob
 
-from libprs500.ebooks import UnknownFormatError
-from libprs500.ebooks.lrf import option_parser as _option_parser
-from libprs500 import __appname__, setup_cli_handlers, extract
-from libprs500.ebooks.lrf.lit.convert_from  import process_file as lit2lrf
-from libprs500.ebooks.lrf.pdf.convert_from  import process_file as pdf2lrf
-from libprs500.ebooks.lrf.rtf.convert_from  import process_file as rtf2lrf
-from libprs500.ebooks.lrf.txt.convert_from  import process_file as txt2lrf
-from libprs500.ebooks.lrf.html.convert_from import process_file as html2lrf
-from libprs500.ebooks.lrf.epub.convert_from import process_file as epub2lrf
-from libprs500.ebooks.lrf.mobi.convert_from import process_file as mobi2lrf
+from calibre.ebooks import UnknownFormatError
+from calibre.ebooks.lrf import option_parser as _option_parser
+from calibre import __appname__, setup_cli_handlers, extract
+from calibre.ebooks.lrf.lit.convert_from  import process_file as lit2lrf
+from calibre.ebooks.lrf.pdf.convert_from  import process_file as pdf2lrf
+from calibre.ebooks.lrf.rtf.convert_from  import process_file as rtf2lrf
+from calibre.ebooks.lrf.txt.convert_from  import process_file as txt2lrf
+from calibre.ebooks.lrf.html.convert_from import process_file as html2lrf
+from calibre.ebooks.lrf.epub.convert_from import process_file as epub2lrf
+from calibre.ebooks.lrf.mobi.convert_from import process_file as mobi2lrf
 
 def largest_file(files):
     maxsize, file = 0, None

src/calibre/ebooks/lrf/epub/convert_from.py

@@ -3,13 +3,13 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import os, sys, shutil, logging
 from tempfile import mkdtemp
-from libprs500.ebooks.lrf import option_parser as lrf_option_parser
-from libprs500.ebooks import ConversionError
-from libprs500.ebooks.lrf.html.convert_from import process_file as html_process_file
-from libprs500.ebooks.metadata.opf import OPF
-from libprs500.ebooks.metadata.epub import OCFDirReader
-from libprs500.libunzip import extract as zip_extract
-from libprs500 import __appname__, setup_cli_handlers
+from calibre.ebooks.lrf import option_parser as lrf_option_parser
+from calibre.ebooks import ConversionError
+from calibre.ebooks.lrf.html.convert_from import process_file as html_process_file
+from calibre.ebooks.metadata.opf import OPF
+from calibre.ebooks.metadata.epub import OCFDirReader
+from calibre.libunzip import extract as zip_extract
+from calibre import __appname__, setup_cli_handlers
 
 
 def option_parser():

src/calibre/ebooks/lrf/feeds/convert_from.py

@@ -4,12 +4,12 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 '''
 Convert web feeds to LRF files.
 '''
-from libprs500.ebooks.lrf import option_parser as lrf_option_parser
-from libprs500.ebooks.lrf.html.convert_from import process_file
-from libprs500.web.feeds.main import option_parser as feeds_option_parser
-from libprs500.web.feeds.main import run_recipe
-from libprs500.ptempfile import PersistentTemporaryDirectory
-from libprs500 import sanitize_file_name
+from calibre.ebooks.lrf import option_parser as lrf_option_parser
+from calibre.ebooks.lrf.html.convert_from import process_file
+from calibre.web.feeds.main import option_parser as feeds_option_parser
+from calibre.web.feeds.main import run_recipe
+from calibre.ptempfile import PersistentTemporaryDirectory
+from calibre import sanitize_file_name
 
 import sys, os, time
 

src/calibre/ebooks/lrf/fonts/__init__.py

@@ -1,8 +1,8 @@
 __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 import sys, os
-from libprs500 import iswindows
-from libprs500.ptempfile import PersistentTemporaryFile
+from calibre import iswindows
+from calibre.ptempfile import PersistentTemporaryFile
 
 try:
     from PIL import ImageFont
@@ -12,7 +12,7 @@ except ImportError:
 '''
 Default fonts used in the PRS500
 '''
-from libprs500.ebooks.lrf.fonts.prs500 import tt0003m_, tt0011m_, tt0419m_
+from calibre.ebooks.lrf.fonts.prs500 import tt0003m_, tt0011m_, tt0419m_
 
 FONT_MAP = {
             'Swis721 BT Roman'     : tt0003m_,

src/calibre/ebooks/lrf/html/convert_from.py

@@ -18,23 +18,23 @@ try:
 except ImportError:
     import Image as PILImage
 
-from libprs500.ebooks.BeautifulSoup import BeautifulSoup, Comment, Tag, \
+from calibre.ebooks.BeautifulSoup import BeautifulSoup, Comment, Tag, \
                             NavigableString, Declaration, ProcessingInstruction
-from libprs500.ebooks.lrf.pylrs.pylrs import Paragraph, CR, Italic, ImageStream, \
+from calibre.ebooks.lrf.pylrs.pylrs import Paragraph, CR, Italic, ImageStream, \
                 TextBlock, ImageBlock, JumpButton, CharButton, \
                 Plot, Image, BlockSpace, RuledLine, BookSetting, Canvas, DropCaps, \
                 LrsError, Sup, Sub, EmpLine
-from libprs500.ebooks.lrf.pylrs.pylrs import Span 
-from libprs500.ebooks.lrf import Book, entity_to_unicode
-from libprs500.ebooks.lrf import option_parser as lrf_option_parser
-from libprs500.ebooks import ConversionError
-from libprs500.ebooks.lrf.html.table import Table 
-from libprs500 import filename_to_utf8,  setup_cli_handlers, __appname__, fit_image
-from libprs500.ptempfile import PersistentTemporaryFile
-from libprs500.ebooks.metadata.opf import OPFReader
-from libprs500.devices.interface import Device
-from libprs500.ebooks.lrf.html.color_map import lrs_color
-from libprs500.ebooks.chardet import xml_to_unicode
+from calibre.ebooks.lrf.pylrs.pylrs import Span 
+from calibre.ebooks.lrf import Book, entity_to_unicode
+from calibre.ebooks.lrf import option_parser as lrf_option_parser
+from calibre.ebooks import ConversionError
+from calibre.ebooks.lrf.html.table import Table 
+from calibre import filename_to_utf8,  setup_cli_handlers, __appname__, fit_image
+from calibre.ptempfile import PersistentTemporaryFile
+from calibre.ebooks.metadata.opf import OPFReader
+from calibre.devices.interface import Device
+from calibre.ebooks.lrf.html.color_map import lrs_color
+from calibre.ebooks.chardet import xml_to_unicode
 
 def update_css(ncss, ocss):
     for key in ncss.keys():

src/calibre/ebooks/lrf/html/convert_to.py

@@ -2,13 +2,13 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 import sys, logging, os
 
-from libprs500 import setup_cli_handlers, OptionParser
-from libprs500.ebooks import ConversionError
-from libprs500.ebooks.lrf.meta import get_metadata
-from libprs500.ebooks.lrf.parser import LRFDocument
-from libprs500.ebooks.metadata.opf import OPFCreator
+from calibre import setup_cli_handlers, OptionParser
+from calibre.ebooks import ConversionError
+from calibre.ebooks.lrf.meta import get_metadata
+from calibre.ebooks.lrf.parser import LRFDocument
+from calibre.ebooks.metadata.opf import OPFCreator
 
-from libprs500.ebooks.lrf.objects import PageAttr, BlockAttr, TextAttr
+from calibre.ebooks.lrf.objects import PageAttr, BlockAttr, TextAttr
 
 
 class BlockStyle(object):