Changeset 391 for python/trunk/Lib/curses

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Lib/curses/__init__.py (modified) (1 diff)
• Lib/curses/has_key.py (modified) (1 diff)
• Lib/curses/panel.py (modified) (1 diff)
• Lib/curses/wrapper.py (modified) (2 diffs)

python/trunk/Lib/curses/__init__.py

@@ -6 +6 @@
    import curses
    from curses import textpad
-   curses.initwin()
+   curses.initscr()
    ...
 
 """
 
-__revision__ = "$Id: __init__.py 61064 2008-02-25 16:29:58Z andrew.kuchling $"
+__revision__ = "$Id$"
 
 from _curses import *

python/trunk/Lib/curses/has_key.py

@@ -183 +183 @@
         _curses.initscr()
         for key in _capability_names.keys():
-            system = _curses.has_key(key)
+            system = key in _curses
             python = has_key(key)
             if system != python:

python/trunk/Lib/curses/panel.py

@@ -4 +4 @@
 """
 
-__revision__ = "$Id: panel.py 36560 2004-07-18 06:16:08Z tim_one $"
+__revision__ = "$Id$"
 
 from _curses_panel import *

python/trunk/Lib/curses/wrapper.py

@@ -18 +18 @@
     """
 
-    res = None
     try:
         # Initialize curses
-        stdscr=curses.initscr()
+        stdscr = curses.initscr()
 
         # Turn off echoing of keys, and enter cbreak mode,
@@ -45 +44 @@
     finally:
         # Set everything back to normal
-        stdscr.keypad(0)
-        curses.echo()
-        curses.nocbreak()
-        curses.endwin()
+        if 'stdscr' in locals():
+            stdscr.keypad(0)
+            curses.echo()
+            curses.nocbreak()
+            curses.endwin()