[Repoze-checkins] r1250 - in repoze.monty: . branches tags trunk trunk/repoze trunk/repoze/monty
Chris McDonough
chrism at agendaless.com
Tue Jul 8 18:44:04 EDT 2008
Author: Chris McDonough <chrism at agendaless.com>
Date: Tue Jul 8 18:44:03 2008
New Revision: 1250
Log:
Get started on monty.
Added:
repoze.monty/
repoze.monty/branches/
repoze.monty/tags/
repoze.monty/trunk/ (props changed)
repoze.monty/trunk/CHANGES.txt (contents, props changed)
repoze.monty/trunk/COPYRIGHT.txt (contents, props changed)
repoze.monty/trunk/LICENSE.txt (contents, props changed)
repoze.monty/trunk/README.txt (contents, props changed)
repoze.monty/trunk/TODO.txt (contents, props changed)
repoze.monty/trunk/ez_setup.py (contents, props changed)
repoze.monty/trunk/repoze/
repoze.monty/trunk/repoze/__init__.py (contents, props changed)
repoze.monty/trunk/repoze/monty/
repoze.monty/trunk/repoze/monty/__init__.py (contents, props changed)
repoze.monty/trunk/repoze/monty/tests.py (contents, props changed)
repoze.monty/trunk/setup.py (contents, props changed)
Added: repoze.monty/trunk/CHANGES.txt
==============================================================================
--- (empty file)
+++ repoze.monty/trunk/CHANGES.txt Tue Jul 8 18:44:03 2008
@@ -0,0 +1,4 @@
+0.1
+
+ Initial release.
+
Added: repoze.monty/trunk/COPYRIGHT.txt
==============================================================================
--- (empty file)
+++ repoze.monty/trunk/COPYRIGHT.txt Tue Jul 8 18:44:03 2008
@@ -0,0 +1,3 @@
+Copyright (c) 2008 Agendaless Consulting and Contributors.
+(http://www.agendaless.com), All Rights Reserved
+
Added: repoze.monty/trunk/LICENSE.txt
==============================================================================
--- (empty file)
+++ repoze.monty/trunk/LICENSE.txt Tue Jul 8 18:44:03 2008
@@ -0,0 +1,41 @@
+License
+
+ A copyright notice accompanies this license document that identifies
+ the copyright holders.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+
+ 1. Redistributions in source code must retain the accompanying
+ copyright notice, this list of conditions, and the following
+ disclaimer.
+
+ 2. Redistributions in binary form must reproduce the accompanying
+ copyright notice, this list of conditions, and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+
+ 3. Names of the copyright holders must not be used to endorse or
+ promote products derived from this software without prior
+ written permission from the copyright holders.
+
+ 4. If any files are modified, you must cause the modified files to
+ carry prominent notices stating that you changed the files and
+ the date of any change.
+
+ Disclaimer
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND
+ ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
Added: repoze.monty/trunk/README.txt
==============================================================================
--- (empty file)
+++ repoze.monty/trunk/README.txt Tue Jul 8 18:44:03 2008
@@ -0,0 +1 @@
+A readme file.
Added: repoze.monty/trunk/TODO.txt
==============================================================================
--- (empty file)
+++ repoze.monty/trunk/TODO.txt Tue Jul 8 18:44:03 2008
@@ -0,0 +1 @@
+List todo items here.
Added: repoze.monty/trunk/ez_setup.py
==============================================================================
--- (empty file)
+++ repoze.monty/trunk/ez_setup.py Tue Jul 8 18:44:03 2008
@@ -0,0 +1,272 @@
+#!python
+"""Bootstrap setuptools installation
+
+If you want to use setuptools in your package's setup.py, just include this
+file in the same directory with it, and add this to the top of your setup.py::
+
+ from ez_setup import use_setuptools
+ use_setuptools()
+
+If you want to require a specific version of setuptools, set a download
+mirror, or use an alternate download directory, you can do so by supplying
+the appropriate options to ``use_setuptools()``.
+
+This file can also be run as a script to install or upgrade setuptools.
+"""
+import sys
+DEFAULT_VERSION = "0.6c8"
+DEFAULT_URL = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3]
+
+md5_data = {
+ 'setuptools-0.6b1-py2.3.egg': '8822caf901250d848b996b7f25c6e6ca',
+ 'setuptools-0.6b1-py2.4.egg': 'b79a8a403e4502fbb85ee3f1941735cb',
+ 'setuptools-0.6b2-py2.3.egg': '5657759d8a6d8fc44070a9d07272d99b',
+ 'setuptools-0.6b2-py2.4.egg': '4996a8d169d2be661fa32a6e52e4f82a',
+ 'setuptools-0.6b3-py2.3.egg': 'bb31c0fc7399a63579975cad9f5a0618',
+ 'setuptools-0.6b3-py2.4.egg': '38a8c6b3d6ecd22247f179f7da669fac',
+ 'setuptools-0.6b4-py2.3.egg': '62045a24ed4e1ebc77fe039aa4e6f7e5',
+ 'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4',
+ 'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c',
+ 'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b',
+ 'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27',
+ 'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277',
+ 'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa',
+ 'setuptools-0.6c3-py2.4.egg': 'e0ed74682c998bfb73bf803a50e7b71e',
+ 'setuptools-0.6c3-py2.5.egg': 'abef16fdd61955514841c7c6bd98965e',
+ 'setuptools-0.6c4-py2.3.egg': 'b0b9131acab32022bfac7f44c5d7971f',
+ 'setuptools-0.6c4-py2.4.egg': '2a1f9656d4fbf3c97bf946c0a124e6e2',
+ 'setuptools-0.6c4-py2.5.egg': '8f5a052e32cdb9c72bcf4b5526f28afc',
+ 'setuptools-0.6c5-py2.3.egg': 'ee9fd80965da04f2f3e6b3576e9d8167',
+ 'setuptools-0.6c5-py2.4.egg': 'afe2adf1c01701ee841761f5bcd8aa64',
+ 'setuptools-0.6c5-py2.5.egg': 'a8d3f61494ccaa8714dfed37bccd3d5d',
+ 'setuptools-0.6c6-py2.3.egg': '35686b78116a668847237b69d549ec20',
+ 'setuptools-0.6c6-py2.4.egg': '3c56af57be3225019260a644430065ab',
+ 'setuptools-0.6c6-py2.5.egg': 'b2f8a7520709a5b34f80946de5f02f53',
+ 'setuptools-0.6c7-py2.3.egg': '209fdf9adc3a615e5115b725658e13e2',
+ 'setuptools-0.6c7-py2.4.egg': '5a8f954807d46a0fb67cf1f26c55a82e',
+ 'setuptools-0.6c7-py2.5.egg': '45d2ad28f9750e7434111fde831e8372',
+ 'setuptools-0.6c8-py2.3.egg': '50759d29b349db8cfd807ba8303f1902',
+ 'setuptools-0.6c8-py2.4.egg': 'cba38d74f7d483c06e9daa6070cce6de',
+ 'setuptools-0.6c8-py2.5.egg': '1721747ee329dc150590a58b3e1ac95b',
+}
+
+import sys, os
+
+def _validate_md5(egg_name, data):
+ if egg_name in md5_data:
+ from md5 import md5
+ digest = md5(data).hexdigest()
+ if digest != md5_data[egg_name]:
+ print >>sys.stderr, (
+ "md5 validation of %s failed! (Possible download problem?)"
+ % egg_name
+ )
+ sys.exit(2)
+ return data
+
+
+def use_setuptools(
+ version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
+ download_delay=15
+):
+ """Automatically find/download setuptools and make it available on sys.path
+
+ `version` should be a valid setuptools version number that is available
+ as an egg for download under the `download_base` URL (which should end with
+ a '/'). `to_dir` is the directory where setuptools will be downloaded, if
+ it is not already available. If `download_delay` is specified, it should
+ be the number of seconds that will be paused before initiating a download,
+ should one be required. If an older version of setuptools is installed,
+ this routine will print a message to ``sys.stderr`` and raise SystemExit in
+ an attempt to abort the calling script.
+ """
+ was_imported = 'pkg_resources' in sys.modules or 'setuptools' in sys.modules
+ def do_download():
+ egg = download_setuptools(version, download_base, to_dir, download_delay)
+ sys.path.insert(0, egg)
+ import setuptools; setuptools.bootstrap_install_from = egg
+ try:
+ import pkg_resources
+ except ImportError:
+ return do_download()
+ try:
+ pkg_resources.require("setuptools>="+version); return
+ except pkg_resources.VersionConflict, e:
+ if was_imported:
+ print >>sys.stderr, (
+ "The required version of setuptools (>=%s) is not available, and\n"
+ "can't be installed while this script is running. Please install\n"
+ " a more recent version first, using 'easy_install -U setuptools'."
+ "\n\n(Currently using %r)"
+ ) % (version, e.args[0])
+ sys.exit(2)
+ else:
+ del pkg_resources, sys.modules['pkg_resources'] # reload ok
+ return do_download()
+ except pkg_resources.DistributionNotFound:
+ return do_download()
+
+def download_setuptools(
+ version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
+ delay = 15
+):
+ """Download setuptools from a specified location and return its filename
+
+ `version` should be a valid setuptools version number that is available
+ as an egg for download under the `download_base` URL (which should end
+ with a '/'). `to_dir` is the directory where the egg will be downloaded.
+ `delay` is the number of seconds to pause before an actual download attempt.
+ """
+ import urllib2, shutil
+ egg_name = "setuptools-%s-py%s.egg" % (version,sys.version[:3])
+ url = download_base + egg_name
+ saveto = os.path.join(to_dir, egg_name)
+ src = dst = None
+ if not os.path.exists(saveto): # Avoid repeated downloads
+ try:
+ from distutils import log
+ if delay:
+ log.warn("""
+---------------------------------------------------------------------------
+This script requires setuptools version %s to run (even to display
+help). I will attempt to download it for you (from
+%s), but
+you may need to enable firewall access for this script first.
+I will start the download in %d seconds.
+
+(Note: if this machine does not have network access, please obtain the file
+
+ %s
+
+and place it in this directory before rerunning this script.)
+---------------------------------------------------------------------------""",
+ version, download_base, delay, url
+ ); from time import sleep; sleep(delay)
+ log.warn("Downloading %s", url)
+ src = urllib2.urlopen(url)
+ # Read/write all in one block, so we don't create a corrupt file
+ # if the download is interrupted.
+ data = _validate_md5(egg_name, src.read())
+ dst = open(saveto,"wb"); dst.write(data)
+ finally:
+ if src: src.close()
+ if dst: dst.close()
+ return os.path.realpath(saveto)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+def main(argv, version=DEFAULT_VERSION):
+ """Install or upgrade setuptools and EasyInstall"""
+ try:
+ import setuptools
+ except ImportError:
+ egg = None
+ try:
+ egg = download_setuptools(version, delay=0)
+ sys.path.insert(0,egg)
+ from setuptools.command.easy_install import main
+ return main(list(argv)+[egg]) # we're done here
+ finally:
+ if egg and os.path.exists(egg):
+ os.unlink(egg)
+ else:
+ if setuptools.__version__ == '0.0.1':
+ print >>sys.stderr, (
+ "You have an obsolete version of setuptools installed. Please\n"
+ "remove it from your system entirely before rerunning this script."
+ )
+ sys.exit(2)
+
+ req = "setuptools>="+version
+ import pkg_resources
+ try:
+ pkg_resources.require(req)
+ except pkg_resources.VersionConflict:
+ try:
+ from setuptools.command.easy_install import main
+ except ImportError:
+ from easy_install import main
+ main(list(argv)+[download_setuptools(delay=0)])
+ sys.exit(0) # try to force an exit
+ else:
+ if argv:
+ from setuptools.command.easy_install import main
+ main(argv)
+ else:
+ print "Setuptools version",version,"or greater has been installed."
+ print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)'
+
+def update_md5(filenames):
+ """Update our built-in md5 registry"""
+
+ import re
+ from md5 import md5
+
+ for name in filenames:
+ base = os.path.basename(name)
+ f = open(name,'rb')
+ md5_data[base] = md5(f.read()).hexdigest()
+ f.close()
+
+ data = [" %r: %r,\n" % it for it in md5_data.items()]
+ data.sort()
+ repl = "".join(data)
+
+ import inspect
+ srcfile = inspect.getsourcefile(sys.modules[__name__])
+ f = open(srcfile, 'rb'); src = f.read(); f.close()
+
+ match = re.search("\nmd5_data = {\n([^}]+)}", src)
+ if not match:
+ print >>sys.stderr, "Internal error!"
+ sys.exit(2)
+
+ src = src[:match.start(1)] + repl + src[match.end(1):]
+ f = open(srcfile,'w')
+ f.write(src)
+ f.close()
+
+
+if __name__=='__main__':
+ if len(sys.argv)>2 and sys.argv[1]=='--md5update':
+ update_md5(sys.argv[2:])
+ else:
+ main(sys.argv[1:])
+
+
+
+
+
Added: repoze.monty/trunk/repoze/__init__.py
==============================================================================
--- (empty file)
+++ repoze.monty/trunk/repoze/__init__.py Tue Jul 8 18:44:03 2008
@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)
Added: repoze.monty/trunk/repoze/monty/__init__.py
==============================================================================
--- (empty file)
+++ repoze.monty/trunk/repoze/monty/__init__.py Tue Jul 8 18:44:03 2008
@@ -0,0 +1,448 @@
+from cgi import FieldStorage
+
+import re
+import tempfile
+
+newlines = re.compile('\r\n|\n\r|\r')
+
+# Flag Constants
+SEQUENCE = 1
+DEFAULT = 2
+RECORD = 4
+RECORDS = 8
+REC = RECORD | RECORDS
+CONVERTED = 32
+DEFAULTABLE_METHODS = 'GET', 'POST', 'HEAD'
+
+class ZopeFieldStorage(FieldStorage):
+
+ def make_file(self, binary=None):
+ return tempfile.NamedTemporaryFile('w+b')
+
+class Record(object):
+
+ _attrs = frozenset(('get', 'keys', 'items', 'values', 'copy',
+ 'has_key', '__contains__'))
+
+ def __getattr__(self, key, default=None):
+ if key in self._attrs:
+ return getattr(self.__dict__, key)
+ raise AttributeError(key)
+
+ def __getitem__(self, key):
+ return self.__dict__[key]
+
+ def __str__(self):
+ items = self.__dict__.items()
+ items.sort()
+ return "{" + ", ".join(["%s: %s" % item for item in items]) + "}"
+
+ def __repr__(self):
+ items = self.__dict__.items()
+ items.sort()
+ return ("{"
+ + ", ".join(["%s: %s" % (key, repr(value))
+ for key, value in items]) + "}")
+
+class FileUpload(object):
+ '''File upload objects
+
+ File upload objects are used to represent file-uploaded data.
+
+ File upload objects can be used just like files.
+
+ In addition, they have a 'headers' attribute that is a dictionary
+ containing the file-upload headers, and a 'filename' attribute
+ containing the name of the uploaded file.
+ '''
+
+ def __init__(self, aFieldStorage):
+
+ file = aFieldStorage.file
+ if hasattr(file, '__methods__'):
+ methods = file.__methods__
+ else:
+ methods = ['close', 'fileno', 'flush', 'isatty',
+ 'read', 'readline', 'readlines', 'seek',
+ 'tell', 'truncate', 'write', 'writelines',
+ 'name']
+
+ d = self.__dict__
+ for m in methods:
+ if hasattr(file,m):
+ d[m] = getattr(file,m)
+
+ self.headers = aFieldStorage.headers
+ self.filename = unicode(aFieldStorage.filename, 'UTF-8')
+
+ArrayTypes = (list, tuple)
+
+def field2string(v):
+ if hasattr(v, 'read'):
+ return v.read()
+ return str(v)
+
+def field2text(v, nl=newlines):
+ return nl.sub("\n", field2string(v))
+
+def field2required(v):
+ v = field2string(v)
+ if not v.strip():
+ raise ValueError('No input for required field<p>')
+ return v
+
+def field2int(v):
+ if isinstance(v, ArrayTypes):
+ return map(field2int, v)
+ v = field2string(v)
+ if not v:
+ raise ValueError('Empty entry when <strong>integer</strong> expected')
+ try:
+ return int(v)
+ except ValueError:
+ raise ValueError("An integer was expected in the value '%s'" % v)
+
+def field2float(v):
+ if isinstance(v, ArrayTypes):
+ return map(field2float, v)
+ v = field2string(v)
+ if not v:
+ raise ValueError(
+ 'Empty entry when <strong>floating-point number</strong> expected')
+ try:
+ return float(v)
+ except ValueError:
+ raise ValueError(
+ "A floating-point number was expected in the value '%s'" % v)
+
+def field2long(v):
+ if isinstance(v, ArrayTypes):
+ return map(field2long, v)
+ v = field2string(v)
+
+ # handle trailing 'L' if present.
+ if v and v[-1].upper() == 'L':
+ v = v[:-1]
+ if not v:
+ raise ValueError('Empty entry when <strong>integer</strong> expected')
+ try:
+ return long(v)
+ except ValueError:
+ raise ValueError("A long integer was expected in the value '%s'" % v)
+
+def field2tokens(v):
+ return field2string(v).split()
+
+def field2lines(v):
+ if isinstance(v, ArrayTypes):
+ return [str(item) for item in v]
+ return field2text(v).splitlines()
+
+def field2boolean(v):
+ return bool(v)
+
+type_converters = {
+ 'float': field2float,
+ 'int': field2int,
+ 'long': field2long,
+ 'string': field2string,
+ 'required': field2required,
+ 'tokens': field2tokens,
+ 'lines': field2lines,
+ 'text': field2text,
+ 'boolean': field2boolean,
+ }
+
+get_converter = type_converters.get
+
+class FieldMarshaller:
+ def __init__(self, environ):
+ self._environ = environ
+ self.method = self._environ.get('REQUEST_METHOD', 'GET')
+ self.charsets = ['utf-8']
+ self.form = {}
+
+ def processInputs(self):
+ 'See IPublisherRequest'
+
+ if self.method not in ('GET', 'HEAD'):
+ # Process self.form if not a GET request.
+ fp = self._environ['wsgi.input']
+ if self.method == 'POST':
+ content_type = self._environ.get('CONTENT_TYPE')
+ if content_type and not (
+ content_type == 'application/x-www-form-urlencoded'
+ or
+ content_type.startswith('multipart/')
+ ):
+ # for non-multi and non-form content types, FieldStorage
+ # consumes the body and we have no good place to put it.
+ # So we just won't call FieldStorage. :)
+ return
+ else:
+ fp = None
+
+ # If 'QUERY_STRING' is not present in self._environ
+ # FieldStorage will try to get it from sys.argv[1]
+ # which is not what we need.
+ if 'QUERY_STRING' not in self._environ:
+ self._environ['QUERY_STRING'] = ''
+
+ fs = ZopeFieldStorage(fp=fp, environ=self._environ,
+ keep_blank_values=1)
+
+ fslist = getattr(fs, 'list', None)
+ if fslist is not None:
+ self.meth = None
+ self.tuple_items = {}
+ self.defaults = {}
+
+ # process all entries in the field storage (form)
+ for item in fslist:
+ self.processItem(item)
+
+ if self.defaults:
+ self.insertDefaults()
+
+ if self.tuple_items:
+ self.convertToTuples()
+
+ if self.meth:
+ self.setPathSuffix((self.meth,))
+
+ return self.form
+
+ _typeFormat = re.compile('([a-zA-Z][a-zA-Z0-9_]+|\\.[xy])$')
+
+ def _decode(self, text):
+ """Try to decode the text using one of the available charsets."""
+ for charset in self.charsets:
+ try:
+ text = unicode(text, charset)
+ break
+ except UnicodeError:
+ pass
+ return text
+
+ def processItem(self, item):
+ """Process item in the field storage."""
+
+ # Check whether this field is a file upload object
+ # Note: A field exists for files, even if no filename was
+ # passed in and no data was uploaded. Therefore we can only
+ # tell by the empty filename that no upload was made.
+ key = item.name
+ if (hasattr(item, 'file') and hasattr(item, 'filename')
+ and hasattr(item,'headers')):
+ if (item.file and
+ (item.filename is not None and item.filename != ''
+ # RFC 1867 says that all fields get a content-type.
+ # or 'content-type' in map(lower, item.headers.keys())
+ )):
+ item = FileUpload(item)
+ else:
+ item = item.value
+
+ flags = 0
+ converter = None
+
+ # Loop through the different types and set
+ # the appropriate flags
+ # Syntax: var_name:type_name
+
+ # We'll search from the back to the front.
+ # We'll do the search in two steps. First, we'll
+ # do a string search, and then we'll check it with
+ # a re search.
+
+ while key:
+ pos = key.rfind(":")
+ if pos < 0:
+ break
+ match = self._typeFormat.match(key, pos + 1)
+ if match is None:
+ break
+
+ key, type_name = key[:pos], key[pos + 1:]
+
+ # find the right type converter
+ c = get_converter(type_name, None)
+
+ if c is not None:
+ converter = c
+ flags |= CONVERTED
+ elif type_name == 'list':
+ flags |= SEQUENCE
+ elif type_name == 'tuple':
+ self.tuple_items[key] = 1
+ flags |= SEQUENCE
+ elif (type_name == 'method' or type_name == 'action'):
+ if key:
+ self.meth = key
+ else:
+ self.meth = item
+ elif (type_name == 'default_method'
+ or type_name == 'default_action') and not self.meth:
+ if key:
+ self.meth = key
+ else:
+ self.meth = item
+ elif type_name == 'default':
+ flags |= DEFAULT
+ elif type_name == 'record':
+ flags |= RECORD
+ elif type_name == 'records':
+ flags |= RECORDS
+ elif type_name == 'ignore_empty' and not item:
+ # skip over empty fields
+ return
+
+ # Make it unicode if not None
+ if key is not None:
+ key = self._decode(key)
+
+ if isinstance(item, str):
+ item = self._decode(item)
+
+ if flags:
+ self.setItemWithType(key, item, flags, converter)
+ else:
+ self.setItemWithoutType(key, item)
+
+ def setItemWithoutType(self, key, item):
+ """Set item value without explicit type."""
+ form = self.form
+ if key not in form:
+ form[key] = item
+ else:
+ found = form[key]
+ if isinstance(found, list):
+ found.append(item)
+ else:
+ form[key] = [found, item]
+
+ def setItemWithType(self, key, item, flags, converter):
+ """Set item value with explicit type."""
+ #Split the key and its attribute
+ if flags & REC:
+ key, attr = self.splitKey(key)
+
+ # defer conversion
+ if flags & CONVERTED:
+ try:
+ item = converter(item)
+ except:
+ if item or flags & DEFAULT or key not in self.defaults:
+ raise
+ item = self.defaults[key]
+ if flags & RECORD:
+ item = getattr(item, attr)
+ elif flags & RECORDS:
+ item = getattr(item[-1], attr)
+
+ # Determine which dictionary to use
+ if flags & DEFAULT:
+ form = self.defaults
+ else:
+ form = self.form
+
+ # Insert in dictionary
+ if key not in form:
+ if flags & SEQUENCE:
+ item = [item]
+ if flags & RECORD:
+ r = form[key] = Record()
+ setattr(r, attr, item)
+ elif flags & RECORDS:
+ r = Record()
+ setattr(r, attr, item)
+ form[key] = [r]
+ else:
+ form[key] = item
+ else:
+ r = form[key]
+ if flags & RECORD:
+ if not flags & SEQUENCE:
+ setattr(r, attr, item)
+ else:
+ if not hasattr(r, attr):
+ setattr(r, attr, [item])
+ else:
+ getattr(r, attr).append(item)
+ elif flags & RECORDS:
+ last = r[-1]
+ if not hasattr(last, attr):
+ if flags & SEQUENCE:
+ item = [item]
+ setattr(last, attr, item)
+ else:
+ if flags & SEQUENCE:
+ getattr(last, attr).append(item)
+ else:
+ new = Record()
+ setattr(new, attr, item)
+ r.append(new)
+ else:
+ if isinstance(r, list):
+ r.append(item)
+ else:
+ form[key] = [r, item]
+
+ def splitKey(self, key):
+ """Split the key and its attribute."""
+ i = key.rfind(".")
+ if i >= 0:
+ return key[:i], key[i + 1:]
+ return key, ""
+
+ def convertToTuples(self):
+ """Convert form values to tuples."""
+ form = self.form
+
+ for key in self.tuple_items:
+ if key in form:
+ form[key] = tuple(form[key])
+ else:
+ k, attr = self.splitKey(key)
+
+ # remove any type_names in the attr
+ i = attr.find(":")
+ if i >= 0:
+ attr = attr[:i]
+
+ if k in form:
+ item = form[k]
+ if isinstance(item, Record):
+ if hasattr(item, attr):
+ setattr(item, attr, tuple(getattr(item, attr)))
+ else:
+ for v in item:
+ if hasattr(v, attr):
+ setattr(v, attr, tuple(getattr(v, attr)))
+
+ def insertDefaults(self):
+ """Insert defaults into form dictionary."""
+ form = self.form
+
+ for keys, values in self.defaults.iteritems():
+ if not keys in form:
+ form[keys] = values
+ else:
+ item = form[keys]
+ if isinstance(values, Record):
+ for k, v in values.items():
+ if not hasattr(item, k):
+ setattr(item, k, v)
+ elif isinstance(values, list):
+ for val in values:
+ if isinstance(val, Record):
+ for k, v in val.items():
+ for r in item:
+ if not hasattr(r, k):
+ setattr(r, k, v)
+ elif not val in item:
+ item.append(val)
+
+def marshal(environ):
+ marshaller = FieldMarshaller(environ)
+ return marshaller.processInputs()
Added: repoze.monty/trunk/repoze/monty/tests.py
==============================================================================
--- (empty file)
+++ repoze.monty/trunk/repoze/monty/tests.py Tue Jul 8 18:44:03 2008
@@ -0,0 +1,53 @@
+import unittest
+
+class TestMarshal(unittest.TestCase):
+ def _getFUT(self):
+ from repoze.monty import marshal
+ return marshal
+
+ def test_empty_GET(self):
+ f = self._getFUT()
+ self.assertEqual(f({}), {})
+
+ def _makeEnviron(self, kw=None):
+ if kw is None:
+ kw = {}
+ env = {
+ 'wsgi.url_scheme': 'http',
+ 'SERVER_NAME': 'localhost',
+ 'SERVER_PORT': '8080',
+ 'REQUEST_METHOD':'POST',
+ 'PATH_INFO': '/',
+ 'QUERY_STRING':'',
+ }
+ env.update(kw)
+ return env
+
+ def test_multipart_form_POST_noconvert(self):
+ fields = [('login', 'login'),
+ ('password', 'password')]
+ ct, body = encode_multipart_formdata(fields)
+ from StringIO import StringIO
+ kw = dict(CONTENT_TYPE=ct, REQUEST_METHOD='POST')
+ kw['wsgi.input'] = StringIO(body)
+ environ = self._makeEnviron(kw)
+ f = self._getFUT()
+ result = f(environ)
+ self.assertEqual(result['login'], u'login')
+ self.assertEqual(result['password'], u'password')
+
+def encode_multipart_formdata(fields):
+ BOUNDARY = '----------ThIs_Is_tHe_bouNdaRY_$'
+ CRLF = '\r\n'
+ L = []
+ for (key, value) in fields:
+ L.append('--' + BOUNDARY)
+ L.append('Content-Disposition: form-data; name="%s"' % key)
+ L.append('')
+ L.append(value)
+ L.append('--' + BOUNDARY + '--')
+ L.append('')
+ body = CRLF.join(L)
+ content_type = 'multipart/form-data; boundary=%s' % BOUNDARY
+ return content_type, body
+
Added: repoze.monty/trunk/setup.py
==============================================================================
--- (empty file)
+++ repoze.monty/trunk/setup.py Tue Jul 8 18:44:03 2008
@@ -0,0 +1,55 @@
+##############################################################################
+#
+# Copyright (c) 2008 Agendaless Consulting and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the BSD-like license at
+# http://www.repoze.org/LICENSE.txt. A copy of the license should accompany
+# this distribution. THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL
+# EXPRESS OR IMPLIED WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND
+# FITNESS FOR A PARTICULAR PURPOSE
+#
+##############################################################################
+
+__version__ = '0.1'
+
+import os
+
+from ez_setup import use_setuptools
+use_setuptools()
+
+from setuptools import setup, find_packages
+
+here = os.path.abspath(os.path.dirname(__file__))
+README = open(os.path.join(here, 'README.txt')).read()
+CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
+
+setup(name='repoze.monty',
+ version=__version__,
+ description='A form field marshaller for WSGI (stolen from Zope)',
+ long_description=README + '\n\n' + CHANGES,
+ classifiers=[
+ "Development Status :: 3 - Alpha",
+ "Intended Audience :: Developers",
+ "Programming Language :: Python",
+ "Topic :: Internet :: WWW/HTTP",
+ "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
+ "Topic :: Internet :: WWW/HTTP :: WSGI",
+ ],
+ keywords='web wsgi zope',
+ author="Agendaless Consulting",
+ author_email="repoze-dev at lists.repoze.org",
+ url="http://www.repoze.org",
+ license="BSD-derived (http://www.repoze.org/LICENSE.txt)",
+ packages=find_packages(),
+ include_package_data=True,
+ namespace_packages=['repoze'],
+ zip_safe=False,
+ tests_require = [],
+ install_requires=[],
+ test_suite="repoze.monty.tests",
+ entry_points = """\
+ """
+ )
+
More information about the Repoze-checkins
mailing list