Merge pull request #1 from GRiker/master

Testing push from local repository, pull request to Kovid
This commit is contained in:
Kovid Goyal 2013-05-30 19:32:05 -07:00
commit 3c42095f4c

View File

@ -16,8 +16,9 @@ import os, sys
from collections import OrderedDict from collections import OrderedDict
from ctypes import ( from ctypes import (
c_int, c_long, c_void_p, c_char_p, Structure, POINTER, byref, cdll, c_char, c_ulonglong, byref, cdll, create_string_buffer,
c_uint, c_ubyte, create_string_buffer, string_at) c_char, c_char_p, c_int, c_long, c_ubyte, c_uint, c_ulonglong, c_void_p,
POINTER, string_at, Structure)
from calibre.constants import DEBUG, islinux, isosx, iswindows from calibre.constants import DEBUG, islinux, isosx, iswindows
from calibre.devices.idevice.parse_xml import XmlPropertyListParser from calibre.devices.idevice.parse_xml import XmlPropertyListParser