*** C:\Lang\Projects\curses\python\src\test_curses.py	Mon Aug  9 18:02:50 2004
--- C:\Lang\Projects\curses\python\test_curses.py	Mon Aug  9 18:03:11 2004
***************
*** 17,22 ****
--- 17,30 ----
  from test import test_support
  test_support.requires('curses')
  
+ if sys.platform == 'win32':
+   import _curses
+   isPDCurses = hasattr(_curses, '_C_API_NAME') \
+     and _curses._C_API_NAME == 'PDCurses M'
+   del _curses
+ else:
+   isPDCurses = False
+ 
  def window_funcs(stdscr):
      "Test the methods of windows"
      win = curses.newwin(10,10)
***************
*** 107,112 ****
--- 115,121 ----
      stdscr.scroll(2)
      stdscr.scroll(-3)
  
+     stdscr.move(12, 2)
      stdscr.setscrreg(10,15)
      win3 = stdscr.subwin(10,10)
      win3 = stdscr.subwin(10,10, 5,5)
***************
*** 128,142 ****
  def module_funcs(stdscr):
      "Test module-level functions"
  
!     for func in [curses.baudrate, curses.beep, curses.can_change_color,
                   curses.cbreak, curses.def_prog_mode, curses.doupdate,
!                  curses.filter, curses.flash, curses.flushinp,
!                  curses.has_colors, curses.has_ic, curses.has_il,
!                  curses.isendwin, curses.killchar, curses.longname,
!                  curses.nocbreak, curses.noecho, curses.nonl,
!                  curses.noqiflush, curses.noraw,
                   curses.reset_prog_mode, curses.termattrs,
!                  curses.termname, curses.erasechar, curses.getsyx]:
          func()
  
      # Functions that actually need arguments
--- 137,153 ----
  def module_funcs(stdscr):
      "Test module-level functions"
  
!     funcs = [curses.baudrate, curses.beep, curses.can_change_color,
                   curses.cbreak, curses.def_prog_mode, curses.doupdate,
!                  curses.flash, curses.flushinp, curses.has_colors, 
!                  curses.has_ic, curses.has_il, curses.isendwin, 
!                  curses.killchar, curses.longname, curses.nocbreak, 
!                  curses.noecho, curses.nonl, curses.noraw,
                   curses.reset_prog_mode, curses.termattrs,
!                  curses.termname, curses.erasechar, curses.getsyx]
!     if not isPDCurses:
!         funcs.expand([curses.filter, curses.noqiflush])
!     for func in funcs:
          func()
  
      # Functions that actually need arguments
***************
*** 144,149 ****
--- 155,161 ----
      curses.delay_output(1)
      curses.echo() ; curses.echo(1)
  
+     if not isPDCurses:
        f = tempfile.TemporaryFile()
        stdscr.putwin(f)
        f.seek(0)
***************
*** 158,167 ****
--- 170,181 ----
      win = curses.newwin(5,5)
      win = curses.newwin(5,5, 1,1)
      curses.nl() ; curses.nl(1)
+     if not isPDCurses:
        curses.putp('abc')
        curses.qiflush()
      curses.raw() ; curses.raw(1)
      curses.setsyx(5,5)
+     if not isPDCurses:
        curses.setupterm(fd=sys.__stdout__.fileno())
        curses.tigetflag('hc')
        curses.tigetnum('co')
***************
*** 178,184 ****
          curses.init_pair(2, 1,1)
          curses.color_content(1)
          curses.color_pair(2)
!         curses.pair_content(curses.COLOR_PAIRS)
          curses.pair_number(0)
  
      if hasattr(curses, 'use_default_colors'):
--- 192,198 ----
          curses.init_pair(2, 1,1)
          curses.color_content(1)
          curses.color_pair(2)
!         curses.pair_content(curses.COLOR_PAIRS - 1)
          curses.pair_number(0)
  
      if hasattr(curses, 'use_default_colors'):