← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/calibre/oneiric

« back to all changes in this revision

Viewing changes to src/calibre/devices/teclast/driver.py

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2010-06-21 10:18:08 UTC
  • mfrom: (1.3.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20100621101808-aue828f532tmo4zt
Tags: 0.7.2+dfsg-1
http://bugs.debian.org/584756
http://bugs.debian.org/584915
https://launchpad.net/bugs/561958
* New major upstream version. See http://calibre-ebook.com/new-in/seven for
  details.
* Refresh patches to apply cleanly.
* debian/control: Bump python-cssutils to >= 0.9.7~ to ensure the existence
  of the CSSRuleList.rulesOfType attribute. This makes epub conversion work
  again. (Closes: #584756)
* Add debian/local/calibre-mount-helper: Simple and safe replacement for
  upstream's calibre-mount-helper, using udisks --mount and eject.
  (Closes: #584915, LP: #561958)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/calibre/devices/teclast/driver.py
30
30
    EBOOK_DIR_CARD_A = ''
31
31
    SUPPORTS_SUB_DIRS = True
32
32
 
33
 
    def windows_sort_drives(self, drives):
34
 
        main = drives.get('main', None)
35
 
        card = drives.get('carda', None)
36
 
        if card and main and card < main:
37
 
            drives['main'] = card
38
 
            drives['carda'] = main
39
 
 
40
 
        return drives
41
33
 
42
34
class NEWSMY(TECLAST_K3):
43
35
    name = 'Newsmy device interface'
50
42
    WINDOWS_MAIN_MEM = 'NEWSMY'
51
43
    WINDOWS_CARD_A_MEM = 'USBDISK____SD'
52
44
 
53
 
    def windows_sort_drives(self, drives):
54
 
        return drives
55
 
 
56
45
class IPAPYRUS(TECLAST_K3):
57
46
 
58
47
    name = 'iPapyrus device interface'