[Python-checkins] r80039 - in python/branches/release31-maint: Lib/test/test_winsound.py

[mark.dickinson]

Author: mark.dickinson
Date: Tue Apr 13 13:53:16 2010
New Revision: 80039

Log:
Merged revisions 80036 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80036 | mark.dickinson | 2010-04-13 12:43:10 +0100 (Tue, 13 Apr 2010) | 9 lines
  
  Merged revisions 80035 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r80035 | mark.dickinson | 2010-04-13 12:37:23 +0100 (Tue, 13 Apr 2010) | 1 line
    
    In test_winsound, don't try to import _winreg until after checking that winsound is supported.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/test_winsound.py

Modified: python/branches/release31-maint/Lib/test/test_winsound.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_winsound.py	(original)
+++ python/branches/release31-maint/Lib/test/test_winsound.py	Tue Apr 13 13:53:16 2010
@@ -6,9 +6,9 @@
 import time
 import os
 import subprocess
-import winreg
 
 winsound = support.import_module('winsound')
+import winreg
 
 def has_sound(sound):
     """Find out if a particular event is configured with a default sound"""