summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2009-01-02 14:48:17 (GMT)
committerRonald Oussoren <ronaldoussoren@mac.com>2009-01-02 14:48:17 (GMT)
commit7f8cbf0e735ee6ebf7fea7eed70d4bb5b992323f (patch)
treea86a5fb29ddf5836cc6117f5c871322c4822857b
parent63b74feb518820f18279b4bfc680bfb9887735c7 (diff)
downloadcpython-7f8cbf0e735ee6ebf7fea7eed70d4bb5b992323f.zip
cpython-7f8cbf0e735ee6ebf7fea7eed70d4bb5b992323f.tar.gz
cpython-7f8cbf0e735ee6ebf7fea7eed70d4bb5b992323f.tar.bz2
Fix for issue 1627952
-rw-r--r--Lib/plat-mac/videoreader.py2
-rw-r--r--Misc/NEWS2
2 files changed, 3 insertions, 1 deletions
diff --git a/Lib/plat-mac/videoreader.py b/Lib/plat-mac/videoreader.py
index 28b71ff..9dd7d67 100644
--- a/Lib/plat-mac/videoreader.py
+++ b/Lib/plat-mac/videoreader.py
@@ -18,7 +18,7 @@ from Carbon import Qdoffs
from Carbon import QDOffscreen
from Carbon import Res
try:
- import MediaDescr
+ from Carbon import MediaDescr
except ImportError:
def _audiodescr(data):
return None
diff --git a/Misc/NEWS b/Misc/NEWS
index d2555a3..c05f8cf 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -230,6 +230,8 @@ Library
- Issue #900949: plat-mac/videoreader.py no longer relies on a non-existing
module.
+- Issue #16278952: plat-mac/videoreader.py now correctly imports MediaDescr
+
Tools/Demos
-----------