urwid 3.0.3__py3-none-any.whl → 3.0.5__py3-none-any.whl

urwid/__init__.py

@@ -21,7 +21,7 @@
 
 from __future__ import annotations
 
-import importlib
+import importlib.util
 import sys
 import types
 import typing
@@ -265,12 +265,28 @@ _moved_warn: dict[str, str] = {
 }
 # Backward compatible lazy load without any warnings
 # Before DeprecationWarning need to start PendingDeprecationWarning process.
-_moved_no_warn: dict[str, str] = {
-    "display_common": "urwid.display.common",
-    "raw_display": "urwid.display.raw",
-    "curses_display": "urwid.display.curses",
-    "escape": "urwid.display.escape",
-}
+
+
+def lazy_import(name: str, package: str | None = None) -> types.ModuleType:
+    """Lazy import implementation from Python documentation.
+
+    Useful for cases where no warnings expected for moved modules.
+    """
+    spec = importlib.util.find_spec(name, package)
+    if not spec:
+        raise ImportError(f"No module named {name!r}")
+    if not spec.loader:
+        raise ImportError(f"Module named {name!r} is invalid")
+
+    loader = importlib.util.LazyLoader(spec.loader)
+    spec.loader = loader
+    module = importlib.util.module_from_spec(spec)
+    if not package:
+        sys.modules[name] = module
+    else:
+        sys.modules[f"{package.rstrip('.')}.{name.lstrip('.')}"] = module
+    loader.exec_module(module)
+    return module
 
 
 class _MovedModule(types.ModuleType):
@@ -293,6 +309,12 @@ class _MovedModule(types.ModuleType):
         return getattr(real_module, name)
 
 
+display_common = lazy_import("urwid.display.common")
+raw_display = lazy_import("urwid.display.raw")
+curses_display = lazy_import("urwid.display.curses")
+escape = lazy_import("urwid.display.escape")
+
+
 class _MovedModuleWarn(_MovedModule):
     """Special class to handle moved modules.
 
@@ -310,10 +332,6 @@ class _MovedModuleWarn(_MovedModule):
         return super().__getattr__(name)
 
 
-for _name, _module in _moved_no_warn.items():
-    _module_path = f"{__name__}.{_name}"
-    sys.modules[_module_path] = _MovedModule(_module_path, _module)
-
 for _name, _module in _moved_warn.items():
     _module_path = f"{__name__}.{_name}"
     sys.modules[_module_path] = _MovedModuleWarn(_module_path, _module)
@@ -325,11 +343,6 @@ def __getattr__(name: str) -> typing.Any:
     :return: attribute by name
     :raises AttributeError: attribute is not defined for lazy load
     """
-    if name in _moved_no_warn:
-        mod = importlib.import_module(_moved_no_warn[name])
-        __locals[name] = mod
-        return mod
-
     if name in _moved_warn:
         warnings.warn(
             f"{name} is moved to {_moved_warn[name]}",

urwid/display/__init__.py

@@ -2,9 +2,40 @@
 
 from __future__ import annotations
 
-import importlib
+import importlib.util
+import sys
 import typing
 
+from . import raw
+from .common import (
+    BLACK,
+    BROWN,
+    DARK_BLUE,
+    DARK_CYAN,
+    DARK_GRAY,
+    DARK_GREEN,
+    DARK_MAGENTA,
+    DARK_RED,
+    DEFAULT,
+    LIGHT_BLUE,
+    LIGHT_CYAN,
+    LIGHT_GRAY,
+    LIGHT_GREEN,
+    LIGHT_MAGENTA,
+    LIGHT_RED,
+    UPDATE_PALETTE_ENTRY,
+    WHITE,
+    YELLOW,
+    AttrSpec,
+    AttrSpecError,
+    BaseScreen,
+    RealTerminal,
+    ScreenError,
+)
+
+if typing.TYPE_CHECKING:
+    import types
+
 __all__ = (
     "BLACK",
     "BROWN",
@@ -36,33 +67,6 @@ __all__ = (
     "web",
 )
 
-from . import raw
-from .common import (
-    BLACK,
-    BROWN,
-    DARK_BLUE,
-    DARK_CYAN,
-    DARK_GRAY,
-    DARK_GREEN,
-    DARK_MAGENTA,
-    DARK_RED,
-    DEFAULT,
-    LIGHT_BLUE,
-    LIGHT_CYAN,
-    LIGHT_GRAY,
-    LIGHT_GREEN,
-    LIGHT_MAGENTA,
-    LIGHT_RED,
-    UPDATE_PALETTE_ENTRY,
-    WHITE,
-    YELLOW,
-    AttrSpec,
-    AttrSpecError,
-    BaseScreen,
-    RealTerminal,
-    ScreenError,
-)
-
 try:
     from . import curses
 
@@ -70,28 +74,29 @@ try:
 except ImportError:
     pass
 
-# Moved modules handling
-__locals: dict[str, typing.Any] = locals()  # use mutable access for pure lazy loading
 
-# Lazy load modules
-_lazy_load: frozenset[str] = frozenset(
-    (
-        "html_fragment",
-        "lcd",
-        "web",
-    )
-)
+def lazy_import(name: str, package: str | None = None) -> types.ModuleType:
+    """Lazy import implementation from Python documentation.
 
+    Useful for cases where no warnings expected for moved modules.
+    """
+    spec = importlib.util.find_spec(name, package)
+    if not spec:
+        raise ImportError(f"No module named {name!r}")
+    if not spec.loader:
+        raise ImportError(f"Module named {name!r} is invalid")
 
-def __getattr__(name: str) -> typing.Any:
-    """Get attributes lazy.
+    loader = importlib.util.LazyLoader(spec.loader)
+    spec.loader = loader
+    module = importlib.util.module_from_spec(spec)
+    if not package:
+        sys.modules[name] = module
+    else:
+        sys.modules[f"{package.rstrip('.')}.{name.lstrip('.')}"] = module
+    loader.exec_module(module)
+    return module
 
-    :return: attribute by name
-    :raises AttributeError: attribute is not defined for lazy load
-    """
-    if name in _lazy_load:
-        mod = importlib.import_module(f"{__package__}.{name}")
-        __locals[name] = mod
-        return mod
 
-    raise AttributeError(f"{name} not found in {__package__}")
+html_fragment = lazy_import(".html_fragment", __package__)
+lcd = lazy_import(".lcd", __package__)
+web = lazy_import(".web", __package__)

urwid/display/_raw_display_base.py

@@ -790,9 +790,9 @@ class Screen(BaseScreen, RealTerminal):
         >>> s = Screen()
         >>> s.set_terminal_properties(colors=256)
         >>> a2e = s._attrspec_to_escape
-        >>> a2e(s.AttrSpec('brown', 'dark green'))
+        >>> a2e(s.AttrSpec("brown", "dark green"))
         '\\x1b[0;33;42m'
-        >>> a2e(s.AttrSpec('#fea,underline', '#d0d'))
+        >>> a2e(s.AttrSpec("#fea,underline", "#d0d"))
         '\\x1b[0;38;5;229;4;48;5;164m'
         """
         if self.term == "fbterm":

urwid/display/common.py

@@ -389,13 +389,13 @@ def _parse_color_256(desc: str) -> int | None:
 
     Returns None if desc is invalid.
 
-    >>> _parse_color_256('h142')
+    >>> _parse_color_256("h142")
     142
-    >>> _parse_color_256('#f00')
+    >>> _parse_color_256("#f00")
     196
-    >>> _parse_color_256('g100')
+    >>> _parse_color_256("g100")
     231
-    >>> _parse_color_256('g#80')
+    >>> _parse_color_256("g#80")
     244
     """
     if len(desc) > 4:
@@ -425,7 +425,7 @@ def _parse_color_256(desc: str) -> int | None:
         # Only remaining possibility is gray value
         if desc.startswith("g#"):
             # hex value 00..ff
-            gray = int(desc[2:], 16)
+            gray = int(desc[2:], 16)  # noqa: FURB166
             if gray < 0 or gray > 255:
                 return None
             gray = _GRAY_256_LOOKUP[gray]
@@ -466,14 +466,14 @@ def _parse_color_88(desc: str) -> int | None:
 
     Returns None if desc is invalid.
 
-    >>> _parse_color_88('h142')
-    >>> _parse_color_88('h42')
+    >>> _parse_color_88("h142")
+    >>> _parse_color_88("h42")
     42
-    >>> _parse_color_88('#f00')
+    >>> _parse_color_88("#f00")
     64
-    >>> _parse_color_88('g100')
+    >>> _parse_color_88("g100")
     79
-    >>> _parse_color_88('g#80')
+    >>> _parse_color_88("g#80")
     83
     """
     if len(desc) == 7:
@@ -505,7 +505,7 @@ def _parse_color_88(desc: str) -> int | None:
         # Only remaining possibility is gray value
         if desc.startswith("g#"):
             # hex value 00..ff
-            gray = int(desc[2:], 16)
+            gray = int(desc[2:], 16)  # noqa: FURB166
             if gray < 0 or gray > 255:
                 return None
             gray = _GRAY_88_LOOKUP[gray]
@@ -582,13 +582,13 @@ class AttrSpec:
                    values are only usable with 88, 256, or 2**24 colors.  With
                    1 color only the foreground settings may be used.
 
-        >>> AttrSpec('dark red', 'light gray', 16)
+        >>> AttrSpec("dark red", "light gray", 16)
         AttrSpec('dark red', 'light gray')
-        >>> AttrSpec('yellow, underline, bold', 'dark blue')
+        >>> AttrSpec("yellow, underline, bold", "dark blue")
         AttrSpec('yellow,bold,underline', 'dark blue')
-        >>> AttrSpec('#ddb', '#004', 256) # closest colors will be found
+        >>> AttrSpec("#ddb", "#004", 256)  # closest colors will be found
         AttrSpec('#dda', '#006')
-        >>> AttrSpec('#ddb', '#004', 88)
+        >>> AttrSpec("#ddb", "#004", 88)
         AttrSpec('#ccc', '#000', colors=88)
         """
         if colors not in {1, 16, 88, 256, 2**24}:
@@ -820,9 +820,9 @@ class AttrSpec:
         If the foreground or background is 'default' then all their compenents
         will be returned as None.
 
-        >>> AttrSpec('yellow', '#ccf', colors=88).get_rgb_values()
+        >>> AttrSpec("yellow", "#ccf", colors=88).get_rgb_values()
         (255, 255, 0, 205, 205, 255)
-        >>> AttrSpec('default', 'g92').get_rgb_values()
+        >>> AttrSpec("default", "g92").get_rgb_values()
         (None, None, None, 238, 238, 238)
         """
         if not (self.foreground_basic or self.foreground_high or self.foreground_true):

urwid/display/curses.py

@@ -563,9 +563,7 @@ class Screen(BaseScreen, RealTerminal):
 
         logger.debug(f"Drawing screen with size {size!r}")
 
-        y = -1
-        for row in canvas.content():
-            y += 1
+        for y, row in enumerate(canvas.content()):
             try:
                 self.s.move(y, 0)
             except curses.error:

urwid/display/web.py

@@ -617,7 +617,7 @@ def daemonize(errfile: str) -> None:
         os._exit(0)
 
     os.chdir("/")
-    for fd in range(0, 20):
+    for fd in range(20):
         with suppress(OSError):
             os.close(fd)
 

urwid/event_loop/asyncio_loop.py

@@ -79,7 +79,9 @@ class AsyncioEventLoop(EventLoop):
                     self._original_event_loop_policy, asyncio.WindowsSelectorEventLoopPolicy
                 ):
                     self.logger.debug("Set WindowsSelectorEventLoopPolicy as asyncio event loop policy")
-                    asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
+                    asyncio.set_event_loop_policy(
+                        asyncio.WindowsSelectorEventLoopPolicy()  # pylint: disable=deprecated-class
+                    )
                     self._event_loop_policy_altered = True
                 else:
                     self._event_loop_policy_altered = False

urwid/event_loop/main_loop.py

@@ -340,7 +340,7 @@ class MainLoop:
 
     def _test_run(self):
         """
-        >>> w = _refl("widget")   # _refl prints out function calls
+        >>> w = _refl("widget")  # _refl prints out function calls
         >>> w.render_rval = "fake canvas"  # *_rval is used for return values
         >>> scr = _refl("screen")
         >>> scr.get_input_descriptors_rval = [42]
@@ -351,7 +351,7 @@ class MainLoop:
         >>> evl.enter_idle_rval = 1
         >>> evl.watch_file_rval = 2
         >>> ml = MainLoop(w, [], scr, event_loop=evl)
-        >>> ml.run()    # doctest:+ELLIPSIS
+        >>> ml.run()  # doctest:+ELLIPSIS
         screen.start()
         screen.set_mouse_tracking()
         screen.unhook_event_loop(...)
@@ -361,7 +361,7 @@ class MainLoop:
         event_loop.remove_enter_idle(1)
         screen.unhook_event_loop(...)
         screen.stop()
-        >>> ml.draw_screen()    # doctest:+ELLIPSIS
+        >>> ml.draw_screen()  # doctest:+ELLIPSIS
         screen.get_cols_rows()
         widget.render((20, 10), focus=True)
         screen.draw_screen((20, 10), 'fake canvas')
@@ -454,7 +454,7 @@ class MainLoop:
         >>> evl = _refl("event_loop")
         >>> ml = MainLoop(w, [], scr, event_loop=evl)
         >>> ml._input_timeout = "old timeout"
-        >>> ml._update(['y'], [121])    # doctest:+ELLIPSIS
+        >>> ml._update(["y"], [121])  # doctest:+ELLIPSIS
         screen.get_cols_rows()
         widget.selectable()
         widget.keypress((15, 5), 'y')
@@ -599,7 +599,7 @@ class MainLoop:
         >>> scr = _refl("screen")
         >>> scr.get_cols_rows_rval = (10, 5)
         >>> ml = MainLoop(w, [], scr)
-        >>> ml.process_input(['enter', ('mouse drag', 1, 14, 20)])
+        >>> ml.process_input(["enter", ("mouse drag", 1, 14, 20)])
         screen.get_cols_rows()
         widget.selectable()
         widget.keypress((10, 5), 'enter')

urwid/font.py

@@ -24,9 +24,11 @@ import typing
 import warnings
 from pprint import pformat
 
+import wcwidth
+
 from urwid.canvas import CanvasError, TextCanvas
 from urwid.display.escape import SAFE_ASCII_DEC_SPECIAL_RE
-from urwid.util import apply_target_encoding, str_util
+from urwid.util import apply_target_encoding
 
 if typing.TYPE_CHECKING:
     from collections.abc import Iterator, Sequence
@@ -60,7 +62,7 @@ def separate_glyphs(gdata: str, height: int) -> tuple[dict[str, tuple[int, list[
             character = key_line[key_index]
 
         if key_index < len(key_line) and key_line[key_index] == character:
-            end_col += str_util.get_char_width(character)
+            end_col += wcwidth.width(character, control_codes="ignore")
             key_index += 1
             continue
 
@@ -76,7 +78,7 @@ def separate_glyphs(gdata: str, height: int) -> tuple[dict[str, tuple[int, list[
                 if j >= len(line):
                     fill = end_col - start_col - y
                     break
-                y += str_util.get_char_width(line[j])
+                y += wcwidth.width(line[j], control_codes="ignore")
                 j += 1
             if y + fill != end_col - start_col:
                 raise ValueError(repr((y, fill, end_col)))
@@ -139,7 +141,7 @@ class FontRegistry(type):
         3
         >>> with set_temporary_encoding("utf-8"):
         ...     canvas: TextCanvas = font.render("+")
-        >>> b'\\n'.join(canvas.text).decode('utf-8')
+        >>> b"\\n".join(canvas.text).decode("utf-8")
         '  \\n ┼\\n  '
         """
         return mcs.__registered.get(item)

urwid/numedit.py

@@ -88,28 +88,28 @@ class NumEdit(Edit):
         Handle editing keystrokes.  Remove leading zeros.
 
         >>> e, size = NumEdit("0123456789", "", "5002"), (10,)
-        >>> e.keypress(size, 'home')
-        >>> e.keypress(size, 'delete')
+        >>> e.keypress(size, "home")
+        >>> e.keypress(size, "delete")
         >>> assert e.edit_text == "002"
-        >>> e.keypress(size, 'end')
+        >>> e.keypress(size, "end")
         >>> assert e.edit_text == "2"
         >>> # binary only
         >>> e, size = NumEdit("01", "", ""), (10,)
         >>> assert e.edit_text == ""
-        >>> e.keypress(size, '1')
-        >>> e.keypress(size, '0')
-        >>> e.keypress(size, '1')
+        >>> e.keypress(size, "1")
+        >>> e.keypress(size, "0")
+        >>> e.keypress(size, "1")
         >>> assert e.edit_text == "101"
         >>> e, size = NumEdit("0123456789", "", "", allow_negative=True), (10,)
         >>> e.keypress(size, "-")
-        >>> e.keypress(size, '1')
+        >>> e.keypress(size, "1")
         >>> e.edit_text
         '-1'
-        >>> e.keypress(size, 'home')
-        >>> e.keypress(size, 'delete')
+        >>> e.keypress(size, "home")
+        >>> e.keypress(size, "delete")
         >>> e.edit_text
         '1'
-        >>> e.keypress(size, 'end')
+        >>> e.keypress(size, "end")
         >>> e.keypress(size, "-")
         '-'
         >>> e.edit_text
@@ -141,52 +141,52 @@ class IntegerEdit(NumEdit):
         caption -- caption markup
         default -- default edit value
 
-        >>> IntegerEdit(u"", 42)
+        >>> IntegerEdit("", 42)
         <IntegerEdit selectable flow widget '42' edit_pos=2>
-        >>> e, size = IntegerEdit(u"", "5002"), (10,)
-        >>> e.keypress(size, 'home')
-        >>> e.keypress(size, 'delete')
+        >>> e, size = IntegerEdit("", "5002"), (10,)
+        >>> e.keypress(size, "home")
+        >>> e.keypress(size, "delete")
         >>> assert e.edit_text == "002"
-        >>> e.keypress(size, 'end')
+        >>> e.keypress(size, "end")
         >>> assert e.edit_text == "2"
-        >>> e.keypress(size, '9')
-        >>> e.keypress(size, '0')
+        >>> e.keypress(size, "9")
+        >>> e.keypress(size, "0")
         >>> assert e.edit_text == "290"
         >>> e, size = IntegerEdit("", ""), (10,)
         >>> assert e.value() is None
         >>> # binary
-        >>> e, size = IntegerEdit(u"", "1010", base=2), (10,)
-        >>> e.keypress(size, 'end')
-        >>> e.keypress(size, '1')
+        >>> e, size = IntegerEdit("", "1010", base=2), (10,)
+        >>> e.keypress(size, "end")
+        >>> e.keypress(size, "1")
         >>> assert e.edit_text == "10101"
         >>> assert e.value() == Decimal("21")
         >>> # HEX
-        >>> e, size = IntegerEdit(u"", "10", base=16), (10,)
-        >>> e.keypress(size, 'end')
-        >>> e.keypress(size, 'F')
-        >>> e.keypress(size, 'f')
+        >>> e, size = IntegerEdit("", "10", base=16), (10,)
+        >>> e.keypress(size, "end")
+        >>> e.keypress(size, "F")
+        >>> e.keypress(size, "f")
         >>> assert e.edit_text == "10Ff"
-        >>> assert e.keypress(size, 'G') == 'G'  # unhandled key
+        >>> assert e.keypress(size, "G") == "G"  # unhandled key
         >>> assert e.edit_text == "10Ff"
         >>> # keep leading 0's when not base 10
-        >>> e, size = IntegerEdit(u"", "10FF", base=16), (10,)
+        >>> e, size = IntegerEdit("", "10FF", base=16), (10,)
         >>> assert e.edit_text == "10FF"
         >>> assert e.value() == Decimal("4351")
-        >>> e.keypress(size, 'home')
-        >>> e.keypress(size, 'delete')
-        >>> e.keypress(size, '0')
+        >>> e.keypress(size, "home")
+        >>> e.keypress(size, "delete")
+        >>> e.keypress(size, "0")
         >>> assert e.edit_text == "00FF"
         >>> # test exception on incompatible value for base
-        >>> e, size = IntegerEdit(u"", "10FG", base=16), (10,)
+        >>> e, size = IntegerEdit("", "10FG", base=16), (10,)
         Traceback (most recent call last):
             ...
         ValueError: invalid value: 10FG for base 16
         >>> # test exception on float init value
-        >>> e, size = IntegerEdit(u"", 10.0), (10,)
+        >>> e, size = IntegerEdit("", 10.0), (10,)
         Traceback (most recent call last):
             ...
         ValueError: default: Only 'str', 'int', 'long' or Decimal input allowed
-        >>> e, size = IntegerEdit(u"", Decimal("10.0")), (10,)
+        >>> e, size = IntegerEdit("", Decimal("10.0")), (10,)
         Traceback (most recent call last):
             ...
         ValueError: not an 'integer Decimal' instance
@@ -226,8 +226,8 @@ class IntegerEdit(NumEdit):
         Return the numeric value of self.edit_text.
 
         >>> e, size = IntegerEdit(), (10,)
-        >>> e.keypress(size, '5')
-        >>> e.keypress(size, '1')
+        >>> e.keypress(size, "5")
+        >>> e.keypress(size, "1")
         >>> assert e.value() == 51
         """
         if self.edit_text:
@@ -240,9 +240,9 @@ class IntegerEdit(NumEdit):
 
         >>> e, size = IntegerEdit(allow_negative=True), (10,)
         >>> assert int(e) == 0
-        >>> e.keypress(size, '-')
-        >>> e.keypress(size, '4')
-        >>> e.keypress(size, '2')
+        >>> e.keypress(size, "-")
+        >>> e.keypress(size, "4")
+        >>> e.keypress(size, "2")
         >>> assert int(e) == -42
         """
         if self.edit_text:
@@ -270,46 +270,46 @@ class FloatEdit(NumEdit):
         preserve_significance -- return value has the same signif. as default
         decimal_separator -- use '.' as separator by default, optionally a ','
 
-        >>> FloatEdit(u"",  "1.065434")
+        >>> FloatEdit("", "1.065434")
         <FloatEdit selectable flow widget '1.065434' edit_pos=8>
-        >>> e, size = FloatEdit(u"", "1.065434"), (10,)
-        >>> e.keypress(size, 'home')
-        >>> e.keypress(size, 'delete')
+        >>> e, size = FloatEdit("", "1.065434"), (10,)
+        >>> e.keypress(size, "home")
+        >>> e.keypress(size, "delete")
         >>> assert e.edit_text == ".065434"
-        >>> e.keypress(size, 'end')
-        >>> e.keypress(size, 'backspace')
+        >>> e.keypress(size, "end")
+        >>> e.keypress(size, "backspace")
         >>> assert e.edit_text == ".06543"
         >>> e, size = FloatEdit(), (10,)
-        >>> e.keypress(size, '5')
-        >>> e.keypress(size, '1')
-        >>> e.keypress(size, '.')
-        >>> e.keypress(size, '5')
-        >>> e.keypress(size, '1')
+        >>> e.keypress(size, "5")
+        >>> e.keypress(size, "1")
+        >>> e.keypress(size, ".")
+        >>> e.keypress(size, "5")
+        >>> e.keypress(size, "1")
         >>> assert e.value() == Decimal("51.51"), e.value()
         >>> e, size = FloatEdit(decimal_separator=":"), (10,)
         Traceback (most recent call last):
             ...
         ValueError: invalid decimal separator: :
         >>> e, size = FloatEdit(decimal_separator=","), (10,)
-        >>> e.keypress(size, '5')
-        >>> e.keypress(size, '1')
-        >>> e.keypress(size, ',')
-        >>> e.keypress(size, '5')
-        >>> e.keypress(size, '1')
+        >>> e.keypress(size, "5")
+        >>> e.keypress(size, "1")
+        >>> e.keypress(size, ",")
+        >>> e.keypress(size, "5")
+        >>> e.keypress(size, "1")
         >>> assert e.edit_text == "51,51"
         >>> e, size = FloatEdit("", "3.1415", preserve_significance=True), (10,)
-        >>> e.keypress(size, 'end')
-        >>> e.keypress(size, 'backspace')
-        >>> e.keypress(size, 'backspace')
+        >>> e.keypress(size, "end")
+        >>> e.keypress(size, "backspace")
+        >>> e.keypress(size, "backspace")
         >>> assert e.edit_text == "3.14"
         >>> assert e.value() == Decimal("3.1400")
-        >>> e.keypress(size, '1')
-        >>> e.keypress(size, '5')
-        >>> e.keypress(size, '9')
+        >>> e.keypress(size, "1")
+        >>> e.keypress(size, "5")
+        >>> e.keypress(size, "9")
         >>> assert e.value() == Decimal("3.1416"), e.value()
         >>> e, size = FloatEdit("", ""), (10,)
         >>> assert e.value() is None
-        >>> e, size = FloatEdit(u"", 10.0), (10,)
+        >>> e, size = FloatEdit("", 10.0), (10,)
         Traceback (most recent call last):
             ...
         ValueError: default: Only 'str', 'int', 'long' or Decimal input allowed
@@ -368,11 +368,11 @@ class FloatEdit(NumEdit):
         """Enforced float value return.
 
         >>> e, size = FloatEdit(allow_negative=True), (10,)
-        >>> assert float(e) == 0.
-        >>> e.keypress(size, '-')
-        >>> e.keypress(size, '4')
-        >>> e.keypress(size, '.')
-        >>> e.keypress(size, '2')
+        >>> assert float(e) == 0.0
+        >>> e.keypress(size, "-")
+        >>> e.keypress(size, "4")
+        >>> e.keypress(size, ".")
+        >>> e.keypress(size, "2")
         >>> assert float(e) == -4.2
         """
         if self.edit_text: