From 7c1dbdc73218337034e54b8b32472d8851ad5e6f Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Fri, 17 May 2013 13:16:56 +0200
Subject: [PATCH] backport util module from bluebream branch

---
 organize/interfaces.py |  2 +-
 util/__init__.py       | 20 --------------------
 util/util.py           | 40 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 21 deletions(-)
 create mode 100644 util/util.py

diff --git a/organize/interfaces.py b/organize/interfaces.py
index afc3568..27bccf5 100644
--- a/organize/interfaces.py
+++ b/organize/interfaces.py
@@ -28,7 +28,7 @@ from zope.i18nmessageid import MessageFactory
 from cybertools.composer.schema.factory import Email
 from cybertools.tracking.interfaces import ITrack
 from cybertools.util.jeep import Jeep, Term
-from cybertools.util import KeywordVocabulary
+from cybertools.util.util import KeywordVocabulary
 
 _ = MessageFactory('cybertools.organize')
 
diff --git a/util/__init__.py b/util/__init__.py
index 20f22a4..8ee1202 100644
--- a/util/__init__.py
+++ b/util/__init__.py
@@ -1,23 +1,3 @@
 """
 common utilities
 """
-
-from zope.schema import vocabulary
-
-
-class KeywordVocabulary(vocabulary.SimpleVocabulary):
-
-    def __init__(self, items, *interfaces):
-        """ ``items`` may be a tuple of (token, title) or a dictionary
-            with corresponding elements named 'token' and 'title'.
-        """
-        terms = []
-        for t in items:
-            if type(t) is dict:
-                token, title = t['token'], t['title']
-            else:
-                token, title = t
-            terms.append(vocabulary.SimpleTerm(token, token, title))
-        super(KeywordVocabulary, self).__init__(terms, *interfaces)
-
-
diff --git a/util/util.py b/util/util.py
new file mode 100644
index 0000000..baa4af6
--- /dev/null
+++ b/util/util.py
@@ -0,0 +1,40 @@
+#
+#  Copyright (c) 2013 Helmut Merz helmutm@cy55.de
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
+"""
+Utility functions.
+"""
+
+from zope.schema import vocabulary
+
+
+class KeywordVocabulary(vocabulary.SimpleVocabulary):
+
+    def __init__(self, items, *interfaces):
+        """ ``items`` may be a tuple of (token, title) or a dictionary
+            with corresponding elements named 'token' and 'title'.
+        """
+        terms = []
+        for t in items:
+            if type(t) is dict:
+                token, title = t['token'], t['title']
+            else:
+                token, title = t
+            terms.append(vocabulary.SimpleTerm(token, token, title))
+        super(KeywordVocabulary, self).__init__(terms, *interfaces)
+