-
-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #24 from plone/scale-factories
use latest plone.scale scaling factories
- Loading branch information
Showing
17 changed files
with
687 additions
and
543 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,18 @@ | ||
| # -*- coding: utf-8 -*- | ||
| try: | ||
| from plone.supermodel.exportimport import ObjectHandler | ||
| HAVE_SUPERMODEL = True | ||
| except ImportError: | ||
| HAVE_SUPERMODEL = False | ||
| from plone.supermodel.exportimport import ObjectHandler | ||
| from plone.namedfile import field | ||
|
|
||
| if HAVE_SUPERMODEL: | ||
| from plone.namedfile import field | ||
|
|
||
| class FileFieldHandler(ObjectHandler): | ||
| filteredAttributes = ObjectHandler.filteredAttributes.copy() | ||
| filteredAttributes.update({ | ||
| 'default': 'rw', | ||
| 'missing_value': 'rw', | ||
| 'schema': 'rw' | ||
| }) | ||
| class FileFieldHandler(ObjectHandler): | ||
| filteredAttributes = ObjectHandler.filteredAttributes.copy() | ||
| filteredAttributes.update({ | ||
| 'default': 'rw', | ||
| 'missing_value': 'rw', | ||
| 'schema': 'rw' | ||
| }) | ||
|
|
||
| NamedFileHandler = FileFieldHandler(field.NamedFile) | ||
| NamedImageHandler = FileFieldHandler(field.NamedImage) | ||
| NamedFileHandler = FileFieldHandler(field.NamedFile) | ||
| NamedImageHandler = FileFieldHandler(field.NamedImage) | ||
|
|
||
| NamedBlobFileHandler = FileFieldHandler(field.NamedBlobFile) | ||
| NamedBlobImageHandler = FileFieldHandler(field.NamedBlobImage) | ||
| NamedBlobFileHandler = FileFieldHandler(field.NamedBlobFile) | ||
| NamedBlobImageHandler = FileFieldHandler(field.NamedBlobImage) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,100 +1,98 @@ | ||
| # -*- coding: utf-8 -*- | ||
| try: | ||
| from plone.rfc822.defaultfields import BaseFieldMarshaler | ||
| HAVE_MARSHALER = True | ||
| except ImportError: | ||
| HAVE_MARSHALER = False | ||
|
|
||
| if HAVE_MARSHALER: | ||
|
|
||
| from email.Encoders import encode_base64 | ||
| from plone.namedfile import NamedBlobFile | ||
| from plone.namedfile import NamedBlobImage | ||
| from plone.namedfile import NamedFile | ||
| from plone.namedfile import NamedImage | ||
| from plone.namedfile.interfaces import INamedBlobFileField | ||
| from plone.namedfile.interfaces import INamedBlobImageField | ||
| from plone.namedfile.interfaces import INamedFileField | ||
| from plone.namedfile.interfaces import INamedImageField | ||
| from zope.component import adapter | ||
| from zope.interface import Interface | ||
|
|
||
| class BaseNamedFileFieldMarshaler(BaseFieldMarshaler): | ||
| """Base marshaler for plone.namedfile values. Actual adapters are | ||
| registered as subclasses. | ||
| """ | ||
| from email.Encoders import encode_base64 | ||
| from plone.namedfile import NamedBlobFile | ||
| from plone.namedfile import NamedBlobImage | ||
| from plone.namedfile import NamedFile | ||
| from plone.namedfile import NamedImage | ||
| from plone.namedfile.interfaces import INamedBlobFileField | ||
| from plone.namedfile.interfaces import INamedBlobImageField | ||
| from plone.namedfile.interfaces import INamedFileField | ||
| from plone.namedfile.interfaces import INamedImageField | ||
| from plone.rfc822.defaultfields import BaseFieldMarshaler | ||
| from zope.component import adapter | ||
| from zope.interface import Interface | ||
|
|
||
|
|
||
| class BaseNamedFileFieldMarshaler(BaseFieldMarshaler): | ||
| """Base marshaler for plone.namedfile values. Actual adapters are | ||
| registered as subclasses. | ||
| """ | ||
|
|
||
| ascii = False | ||
| factory = None | ||
|
|
||
| def encode(self, value, charset='utf-8', primary=False): | ||
| # we only support encoding a file value in the body of a message, | ||
| # never in a header | ||
| if not primary: | ||
| raise ValueError( | ||
| 'File fields can only be marshaled as primary fields') | ||
| if value is None: | ||
| return None | ||
| return value.data | ||
|
|
||
| def decode( | ||
| self, | ||
| value, | ||
| message=None, | ||
| charset='utf-8', | ||
| contentType=None, | ||
| primary=False): | ||
| filename = None | ||
| if primary and message is not None: | ||
| filename = message.get_filename(None) | ||
| return self.factory(value, contentType or '', filename) | ||
|
|
||
| def getContentType(self): | ||
| value = self._query() | ||
| if value is None: | ||
| return None | ||
| return value.contentType | ||
|
|
||
| def getCharset(self, default='utf-8'): | ||
| ascii = False | ||
| factory = None | ||
|
|
||
| def encode(self, value, charset='utf-8', primary=False): | ||
| # we only support encoding a file value in the body of a message, | ||
| # never in a header | ||
| if not primary: | ||
| raise ValueError( | ||
| 'File fields can only be marshaled as primary fields') | ||
| if value is None: | ||
| return None | ||
| return value.data | ||
|
|
||
| def postProcessMessage(self, message): | ||
| """Encode message as base64 and set content disposition | ||
| """ | ||
| value = self._query() | ||
| if value is not None: | ||
| filename = value.filename | ||
| if filename: | ||
| message.add_header('Content-Disposition', 'attachment') | ||
| message.set_param( | ||
| 'filename', | ||
| filename.encode('utf-8'), | ||
| header='Content-Disposition', | ||
| charset='utf-8' | ||
| ) | ||
|
|
||
| encode_base64(message) | ||
|
|
||
| @adapter(Interface, INamedFileField) | ||
| class NamedFileFieldMarshaler(BaseNamedFileFieldMarshaler): | ||
| """Marshaler for an INamedFile field | ||
| """ | ||
| factory = NamedFile | ||
| def decode( | ||
| self, | ||
| value, | ||
| message=None, | ||
| charset='utf-8', | ||
| contentType=None, | ||
| primary=False): | ||
| filename = None | ||
| if primary and message is not None: | ||
| filename = message.get_filename(None) | ||
| return self.factory(value, contentType or '', filename) | ||
|
|
||
| @adapter(Interface, INamedImageField) | ||
| class NamedImageFieldMarshaler(BaseNamedFileFieldMarshaler): | ||
| """Marshaler for an INamedImage field | ||
| """ | ||
| factory = NamedImage | ||
| def getContentType(self): | ||
| value = self._query() | ||
| if value is None: | ||
| return None | ||
| return value.contentType | ||
|
|
||
| @adapter(Interface, INamedBlobFileField) | ||
| class NamedBlobFileFieldMarshaler(BaseNamedFileFieldMarshaler): | ||
| """Marshaler for an INamedBlobFile field | ||
| """ | ||
| factory = NamedBlobFile | ||
| def getCharset(self, default='utf-8'): | ||
| return None | ||
|
|
||
| @adapter(Interface, INamedBlobImageField) | ||
| class NamedBlobImageFieldMarshaler(BaseNamedFileFieldMarshaler): | ||
| """Marshaler for an INamedBlobImage field | ||
| def postProcessMessage(self, message): | ||
| """Encode message as base64 and set content disposition | ||
| """ | ||
| factory = NamedBlobImage | ||
| value = self._query() | ||
| if value is not None: | ||
| filename = value.filename | ||
| if filename: | ||
| message.add_header('Content-Disposition', 'attachment') | ||
| message.set_param( | ||
| 'filename', | ||
| filename.encode('utf-8'), | ||
| header='Content-Disposition', | ||
| charset='utf-8' | ||
| ) | ||
|
|
||
| encode_base64(message) | ||
|
|
||
|
|
||
| @adapter(Interface, INamedFileField) | ||
| class NamedFileFieldMarshaler(BaseNamedFileFieldMarshaler): | ||
| """Marshaler for an INamedFile field | ||
| """ | ||
| factory = NamedFile | ||
|
|
||
|
|
||
| @adapter(Interface, INamedImageField) | ||
| class NamedImageFieldMarshaler(BaseNamedFileFieldMarshaler): | ||
| """Marshaler for an INamedImage field | ||
| """ | ||
| factory = NamedImage | ||
|
|
||
|
|
||
| @adapter(Interface, INamedBlobFileField) | ||
| class NamedBlobFileFieldMarshaler(BaseNamedFileFieldMarshaler): | ||
| """Marshaler for an INamedBlobFile field | ||
| """ | ||
| factory = NamedBlobFile | ||
|
|
||
|
|
||
| @adapter(Interface, INamedBlobImageField) | ||
| class NamedBlobImageFieldMarshaler(BaseNamedFileFieldMarshaler): | ||
| """Marshaler for an INamedBlobImage field | ||
| """ | ||
| factory = NamedBlobImage |
Oops, something went wrong.