Index: /main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_browser.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_browser.py	(revision 7851)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_browser.py	(revision 7852)
@@ -798,7 +798,7 @@
         self.browser.getControl(name="form.lastname").value = 'Tester'
         self.browser.getControl(name="form.email").value = 'xx@yy.zz'
-        self.browser.getControl(name="form.phone.country").value = '234'
+        self.browser.getControl(name="form.phone.country").value = ['+234']
         self.browser.getControl(name="form.phone.area").value = '555'
-        self.browser.getControl(name="form.phone.extension").value = '6666666'
+        self.browser.getControl(name="form.phone.ext").value = '6666666'
         self.browser.getControl("Get login credentials").click()
         self.assertEqual(self.browser.url,
Index: /main/waeup.kofa/trunk/src/waeup/kofa/widgets/phonewidget.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/widgets/phonewidget.py	(revision 7851)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/widgets/phonewidget.py	(revision 7852)
@@ -44,207 +44,4 @@
 from zope.schema.interfaces import RequiredMissing
 
-class IPhoneData(Interface):
-    """A schema used to generate a Phone widget."""
-
-    country = schema.TextLine(
-        title=u'Country Code',
-        description=u'The country code of the phone number.',
-        min_length=1,
-        constraint=re.compile(r'^[0-9]+$').search,
-        default=u'234', # int. code for nigeria
-        required=True)
-
-    area = schema.TextLine(
-        title=u'Area Code',
-        description=u'The area code of the phone number.',
-        min_length=1,
-        constraint=re.compile(r'^[0-9]+$').search,
-        required=True)
-
-    extension = schema.TextLine(
-        title=u'Direct Line',
-        description=u'The direct line of the phone number.',
-        min_length=3,
-        constraint=re.compile(r'^[0-9]{3,}$').search,
-        required=True)
-
-class PhoneWidgetData(object):
-    """Phone number data"""
-    implements(IPhoneData)
-
-    country = None
-    area = None
-    extension = None
-
-    def __init__(self, context=None, number=None):
-        """Set countrycode, areacode, and extension line from number.
-        """
-        self.context = context
-        if number is None:
-            return
-        # handle other types than strings.
-        if not isinstance(number, basestring):
-            number = str(number)
-        parts = number.split('-', 2)
-        if len(parts) == 2:
-            parts = [None,] + parts
-        elif len(parts) == 0:
-            return
-        elif len(parts) == 1:
-            parts = [None, None] + parts
-        self.country, self.area, self.extension = parts
-        return
-
-    @property
-    def number(self):
-        """Return a valid phone number string of format ``<IC>-<AC>-<EL>``.
-
-        where <IC> is the country code (digits only), <AC> is the area
-        code and <EL> is the extension line.
-        """
-        return u'-'.join(
-            (self.country or '', self.area or '', self.extension))
-
-
-class PhoneWidget(SimpleInputWidget):
-    """Phone Number Widget"""
-    implements(IBrowserWidget, IInputWidget)
-
-    template = ViewPageTemplateFile('phonewidget.pt')
-    _prefix = 'field.'
-    _error = None
-    widgets = {}
-
-    # See zope.formlib.interfaces.IWidget
-    name = None
-    visible = True
-
-    def __init__(self, field, request):
-        super(PhoneWidget, self).__init__(field, request)
-        value = field.query(field.context)
-        self._generateSubWidgets()
-        return
-
-    def _generateSubWidgets(self):
-        """Create the three subwidgets.
-        """
-        value = self.context.query(self.context.context)
-        # We have to modify the adapter according to our own
-        # 'required' state. Some ugly workaround
-        adapter = copy.deepcopy(IPhoneData)
-        for name in 'country', 'area', 'extension':
-            adapter[name].required = self.required
-        adapters = {adapter: PhoneWidgetData(self, value)}
-        self.widgets = form.setUpEditWidgets(
-            form.FormFields(IPhoneData),
-            self.name, value, self.request, adapters=adapters)
-        # The displayWidth cant'be set
-        # because it is overridden by Bootstrap css classes
-        #self.widgets['country'].displayWidth = 3
-        #self.widgets['area'].displayWidth = 5
-        #self.widgets['extension'].displayWidth = 10
-        # We have to set the cssClass attributes
-        self.widgets['country'].cssClass = 'span2'
-        self.widgets['area'].cssClass = 'span2'
-        self.widgets['extension'].cssClass = 'span3'
-
-        return
-
-    def setRenderedValue(self, value):
-        """See zope.formlib.interfaces.IWidget"""
-        if isinstance(value, unicode) and '-' in value:
-            country, area, extension = value.split('-', 2)
-            self.widgets['country'].setRenderedValue(country)
-            self.widgets['area'].setRenderedValue(area)
-            self.widgets['extension'].setRenderedValue(extension)
-            return
-        return
-
-    def setPrefix(self, prefix):
-        """See zope.formlib.interfaces.IWidget"""
-        # Set the prefix locally
-        if not prefix.endswith("."):
-            prefix += '.'
-        self._prefix = prefix
-        self.name = prefix + self.context.__name__
-        # Now distribute it to the sub-widgets
-        self._generateSubWidgets()
-        return
-
-    def getInputValue(self):
-        """See zope.formlib.interfaces.IInputWidget"""
-        self._error = None
-        try:
-            result = u'-'.join((
-                self.widgets['country'].getInputValue(),
-                self.widgets['area'].getInputValue(),
-                self.widgets['extension'].getInputValue() ))
-            return result
-        except TypeError:
-            if self.required:
-                return self._missing
-            return None
-        except ValueError, v:
-            self._error = WidgetInputError(
-                self.context.__name__, self.label, _(v))
-            raise self._error
-        except WidgetInputError, e:
-            self._error = e
-            raise e
-
-    def applyChanges(self, content):
-        """See zope.formlib.interfaces.IInputWidget"""
-        field = self.context
-        new_value = self.getInputValue()
-        old_value = field.query(content, self)
-        # The selection has not changed
-        if new_value == old_value:
-            return False
-        field.set(content, new_value)
-        return True
-
-    def hasInput(self):
-        """See zope.formlib.interfaces.IInputWidget"""
-        return (self.widgets['country'].hasInput() and
-                (self.widgets['area'].hasInput() and
-                 self.widgets['extension'].hasInput()))
-
-
-    def hasValidInput(self):
-        """See zope.formlib.interfaces.IInputWidget"""
-        return (self.widgets['country'].hasValidInput() and
-            self.widgets['area'].hasValidInput() and
-            self.widgets['extension'].hasValidInput())
-
-
-    def hidden(self):
-        """See zope.formlib.interfaces.IBrowserWidget"""
-        output = []
-        output.append(self.widgets['country'].hidden())
-        output.append(self.widgets['area'].hidden())
-        output.append(self.widgets['extension'].hidden())
-        return '\n'.join(output)
-
-
-    def error(self):
-        """See zope.formlib.interfaces.IBrowserWidget"""
-        if self._error:
-            return getMultiAdapter(
-                (self._error, self.request),
-                IWidgetInputErrorView).snippet()
-        country_error = self.widgets['country'].error()
-        if country_error:
-            return country_error
-        area_error = self.widgets['area'].error()
-        if area_error:
-            return area_error
-        extension_error = self.widgets['extension'].error()
-        if extension_error:
-            return extension_error
-        return ""
-
-    def __call__(self):
-        """See zope.formlib.interfaces.IBrowserWidget"""
-        return self.template()
 
 from zc.sourcefactory.contextual import BasicContextualSourceFactory
@@ -282,5 +79,5 @@
 RE_NUMBERS_AND_HYPHENS = re.compile('^[\d\-]+$')
 
-class PhoneWidget2(TextWidget):
+class PhoneWidget(TextWidget):
 
     subwidget_names = ('country', 'area', 'ext')
@@ -358,5 +155,5 @@
         For the extension line we silently allow slashes as well.
         """
-        result = super(PhoneWidget2, self)._toFieldValue(input)
+        result = super(PhoneWidget, self)._toFieldValue(input)
         parts = input.split('-', 2)
         if '' in parts and self.context.required:
Index: /main/waeup.kofa/trunk/src/waeup/kofa/widgets/tests/test_phonewidget.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/widgets/tests/test_phonewidget.py	(revision 7851)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/widgets/tests/test_phonewidget.py	(revision 7852)
@@ -39,4 +39,18 @@
 from waeup.kofa.widgets.phonewidget import PhoneWidget
 
+import zope.formlib
+from zope import schema
+from zope.formlib.tests.test_functional_objectwidget import (
+    Test, PlacelessSetup, VerifyResults, traversingSetUp, xmlconfig,
+    PageTemplate, os, DefaultTraversable
+    )
+from zope.formlib.tests.test_functional_textwidget import(
+    FunctionalWidgetTestCase, patternExists)
+from zope.formlib.widgets import TextWidget
+from zope.component import adapts
+from zope.interface import implements
+from zope.traversing.interfaces import ITraversable
+from waeup.kofa.widgets.phonewidget import PhoneWidget, PhonePrefixes
+
 # Dummy content
 class ISampleContent(Interface):
@@ -68,464 +82,13 @@
         self.baz = None
 
-class PhoneWidgetTests(unittest.TestCase):
-    # Tests for phone widget
 
-    def setUp(self):
-        placefulSetUp()
-
-        # register TextLine views (so that subwidgets can be rendered)
-        provideAdapter(
-            TextWidget, (ITextLine, IDefaultBrowserLayer), IInputWidget)
-        # errors in forms
-        provideAdapter(
-            WidgetInputErrorView, (IWidgetInputError, IDefaultBrowserLayer),
-            IWidgetInputErrorView)
-
-        # setup some sample content to bind to (only neccessary for
-        # some of the tests)
-        self.content = SampleContent()
-        self.field = ISampleContent['foo']
-        self.field = self.field.bind(self.content)
-        self.field_nonreq = ISampleContent['bar']
-        self.field_nonreq = self.field_nonreq.bind(self.content)
-        self.field_w_default = ISampleContent['baz']
-        self.field_w_default = self.field_w_default.bind(self.content)
-
-        # create an empty request. We need one to create a widget
-        self.request = TestRequest()
-        self.widget = PhoneWidget(self.field, self.request)
-        self.widget_nonreq = PhoneWidget(self.field_nonreq, self.request)
-        return
-
-    def tearDown(self):
-        placefulTearDown()
-        return
-
-    def test_ifaces(self):
-        # make sure we fullfill interface contracts
-        verify.verifyClass(IBrowserWidget, PhoneWidget)
-        verify.verifyClass(IInputWidget, PhoneWidget)
-        verify.verifyObject(IBrowserWidget, self.widget)
-        verify.verifyObject(IInputWidget, self.widget)
-        return
-
-    def test_attribs_set(self):
-        # make sure the public attributes are set correctly
-        self.assertEqual(self.widget.name, 'field.foo')
-        self.assertEqual(self.widget.label, u'Phone')
-        self.assertEqual(self.widget.hint, u'Phone number')
-        self.assertEqual(self.widget.visible, True)
-        self.assertEqual(self.widget.required, True)
-        self.assertEqual(self.widget_nonreq.required, False)
-        return
-
-    def test_subwidgets_exist(self):
-        # make sure we have three sub widgets
-        sub_widget1 = self.widget.widgets['country']
-        sub_widget2 = self.widget.widgets['area']
-        sub_widget3 = self.widget.widgets['extension']
-        self.assertTrue(isinstance(sub_widget1, TextWidget))
-        self.assertTrue(isinstance(sub_widget2, TextWidget))
-        self.assertTrue(isinstance(sub_widget3, TextWidget))
-        return
-
-    def test_set_rendered_value(self):
-        # make sure we render values correctly
-        self.widget.setRenderedValue(u'123-456-1234567')
-        self.assertEqual(
-            self.widget(),
-            (u'+&nbsp;<input class="span2 textType" id="field.foo.country"'
-             u' name="field.foo.country" size="20" type="text" value="123" '
-             u' />'
-             u'&nbsp;-\n'
-             u'<input class="span2 textType" id="field.foo.area"'
-             u' name="field.foo.area" size="20" type="text" value="456" '
-             u' />'
-             u'&nbsp;-\n'
-             u'<input class="span3 textType" id="field.foo.extension"'
-             u' name="field.foo.extension" size="20" type="text"'
-             u' value="1234567"  />\n'))
-        return
-
-    def test_set_prefix_default(self):
-        # prefix determines the name of widget and its subwidgets.
-        self.assertEqual(self.widget.name, 'field.foo')
-        self.assertEqual(self.widget.widgets['country'].name,
-                         'field.foo.country')
-        self.assertEqual(self.widget.widgets['area'].name,
-                         'field.foo.area')
-        self.assertEqual(self.widget.widgets['extension'].name,
-                         'field.foo.extension')
-        return
-
-    def test_set_prefix_changed(self):
-        # when we set the prefix, widget names change
-        self.widget.setPrefix('test.')
-        self.assertEqual(self.widget.name, 'test.foo')
-        self.assertEqual(self.widget.widgets['country'].name,
-                         'test.foo.country')
-        self.assertEqual(self.widget.widgets['area'].name,
-                         'test.foo.area')
-        self.assertEqual(self.widget.widgets['extension'].name,
-                         'test.foo.extension')
-        return
-
-    def test_set_prefix_changed_no_dot(self):
-        # when we try to set a name without trailing dot, one will be
-        # inserted automatically
-        self.widget.setPrefix('test')
-        self.assertEqual(self.widget.name, 'test.foo')
-        self.assertEqual(self.widget.widgets['country'].name,
-                         'test.foo.country')
-        self.assertEqual(self.widget.widgets['area'].name,
-                         'test.foo.area')
-        self.assertEqual(self.widget.widgets['extension'].name,
-                         'test.foo.extension')
-        return
-
-    def test_get_input_value(self):
-        # we get a string when we want the input value
-        request = TestRequest(
-            form={
-                'field.foo.country': '123',
-                'field.foo.area': '456',
-                'field.foo.extension': '12345'
-                })
-        widget = PhoneWidget(self.field, request)
-        value = widget.getInputValue()
-        self.assertEqual(value, '123-456-12345')
-        return
-
-    def test_get_input_value_invalid(self):
-        # we get errors when valid data is sent
-        request = TestRequest(
-            form={
-                'field.foo.country': 'not-a-number',
-                'field.foo.area': '456',
-                'field.foo.extension': '12345',
-                })
-        widget = PhoneWidget(self.field, request)
-        self.assertRaises(
-            WidgetInputError,
-            widget.getInputValue)
-        return
-
-    def test_apply_changes(self):
-        # we can apply passed-in numbers to content objects. The
-        # widget is smart enough to detect whether the values really
-        # changed.
-        class Content(object):
-            field = None
-        content = Content()
-        request = TestRequest(form={
-                'field.foo.country': '123',
-                'field.foo.area': '456',
-                'field.foo.extension': '7890'})
-        widget = PhoneWidget(self.field, request)
-        result1 = widget.applyChanges(content)
-        result2 = widget.applyChanges(content)
-        self.assertEqual(result1, True)
-        self.assertEqual(content.foo, u'123-456-7890')
-        self.assertEqual(result2, False)
-        return
-
-    def test_has_input(self):
-        # we can check whether there is input without actually validating.
-        request = TestRequest(form={
-                'field.foo.country': '123'})
-        widget = PhoneWidget(self.field, request)
-        result = widget.hasInput()
-        self.assertEqual(result, False)
-
-        request = TestRequest(form={
-                'field.foo.area': '123'})
-        widget = PhoneWidget(self.field, request)
-        result = widget.hasInput()
-        self.assertEqual(result, False)
-
-        request = TestRequest(form={
-                'field.foo.extension': '123567'})
-        widget = PhoneWidget(self.field, request)
-        result = widget.hasInput()
-        self.assertEqual(result, False)
-
-        request = TestRequest(form={
-                'field.foo.country': '123',
-                'field.foo.area': '456',
-                'field.foo.extension': '7890'})
-        widget = PhoneWidget(self.field, request)
-        result = widget.hasInput()
-        self.assertEqual(result, True)
-
-        self.assertEqual(self.widget.hasInput(), False)
-        return
-
-    def test_has_valid_input(self):
-        # we can check for input also including validation
-        request = TestRequest(form={
-                'field.foo.country': '123'})
-        widget = PhoneWidget(self.field, request)
-        result = widget.hasValidInput()
-        self.assertEqual(result, False)
-
-        request = TestRequest(form={
-                'field.foo.area': '123'})
-        widget = PhoneWidget(self.field, request)
-        result = widget.hasValidInput()
-        self.assertEqual(result, False)
-
-        request = TestRequest(form={
-                'field.foo.extension': '123567'})
-        widget = PhoneWidget(self.field, request)
-        result = widget.hasValidInput()
-        self.assertEqual(result, False)
-
-        request = TestRequest(form={
-                'field.foo.country': '123',
-                'field.foo.area': '456',
-                'field.foo.extension': '7890'})
-        widget = PhoneWidget(self.field, request)
-        result = widget.hasValidInput()
-        self.assertEqual(result, True)
-
-        self.assertEqual(self.widget.hasValidInput(), False)
-        return
-
-    def test_hidden(self):
-        # we can render output as hidden field(s)
-        self.widget.setRenderedValue(u'123-456-1234567')
-        self.assertEqual(
-            self.widget.hidden(),
-            (u'<input class="span2 hiddenType" id="field.foo.country"'
-             u' name="field.foo.country" type="hidden" value="123" '
-             u' />'
-             u'\n'
-             u'<input class="span2 hiddenType" id="field.foo.area"'
-             u' name="field.foo.area" type="hidden" value="456" '
-             u' />'
-             u'\n'
-             u'<input class="span3 hiddenType" id="field.foo.extension"'
-             u' name="field.foo.extension" type="hidden"'
-             u' value="1234567"  />'))
-        return
-
-    def test_error_extension(self):
-        # the widget can handle input errors in extension subwidget
-
-        # extension field too short
-        request = TestRequest(form={
-                'field.foo.country': '123',
-                'field.foo.area': '456',
-                'field.foo.extension': '0'})
-        widget = PhoneWidget(self.field, request)
-        try:
-            widget.getInputValue()
-            self.fail('No error raised')
-        except WidgetInputError, e:
-            pass
-        self.assertEqual(
-            e.__repr__(),
-            ("WidgetInputError("
-             "'extension', u'Direct Line', ConstraintNotSatisfied(u'0'))"))
-        self.assertEqual(
-            widget.error(),
-            u'<span class="error">Constraint not satisfied</span>')
-        return
-
-
-    def test_error_area(self):
-        # the widget can handle input errors in area code subwidget
-
-        # area code contains illegal chars
-        request = TestRequest(form={
-                'field.foo.country': '123',
-                'field.foo.area': 'no-number',
-                'field.foo.extension': '12345'})
-        widget = PhoneWidget(self.field, request)
-        try:
-            widget.getInputValue()
-            self.fail('No error raised')
-        except WidgetInputError, e:
-            pass
-        self.assertEqual(
-            e.__repr__(),
-            ("WidgetInputError("
-             "'area', u'Area Code', ConstraintNotSatisfied(u'no-number'))"))
-        self.assertEqual(
-            widget.error(),
-            u'<span class="error">Constraint not satisfied</span>')
-        return
-
-    def test_error_country(self):
-        # the widget can handle input errors in country code subwidget
-
-        # invalid country code
-        request = TestRequest(form={
-                'field.foo.country': 'XXX',
-                'field.foo.area': '456',
-                'field.foo.extension': '12345'})
-        widget = PhoneWidget(self.field, request)
-        try:
-            widget.getInputValue()
-            self.fail('No error raised')
-        except WidgetInputError, e:
-            pass
-        self.assertEqual(
-            e.__repr__(),
-            ("WidgetInputError("
-             "'country', u'Country Code', ConstraintNotSatisfied(u'XXX'))"))
-        self.assertEqual(
-            widget.error(),
-            u'<span class="error">Constraint not satisfied</span>')
-        return
-
-    def test_render_wo_data(self):
-        # when no data was submitted, the content data will be displayed
-        request = TestRequest(form={})
-        self.content.foo = u'11-222-3333'
-        widget = PhoneWidget(self.field, request)
-        self.assertEqual(
-            widget(),
-            (u'+&nbsp;<input class="span2 textType" id="field.foo.country"'
-             u' name="field.foo.country" size="20" type="text" value="11" '
-             u' />'
-             u'&nbsp;-\n'
-             u'<input class="span2 textType" id="field.foo.area"'
-             u' name="field.foo.area" size="20" type="text" value="222" '
-             u' />'
-             u'&nbsp;-\n'
-             u'<input class="span3 textType" id="field.foo.extension"'
-             u' name="field.foo.extension" size="20" type="text"'
-             u' value="3333"  />\n'))
-        return
-
-    def test_render_with_data(self):
-        # when data was in the request, it will override any content value
-        request = TestRequest(form={
-                'field.foo.country': '11',
-                'field.foo.area': '222',
-                'field.foo.extension': '3333'})
-        self.content.foo = u'22-333-4444'
-        widget = PhoneWidget(self.field, request)
-        self.assertEqual(
-            widget(),
-            (u'+&nbsp;<input class="span2 textType" id="field.foo.country"'
-             u' name="field.foo.country" size="20" type="text" value="11" '
-             u' />'
-             u'&nbsp;-\n'
-             u'<input class="span2 textType" id="field.foo.area"'
-             u' name="field.foo.area" size="20" type="text" value="222" '
-             u' />'
-             u'&nbsp;-\n'
-             u'<input class="span3 textType" id="field.foo.extension"'
-             u' name="field.foo.extension" size="20" type="text"'
-             u' value="3333"  />\n'))
-        return
-
-    def test_render_changed_prefix(self):
-        # when the prefix is changed, the subwidgets will reflect that
-        # properly. This tests a regression: if setPrefix was called
-        # on the phone widget, the subwidgets were already assuming
-        # that there is no data in the request
-        request = TestRequest(form={
-                'field.foo.country': '11',
-                'field.foo.area': '222',
-                'field.foo.extension': '3333'})
-        self.content.foo = u'22-333-4444'
-        widget = PhoneWidget(self.field, request)
-        # when setting a wrong prefix (not in the form), subwidgets
-        # will display the content values assuming (correctly) there
-        # is no data sent for them in the request.
-        widget.setPrefix('not-existent.')
-        self.assertTrue('value="4444"' in widget())
-        # when setting the right prefix, subwidgets will display the
-        # sent form values and not the content values.
-        widget.setPrefix('field.')
-        self.assertTrue('value="3333"' in widget())
-        return
-
-    def test_render_changed_prefix(self):
-        # when the prefix is changed, the subwidgets will reflect that
-        # properly. This tests a regression: if setPrefix was called
-        # on the phone widget, the subwidgets were already assuming
-        # that there is no data in the request
-        request = TestRequest(form={
-                'field.foo.country': '11',
-                'field.foo.area': '222',
-                'field.foo.extension': '3333'})
-        self.content.foo = u'22-333-4444'
-        widget = PhoneWidget(self.field, request)
-        # when setting a wrong prefix (not in the form), subwidgets
-        # will display the content values assuming (correctly) there
-        # is no data sent for them in the request.
-        widget.setPrefix('not-existent.')
-        self.assertTrue('value="4444"' in widget())
-        # when setting the right prefix, subwidgets will display the
-        # sent form values and not the content values.
-        widget.setPrefix('field.')
-        self.assertTrue('value="3333"' in widget())
-        return
-
-    def test_non_required_no_input(self):
-        # if the bound field requires no input phone widget will cope
-        # with that.
-        class Content(object):
-            field = None
-
-        content = Content()
-        request = TestRequest(form={
-                'field.bar.country': '',
-                'field.bar.area': '',
-                'field.bar.extension': '',
-                })
-        widget = PhoneWidget(self.field_nonreq, request)
-        result1 = widget.applyChanges(content)
-        result2 = widget.getInputValue()
-        self.assertEqual(result1, True)
-        # without input we get None
-        self.assertTrue(content.bar is None)
-        self.assertTrue(result2 is None)
-        return
-
-    def test_set_rendered_with_empty_context_value(self):
-        # if we set empty string as rendered value, empty fields are
-        # displayed.
-        self.widget.setRenderedValue(u'')
-        self.assertEqual(
-            self.widget(),
-            (u'+&nbsp;<input class="span2 textType" id="field.foo.country"'
-             u' name="field.foo.country" size="20" type="text" value="" '
-             u' />'
-             u'&nbsp;-\n'
-             u'<input class="span2 textType" id="field.foo.area"'
-             u' name="field.foo.area" size="20" type="text" value="" '
-             u' />'
-             u'&nbsp;-\n'
-             u'<input class="span3 textType" id="field.foo.extension"'
-             u' name="field.foo.extension" size="20" type="text"'
-             u' value=""  />\n'))
-        return
-
-import zope.formlib
-from zope import schema
-from zope.formlib.tests.test_functional_objectwidget import (
-    Test, PlacelessSetup, VerifyResults, traversingSetUp, xmlconfig,
-    PageTemplate, os, DefaultTraversable
-    )
-from zope.formlib.tests.test_functional_textwidget import(
-    FunctionalWidgetTestCase, patternExists)
-from zope.formlib.widgets import TextWidget
-from zope.component import adapts
-from zope.interface import implements
-from zope.traversing.interfaces import ITraversable
-from waeup.kofa.widgets.phonewidget import PhoneWidget2, PhonePrefixes
 
 class SampleForm(form.EditForm):
     form_fields = form.fields(ISampleContent)
-    form_fields['foo'].custom_widget = PhoneWidget2
-    form_fields['bar'].custom_widget = PhoneWidget2
-    form_fields['baz'].custom_widget = PhoneWidget2
+    form_fields['foo'].custom_widget = PhoneWidget
+    form_fields['bar'].custom_widget = PhoneWidget
+    form_fields['baz'].custom_widget = PhoneWidget
 
-class PhoneWidget2Tests(FunctionalWidgetTestCase):
+class PhoneWidgetTests(FunctionalWidgetTestCase):
 
     widgets = [
@@ -536,5 +99,5 @@
 
     def setUp(self):
-        super(PhoneWidget2Tests, self).setUp()
+        super(PhoneWidgetTests, self).setUp()
         # register the phone prefixes utility
         self.gsm = getGlobalSiteManager()
