[Plone-cvs] r34607 - in plone.app.blob/trunk: docs src/plone/app/blob

[Andreas Z. <svn...@pl...>]

Author: witsch
Date: Sat Mar  6 22:23:32 2010
New Revision: 34607

Modified:
   plone.app.blob/trunk/docs/HISTORY.txt
   plone.app.blob/trunk/src/plone/app/blob/field.py
Log:
revert r34002, i.e. the use of a URL normalizer when generating content ids.  it doesn't have any effect on #8591, which — as it turns out — was the motivation for requesting the change.  the generated content id has nothing to do with download filenames, however.  the latter should actually be fixed to allow unicode in order to return the original filename, but that will require more changes and probably also a PLIP.  for now the previous behavior gets reinstated. (refs #8591)

Modified: plone.app.blob/trunk/docs/HISTORY.txt
==============================================================================
--- plone.app.blob/trunk/docs/HISTORY.txt	(original)
+++ plone.app.blob/trunk/docs/HISTORY.txt	Sat Mar  6 22:23:32 2010
@@ -4,6 +4,11 @@
 1.0b14 - Unreleased
 -------------------
 
+- Revert the change to use the URL normalizer when generating content ids
+  based on filename and reinstate the previous (and expected) behavior.
+  Refs http://dev.plone.org/plone/ticket/8591
+  [witsch]
+
 
 1.0b13 - 2010-03-06
 -------------------

Modified: plone.app.blob/trunk/src/plone/app/blob/field.py
==============================================================================
--- plone.app.blob/trunk/src/plone/app/blob/field.py	(original)
+++ plone.app.blob/trunk/src/plone/app/blob/field.py	Sat Mar  6 22:23:32 2010
@@ -21,7 +21,6 @@
 from Products.Archetypes.utils import contentDispositionHeader
 
 from plone.i18n.normalizer.interfaces import IUserPreferredFileNameNormalizer
-from plone.i18n.normalizer.interfaces import IUserPreferredURLNormalizer
 from plone.app.blob.interfaces import IBlobbable, IWebDavUpload, IBlobField
 from plone.app.blob.interfaces import IBlobWrapper
 from plone.app.blob.iterators import BlobStreamIterator
@@ -224,7 +223,7 @@
                     return      # don't rename now if AT should do it from title
             if not isinstance(filename, unicode):
                 filename = unicode(filename, instance.getCharset())
-            filename = IUserPreferredURLNormalizer(request).normalize(filename)
+            filename = IUserPreferredFileNameNormalizer(request).normalize(filename)
             if filename and not filename == instance.getId():
                 # a file name was given, so the instance needs to be renamed...
                 # a subtransaction is applied, since without it renaming