remove some urwid-specific mentions and keys

ikanobori · ikanobori · commit eca378a4ca98 · 2014-07-28T15:51:10.000+02:00
diff --git a/README.rst b/README.rst
@@ -8,20 +8,9 @@ Dependencies
 * Sphinx != 1.1.2 (for the documentation only) (apt-get install python-sphinx)
 * mock (for the testsuite only)
 * babel (optional, for internationalization)
-
-bpython-curtsies
-----------------
-``bpython-curtsies`` requires the following additional packages:
-
-* curtsies >= 0.1.0
+* curtsies
 * greenlet
 
-bpython-urwid
--------------
-``bpython-urwid`` requires the following additional packages:
-
-* urwid
-
 Introduction
 ============
 A few people asked for stuff like syntax highlighting and autocomplete for the
diff --git a/bpython/keys.py b/bpython/keys.py
@@ -47,17 +47,12 @@ def __setitem__(self, key, value):
         self.map[key] = value
 
 cli_key_dispatch = KeyMap(tuple())
-urwid_key_dispatch = KeyMap('')
 
 # fill dispatch with letters
 for c in string.ascii_lowercase:
     cli_key_dispatch['C-%s' % c] = (chr(string.ascii_lowercase.index(c) + 1),
                                 '^%s' % c.upper())
 
-for c in string.ascii_lowercase:
-    urwid_key_dispatch['C-%s' % c] = 'ctrl %s' % c
-    urwid_key_dispatch['M-%s' % c] = 'meta %s' % c
-
 # fill dispatch with cool characters
 cli_key_dispatch['C-['] = (chr(27), '^[')
 cli_key_dispatch['C-\\'] = (chr(28), '^\\')
@@ -68,6 +63,3 @@ def __setitem__(self, key, value):
 # fill dispatch with function keys
 for x in xrange(1, 13):
     cli_key_dispatch['F%s' % str(x)] = ('KEY_F(%s)' % str(x),)
-
-for x in xrange(1, 13):
-    urwid_key_dispatch['F%s' % str(x)] = 'f%s' % str(x)
diff --git a/bpython/test/test_crashers.py b/bpython/test/test_crashers.py
@@ -104,8 +104,5 @@ def check_no_traceback(self, data):
     class CursesCrashersTest(TrialTestCase, CrashersTest):
         backend = "cli"
 
-    class UrwidCrashersTest(TrialTestCase, CrashersTest):
-        backend = "urwid"
-
 if __name__ == "__main__":
     unittest.main()
diff --git a/bpython/test/test_keys.py b/bpython/test/test_keys.py
@@ -32,37 +32,5 @@ def raiser():
             keys.cli_key_dispatch['C-qwerty']
         self.assertRaises(KeyError, raiser);
 
-class TestUrwidKeys(unittest.TestCase):
-    def test_keymap_map(self):
-        """Verify KeyMap.map being a dictionary with the correct
-        length."""
-        self.assertEqual(len(keys.urwid_key_dispatch.map), 64)
-
-    def test_keymap_setitem(self):
-        """Verify keys.KeyMap correctly setting items."""
-        keys.urwid_key_dispatch['simon'] = 'awesome';
-        self.assertEqual(keys.urwid_key_dispatch['simon'], 'awesome')
-
-    def test_keymap_delitem(self):
-        """Verify keys.KeyMap correctly removing items."""
-        keys.urwid_key_dispatch['simon'] = 'awesome'
-        del keys.urwid_key_dispatch['simon']
-        if 'simon' in keys.urwid_key_dispatch.map:
-            raise Exception('Key still exists in dictionary')
-
-    def test_keymap_getitem(self):
-        """Verify keys.KeyMap correctly looking up items."""
-        self.assertEqual(keys.urwid_key_dispatch['F11'], 'f11')
-        self.assertEqual(keys.urwid_key_dispatch['C-a'], 'ctrl a')
-        self.assertEqual(keys.urwid_key_dispatch['M-a'], 'meta a')
-
-    def test_keymap_keyerror(self):
-        """Verify keys.KeyMap raising KeyError when getting undefined key"""
-        def raiser():
-            keys.urwid_key_dispatch['C-asdf']
-            keys.urwid_key_dispatch['C-qwerty']
-        self.assertRaises(KeyError, raiser);
-
-
 if __name__ == '__main__':
     unittest.main()
