[Checkins] SVN: z3c.filetype/branches/1.1.0/ - added an interface for BMP image files

Juergen Kartnaller juergen at kartnaller.at
Fri Dec 21 06:20:24 EST 2007 

Log message for revision 82383:
  - added an interface for BMP image files
  - make sure unknown formats are not recognized as a default format
  

Changed:
  U   z3c.filetype/branches/1.1.0/CHANGES.txt
  U   z3c.filetype/branches/1.1.0/setup.py
  U   z3c.filetype/branches/1.1.0/src/z3c/filetype/README.txt
  U   z3c.filetype/branches/1.1.0/src/z3c/filetype/interfaces/filetypes.py
  U   z3c.filetype/branches/1.1.0/src/z3c/filetype/magic.txt
  A   z3c.filetype/branches/1.1.0/src/z3c/filetype/testdata/noface.bmp

-=-
Modified: z3c.filetype/branches/1.1.0/CHANGES.txt
===================================================================
--- z3c.filetype/branches/1.1.0/CHANGES.txt	2007-12-21 10:12:03 UTC (rev 82382)
+++ z3c.filetype/branches/1.1.0/CHANGES.txt	2007-12-21 11:20:24 UTC (rev 82383)
@@ -5,7 +5,13 @@
 After
 =====
 
+2007/12/21 1.1.1
+================
 
+ - added an interface for BMP image files
+ - make sure unknown formats are not recognized as a default format
+
+
 2007/12/06 1.1.0
 ================
 

Modified: z3c.filetype/branches/1.1.0/setup.py
===================================================================
--- z3c.filetype/branches/1.1.0/setup.py	2007-12-21 10:12:03 UTC (rev 82382)
+++ z3c.filetype/branches/1.1.0/setup.py	2007-12-21 11:20:24 UTC (rev 82383)
@@ -2,7 +2,7 @@
 
 setup(
     name="z3c.filetype",
-    version="1.1.0",
+    version="1.1.1",
     namespace_packages=["z3c"],
     packages=find_packages("src"),
     package_dir={"": "src"},

Modified: z3c.filetype/branches/1.1.0/src/z3c/filetype/README.txt
===================================================================
--- z3c.filetype/branches/1.1.0/src/z3c/filetype/README.txt	2007-12-21 10:12:03 UTC (rev 82382)
+++ z3c.filetype/branches/1.1.0/src/z3c/filetype/README.txt	2007-12-21 11:20:24 UTC (rev 82383)
@@ -40,6 +40,8 @@
   [<InterfaceClass z3c.filetype.interfaces.filetypes.IBZIP2File>]
   mpeglayer3.mp3
   [<InterfaceClass z3c.filetype.interfaces.filetypes.IAudioMPEGFile>]
+  noface.bmp
+  [<InterfaceClass z3c.filetype.interfaces.filetypes.IBMPFile>]
   test.flv
   [<InterfaceClass z3c.filetype.interfaces.filetypes.IFLVFile>]
   test.gnutar
@@ -186,6 +188,7 @@
   logo.gif --> image/gif
   logo.gif.bz2 --> application/x-bzip2
   mpeglayer3.mp3 --> audio/mpeg
+  noface.bmp --> image/bmp
   test.flv --> video/x-flv
   test.gnutar --> application/x-tar
   test.html --> text/html

Modified: z3c.filetype/branches/1.1.0/src/z3c/filetype/interfaces/filetypes.py
===================================================================
--- z3c.filetype/branches/1.1.0/src/z3c/filetype/interfaces/filetypes.py	2007-12-21 10:12:03 UTC (rev 82382)
+++ z3c.filetype/branches/1.1.0/src/z3c/filetype/interfaces/filetypes.py	2007-12-21 11:20:24 UTC (rev 82383)
@@ -40,15 +40,19 @@
 ITextFile.setTaggedValue(MTM,re.compile('^text/.+$'))
 ITextFile.setTaggedValue(MT,'text/plain')
 
-class IImageFile(ITypedFile):
-    """image files"""
-IImageFile.setTaggedValue(MTM,re.compile('^image/.+$'))
+class IImageFile(interface.Interface):
+    """marker for image files"""
 
 class IPDFFile(IBinaryFile):
     """pdf files"""
 IPDFFile.setTaggedValue(MTM,re.compile('application/pdf'))
 IPDFFile.setTaggedValue(MT,'application/pdf')
 
+class IBMPFile(IImageFile, IBinaryFile):
+    """jpeg file"""
+IBMPFile.setTaggedValue(MTM,re.compile('image/bmp'))
+IBMPFile.setTaggedValue(MT,'image/bmp')
+
 class IJPGFile(IImageFile, IBinaryFile):
     """jpeg file"""
 IJPGFile.setTaggedValue(MTM,re.compile('image/jpe?g'))
@@ -64,21 +68,20 @@
 IGIFFile.setTaggedValue(MTM,re.compile('image/gif'))
 IGIFFile.setTaggedValue(MT,'image/gif')
 
-class IVideoFile(IBinaryFile):
-    """video file"""
-IVideoFile.setTaggedValue(MTM,re.compile('^video/.+$'))
+class IVideoFile(interface.Interface):
+    """marker for video file"""
 
-class IQuickTimeFile(IVideoFile):
+class IQuickTimeFile(IVideoFile, IBinaryFile):
     """Quicktime Video File Format"""
 IQuickTimeFile.setTaggedValue(MTM,re.compile('video/quicktime'))
 IQuickTimeFile.setTaggedValue(MT,'video/quicktime')
 
-class IAVIFile(IVideoFile):
+class IAVIFile(IVideoFile, IBinaryFile):
     """Quicktime Video File Format"""
 IAVIFile.setTaggedValue(MTM,re.compile('video/x-msvideo'))
 IAVIFile.setTaggedValue(MT,'video/x-msvideo')
 
-class IMPEGFile(IVideoFile):
+class IMPEGFile(IVideoFile, IBinaryFile):
     """MPEG Video File Format"""
 IMPEGFile.setTaggedValue(MTM,re.compile('video/mpe?g'))
 IMPEGFile.setTaggedValue(MT,'video/mpeg')
@@ -88,21 +91,20 @@
 IMP4File.setTaggedValue(MTM,re.compile('video/mp4'))
 IMP4File.setTaggedValue(MT,'video/mp4')
 
-class IFLVFile(IVideoFile):
+class IFLVFile(IVideoFile, IBinaryFile):
     """Macromedia Flash FLV Video File Format"""
 IFLVFile.setTaggedValue(MTM,re.compile('video/x-flv'))
 IFLVFile.setTaggedValue(MT,'video/x-flv')
 
-class IASFFile(IVideoFile):
+class IASFFile(IVideoFile, IBinaryFile):
     """Windows Media File Format"""
 IASFFile.setTaggedValue(MTM,re.compile('video/x-ms-asf'))
 IASFFile.setTaggedValue(MT,'video/x-ms-asf')
 
-class IAudioFile(ITypedFile):
+class IAudioFile(interface.Interface):
     """audio file"""
-IAudioFile.setTaggedValue(MTM,re.compile('^audio/.+$'))
 
-class IAudioMPEGFile(IAudioFile):
+class IAudioMPEGFile(IAudioFile, IBinaryFile):
     """audio file"""
 IAudioMPEGFile.setTaggedValue(MTM,re.compile('audio/mpeg'))
 IAudioMPEGFile.setTaggedValue(MT,'audio/mpeg')

Modified: z3c.filetype/branches/1.1.0/src/z3c/filetype/magic.txt
===================================================================
--- z3c.filetype/branches/1.1.0/src/z3c/filetype/magic.txt	2007-12-21 10:12:03 UTC (rev 82382)
+++ z3c.filetype/branches/1.1.0/src/z3c/filetype/magic.txt	2007-12-21 11:20:24 UTC (rev 82383)
@@ -22,6 +22,7 @@
   logo.gif --> ['image/gif']
   logo.gif.bz2 --> ['application/x-bzip2']
   mpeglayer3.mp3 --> ['audio/mpeg']
+  noface.bmp --> ['image/bmp']
   test.flv --> ['video/x-flv']
   test.gnutar --> ['application/x-tar']
   test.html --> ['text/html']

Added: z3c.filetype/branches/1.1.0/src/z3c/filetype/testdata/noface.bmp
===================================================================
(Binary files differ)


Property changes on: z3c.filetype/branches/1.1.0/src/z3c/filetype/testdata/noface.bmp
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

More information about the Checkins mailing list