Just a little refactoring

This commit is contained in:
Miroslav Stampar 2013-01-18 10:12:45 +01:00
parent e4ee4f9557
commit b0a13be985

View File

@ -1,8 +1,6 @@
""" """
magic is a wrapper around the libmagic file identification library. magic is a wrapper around the libmagic file identification library.
See README for more information.
Usage: Usage:
>>> import magic >>> import magic
@ -14,7 +12,6 @@ Usage:
'PDF document, version 1.2' 'PDF document, version 1.2'
>>> >>>
""" """
import sys import sys
@ -24,12 +21,12 @@ import ctypes.util
from ctypes import c_char_p, c_int, c_size_t, c_void_p from ctypes import c_char_p, c_int, c_size_t, c_void_p
class MagicException(Exception): pass class MagicException(Exception):
pass
class Magic: class Magic:
""" """
Magic is a wrapper around the libmagic C library. Magic is a wrapper around the libmagic C library.
""" """
def __init__(self, mime=False, magic_file=None, mime_encoding=False): def __init__(self, mime=False, magic_file=None, mime_encoding=False):
@ -39,8 +36,8 @@ class Magic:
mime - if True, mimetypes are returned instead of textual descriptions mime - if True, mimetypes are returned instead of textual descriptions
mime_encoding - if True, codec is returned mime_encoding - if True, codec is returned
magic_file - use a mime database other than the system default magic_file - use a mime database other than the system default
""" """
flags = MAGIC_NONE flags = MAGIC_NONE
if mime: if mime:
flags |= MAGIC_MIME flags |= MAGIC_MIME
@ -56,6 +53,7 @@ class Magic:
""" """
Identify the contents of `buf` Identify the contents of `buf`
""" """
return magic_buffer(self.cookie, buf) return magic_buffer(self.cookie, buf)
def from_file(self, filename): def from_file(self, filename):
@ -104,8 +102,6 @@ def from_buffer(buffer, mime=False):
m = _get_magic_type(mime) m = _get_magic_type(mime)
return m.from_buffer(buffer) return m.from_buffer(buffer)
try: try:
libmagic = None libmagic = None
# Let's try to find magic or magic1 # Let's try to find magic or magic1
@ -178,7 +174,6 @@ try:
def magic_buffer(cookie, buf): def magic_buffer(cookie, buf):
return _magic_buffer(cookie, buf, len(buf)) return _magic_buffer(cookie, buf, len(buf))
_magic_load = libmagic.magic_load _magic_load = libmagic.magic_load
_magic_load.restype = c_int _magic_load.restype = c_int
_magic_load.argtypes = [magic_t, c_char_p] _magic_load.argtypes = [magic_t, c_char_p]
@ -198,48 +193,28 @@ try:
magic_compile = libmagic.magic_compile magic_compile = libmagic.magic_compile
magic_compile.restype = c_int magic_compile.restype = c_int
magic_compile.argtypes = [magic_t, c_char_p] magic_compile.argtypes = [magic_t, c_char_p]
except ImportError: except ImportError:
pass pass
MAGIC_NONE = 0x000000 # No flags MAGIC_NONE = 0x000000 # No flags
MAGIC_DEBUG = 0x000001 # Turn on debugging MAGIC_DEBUG = 0x000001 # Turn on debugging
MAGIC_SYMLINK = 0x000002 # Follow symlinks MAGIC_SYMLINK = 0x000002 # Follow symlinks
MAGIC_COMPRESS = 0x000004 # Check inside compressed files MAGIC_COMPRESS = 0x000004 # Check inside compressed files
MAGIC_DEVICES = 0x000008 # Look at the contents of devices MAGIC_DEVICES = 0x000008 # Look at the contents of devices
MAGIC_MIME = 0x000010 # Return a mime string MAGIC_MIME = 0x000010 # Return a mime string
MAGIC_MIME_ENCODING = 0x000400 # Return the MIME encoding MAGIC_MIME_ENCODING = 0x000400 # Return the MIME encoding
MAGIC_CONTINUE = 0x000020 # Return all matches MAGIC_CONTINUE = 0x000020 # Return all matches
MAGIC_CHECK = 0x000040 # Print warnings to stderr MAGIC_CHECK = 0x000040 # Print warnings to stderr
MAGIC_PRESERVE_ATIME = 0x000080 # Restore access time on exit MAGIC_PRESERVE_ATIME = 0x000080 # Restore access time on exit
MAGIC_RAW = 0x000100 # Don't translate unprintable chars MAGIC_RAW = 0x000100 # Don't translate unprintable chars
MAGIC_ERROR = 0x000200 # Handle ENOENT etc as real errors MAGIC_ERROR = 0x000200 # Handle ENOENT etc as real errors
MAGIC_NO_CHECK_COMPRESS = 0x001000 # Don't check for compressed files MAGIC_NO_CHECK_COMPRESS = 0x001000 # Don't check for compressed files
MAGIC_NO_CHECK_TAR = 0x002000 # Don't check for tar files MAGIC_NO_CHECK_TAR = 0x002000 # Don't check for tar files
MAGIC_NO_CHECK_SOFT = 0x004000 # Don't check magic entries MAGIC_NO_CHECK_SOFT = 0x004000 # Don't check magic entries
MAGIC_NO_CHECK_APPTYPE = 0x008000 # Don't check application type MAGIC_NO_CHECK_APPTYPE = 0x008000 # Don't check application type
MAGIC_NO_CHECK_ELF = 0x010000 # Don't check for elf details MAGIC_NO_CHECK_ELF = 0x010000 # Don't check for elf details
MAGIC_NO_CHECK_ASCII = 0x020000 # Don't check for ascii files MAGIC_NO_CHECK_ASCII = 0x020000 # Don't check for ascii files
MAGIC_NO_CHECK_TROFF = 0x040000 # Don't check ascii/troff MAGIC_NO_CHECK_TROFF = 0x040000 # Don't check ascii/troff
MAGIC_NO_CHECK_FORTRAN = 0x080000 # Don't check ascii/fortran MAGIC_NO_CHECK_FORTRAN = 0x080000 # Don't check ascii/fortran
MAGIC_NO_CHECK_TOKENS = 0x100000 # Don't check ascii/tokens MAGIC_NO_CHECK_TOKENS = 0x100000 # Don't check ascii/tokens