# HG changeset patch
# User cmlenz
# Date 1152467172 0
# Node ID 822089ae65cef76f3f3a8439dd1da21104fa914d
# Parent  5c024cf58ecb46ee96d32e29b21e82c780f685c5
Switch copyright to Edgewall and URLs to markup.edgewall.org.

diff --git a/markup/__init__.py b/markup/__init__.py
--- a/markup/__init__.py
+++ b/markup/__init__.py
@@ -1,15 +1,15 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2006 Christopher Lenz
+# Copyright (C) 2006 Edgewall Software
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
-# are also available at http://markup.cmlenz.net/wiki/License.
+# are also available at http://markup.edgewall.org/wiki/License.
 #
 # This software consists of voluntary contributions made by many
 # individuals. For the exact contribution history, see the revision
-# history and logs, available at http://markup.cmlenz.net/log/.
+# history and logs, available at http://markup.edgewall.org/log/.
 
 """This package provides various means for generating and processing web markup
 (XML or HTML).
diff --git a/markup/builder.py b/markup/builder.py
--- a/markup/builder.py
+++ b/markup/builder.py
@@ -1,15 +1,15 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2006 Christopher Lenz
+# Copyright (C) 2006 Edgewall Software
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
-# are also available at http://markup.cmlenz.net/wiki/License.
+# are also available at http://markup.edgewall.org/wiki/License.
 #
 # This software consists of voluntary contributions made by many
 # individuals. For the exact contribution history, see the revision
-# history and logs, available at http://markup.cmlenz.net/log/.
+# history and logs, available at http://markup.edgewall.org/log/.
 
 from markup.core import Attributes, Namespace, QName, Stream
 
diff --git a/markup/core.py b/markup/core.py
--- a/markup/core.py
+++ b/markup/core.py
@@ -1,15 +1,15 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2006 Christopher Lenz
+# Copyright (C) 2006 Edgewall Software
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
-# are also available at http://markup.cmlenz.net/wiki/License.
+# are also available at http://markup.edgewall.org/wiki/License.
 #
 # This software consists of voluntary contributions made by many
 # individuals. For the exact contribution history, see the revision
-# history and logs, available at http://markup.cmlenz.net/log/.
+# history and logs, available at http://markup.edgewall.org/log/.
 
 """Core classes for markup processing."""
 
diff --git a/markup/eval.py b/markup/eval.py
--- a/markup/eval.py
+++ b/markup/eval.py
@@ -1,15 +1,15 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2006 Christopher Lenz
+# Copyright (C) 2006 Edgewall Software
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
-# are also available at http://markup.cmlenz.net/wiki/License.
+# are also available at http://markup.edgewall.org/wiki/License.
 #
 # This software consists of voluntary contributions made by many
 # individuals. For the exact contribution history, see the revision
-# history and logs, available at http://markup.cmlenz.net/log/.
+# history and logs, available at http://markup.edgewall.org/log/.
 
 """Support for "safe" evaluation of Python expressions."""
 
diff --git a/markup/filters.py b/markup/filters.py
--- a/markup/filters.py
+++ b/markup/filters.py
@@ -1,15 +1,15 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2006 Christopher Lenz
+# Copyright (C) 2006 Edgewall Software
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
-# are also available at http://markup.cmlenz.net/wiki/License.
+# are also available at http://markup.edgewall.org/wiki/License.
 #
 # This software consists of voluntary contributions made by many
 # individuals. For the exact contribution history, see the revision
-# history and logs, available at http://markup.cmlenz.net/log/.
+# history and logs, available at http://markup.edgewall.org/log/.
 
 """Implementation of a number of stream filters."""
 
diff --git a/markup/input.py b/markup/input.py
--- a/markup/input.py
+++ b/markup/input.py
@@ -1,15 +1,15 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2006 Christopher Lenz
+# Copyright (C) 2006 Edgewall Software
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
-# are also available at http://markup.cmlenz.net/wiki/License.
+# are also available at http://markup.edgewall.org/wiki/License.
 #
 # This software consists of voluntary contributions made by many
 # individuals. For the exact contribution history, see the revision
-# history and logs, available at http://markup.cmlenz.net/log/.
+# history and logs, available at http://markup.edgewall.org/log/.
 
 from xml.parsers import expat
 try:
diff --git a/markup/output.py b/markup/output.py
--- a/markup/output.py
+++ b/markup/output.py
@@ -1,15 +1,15 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2006 Christopher Lenz
+# Copyright (C) 2006 Edgewall Software
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
-# are also available at http://markup.cmlenz.net/wiki/License.
+# are also available at http://markup.edgewall.org/wiki/License.
 #
 # This software consists of voluntary contributions made by many
 # individuals. For the exact contribution history, see the revision
-# history and logs, available at http://markup.cmlenz.net/log/.
+# history and logs, available at http://markup.edgewall.org/log/.
 
 """This module provides different kinds of serialization methods for XML event
 streams.
diff --git a/markup/path.py b/markup/path.py
--- a/markup/path.py
+++ b/markup/path.py
@@ -1,15 +1,15 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2006 Christopher Lenz
+# Copyright (C) 2006 Edgewall Software
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
-# are also available at http://markup.cmlenz.net/wiki/License.
+# are also available at http://markup.edgewall.org/wiki/License.
 #
 # This software consists of voluntary contributions made by many
 # individuals. For the exact contribution history, see the revision
-# history and logs, available at http://markup.cmlenz.net/log/.
+# history and logs, available at http://markup.edgewall.org/log/.
 
 """Basic support for evaluating XPath expressions against streams."""
 
diff --git a/markup/plugin.py b/markup/plugin.py
--- a/markup/plugin.py
+++ b/markup/plugin.py
@@ -1,16 +1,16 @@
 # -*- coding: utf-8 -*-
 #
+# Copyright (C) 2006 Edgewall Software
 # Copyright (C) 2006 Matthew Good
-# Copyright (C) 2006 Christopher Lenz
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
-# are also available at http://markup.cmlenz.net/wiki/License.
+# are also available at http://markup.edgewall.org/wiki/License.
 #
 # This software consists of voluntary contributions made by many
 # individuals. For the exact contribution history, see the revision
-# history and logs, available at http://markup.cmlenz.net/log/.
+# history and logs, available at http://markup.edgewall.org/log/.
 
 """Basic support for the template engine plugin API used by TurboGears and
 CherryPy/Buffet.
diff --git a/markup/template.py b/markup/template.py
--- a/markup/template.py
+++ b/markup/template.py
@@ -1,15 +1,15 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2006 Christopher Lenz
+# Copyright (C) 2006 Edgewall Software
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
-# are also available at http://markup.cmlenz.net/wiki/License.
+# are also available at http://markup.edgewall.org/wiki/License.
 #
 # This software consists of voluntary contributions made by many
 # individuals. For the exact contribution history, see the revision
-# history and logs, available at http://markup.cmlenz.net/log/.
+# history and logs, available at http://markup.edgewall.org/log/.
 
 """Template engine that is compatible with Kid (http://kid.lesscode.org) to a
 certain extent.
@@ -704,7 +704,8 @@
                     cls = self._dir_by_name.get(tag.localname)
                     if cls is None:
                         raise BadDirectiveError(tag, pos[0], pos[1])
-                    directives.append(cls(attrib.get(getattr(cls, 'ATTRIBUTE', None), '')))
+                    value = attrib.get(getattr(cls, 'ATTRIBUTE', None), '')
+                    directives.append(cls(value))
                     strip = True
 
                 new_attrib = []
diff --git a/markup/tests/__init__.py b/markup/tests/__init__.py
--- a/markup/tests/__init__.py
+++ b/markup/tests/__init__.py
@@ -1,15 +1,15 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2006 Christopher Lenz
+# Copyright (C) 2006 Edgewall Software
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
-# are also available at http://markup.cmlenz.net/wiki/License.
+# are also available at http://markup.edgewall.org/wiki/License.
 #
 # This software consists of voluntary contributions made by many
 # individuals. For the exact contribution history, see the revision
-# history and logs, available at http://markup.cmlenz.net/log/.
+# history and logs, available at http://markup.edgewall.org/log/.
 
 import doctest
 import unittest
diff --git a/markup/tests/builder.py b/markup/tests/builder.py
--- a/markup/tests/builder.py
+++ b/markup/tests/builder.py
@@ -1,15 +1,15 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2006 Christopher Lenz
+# Copyright (C) 2006 Edgewall Software
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
-# are also available at http://markup.cmlenz.net/wiki/License.
+# are also available at http://markup.edgewall.org/wiki/License.
 #
 # This software consists of voluntary contributions made by many
 # individuals. For the exact contribution history, see the revision
-# history and logs, available at http://markup.cmlenz.net/log/.
+# history and logs, available at http://markup.edgewall.org/log/.
 
 import doctest
 from HTMLParser import HTMLParseError
diff --git a/markup/tests/core.py b/markup/tests/core.py
--- a/markup/tests/core.py
+++ b/markup/tests/core.py
@@ -1,15 +1,15 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2006 Christopher Lenz
+# Copyright (C) 2006 Edgewall Software
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
-# are also available at http://markup.cmlenz.net/wiki/License.
+# are also available at http://markup.edgewall.org/wiki/License.
 #
 # This software consists of voluntary contributions made by many
 # individuals. For the exact contribution history, see the revision
-# history and logs, available at http://markup.cmlenz.net/log/.
+# history and logs, available at http://markup.edgewall.org/log/.
 
 import doctest
 import unittest
diff --git a/markup/tests/eval.py b/markup/tests/eval.py
--- a/markup/tests/eval.py
+++ b/markup/tests/eval.py
@@ -1,15 +1,15 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2006 Christopher Lenz
+# Copyright (C) 2006 Edgewall Software
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
-# are also available at http://markup.cmlenz.net/wiki/License.
+# are also available at http://markup.edgewall.org/wiki/License.
 #
 # This software consists of voluntary contributions made by many
 # individuals. For the exact contribution history, see the revision
-# history and logs, available at hhttp://markup.cmlenz.net/log/.
+# history and logs, available at hhttp://markup.edgewall.org/log/.
 
 import doctest
 import unittest
diff --git a/markup/tests/input.py b/markup/tests/input.py
--- a/markup/tests/input.py
+++ b/markup/tests/input.py
@@ -1,15 +1,15 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2006 Christopher Lenz
+# Copyright (C) 2006 Edgewall Software
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
-# are also available at http://markup.cmlenz.net/wiki/License.
+# are also available at http://markup.edgewall.org/wiki/License.
 #
 # This software consists of voluntary contributions made by many
 # individuals. For the exact contribution history, see the revision
-# history and logs, available at http://markup.cmlenz.net/log/.
+# history and logs, available at http://markup.edgewall.org/log/.
 
 import doctest
 import unittest
diff --git a/markup/tests/output.py b/markup/tests/output.py
--- a/markup/tests/output.py
+++ b/markup/tests/output.py
@@ -1,15 +1,15 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2006 Christopher Lenz
+# Copyright (C) 2006 Edgewall Software
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
-# are also available at http://markup.cmlenz.net/wiki/License.
+# are also available at http://markup.edgewall.org/wiki/License.
 #
 # This software consists of voluntary contributions made by many
 # individuals. For the exact contribution history, see the revision
-# history and logs, available at http://markup.cmlenz.net/log/.
+# history and logs, available at http://markup.edgewall.org/log/.
 
 import doctest
 import unittest
diff --git a/markup/tests/path.py b/markup/tests/path.py
--- a/markup/tests/path.py
+++ b/markup/tests/path.py
@@ -1,15 +1,15 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2006 Christopher Lenz
+# Copyright (C) 2006 Edgewall Software
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
-# are also available at http://markup.cmlenz.net/wiki/License.
+# are also available at http://markup.edgewall.org/wiki/License.
 #
 # This software consists of voluntary contributions made by many
 # individuals. For the exact contribution history, see the revision
-# history and logs, available at http://markup.cmlenz.net/log/.
+# history and logs, available at http://markup.edgewall.org/log/.
 
 import doctest
 import unittest
diff --git a/markup/tests/template.py b/markup/tests/template.py
--- a/markup/tests/template.py
+++ b/markup/tests/template.py
@@ -1,15 +1,15 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2006 Christopher Lenz
+# Copyright (C) 2006 Edgewall Software
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
-# are also available at http://markup.cmlenz.net/wiki/License.
+# are also available at http://markup.edgewall.org/wiki/License.
 #
 # This software consists of voluntary contributions made by many
 # individuals. For the exact contribution history, see the revision
-# history and logs, available at http://markup.cmlenz.net/log/.
+# history and logs, available at http://markup.edgewall.org/log/.
 
 import doctest
 import unittest
diff --git a/setup.cfg b/setup.cfg
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,8 +1,3 @@
 [egg_info]
 tag_build = dev
 tag_svn_revision = true
-
-[unittest]
-xml-results = build/test-results.xml
-coverage-summary = build/test-coverage.txt
-coverage-dir = build/coverage
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -1,24 +1,24 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2006 Christopher Lenz
+# Copyright (C) 2006 Edgewall Software
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
-# are also available at http://markup.cmlenz.net/wiki/License.
+# are also available at http://markup.edgewall.org/wiki/License.
 #
 # This software consists of voluntary contributions made by many
 # individuals. For the exact contribution history, see the revision
-# history and logs, available at http://markup.cmlenz.net/log/.
+# history and logs, available at http://markup.edgewall.org/log/.
 
 from setuptools import setup, find_packages
 
 setup(
     name='Markup', version='0.1',
     description='Toolkit for stream-based generation of markup for the web',
-    author='Christopher Lenz', author_email='cmlenz@gmx.net',
-    license='BSD', url='http://markup.cmlenz.net/',
+    author='Edgewall Software', author_email='info@edgewall.org',
+    license='BSD', url='http://markup.edgewall.org/',
     packages=find_packages(exclude=['*.tests*']),
     test_suite = 'markup.tests.suite',
     zip_safe = True,