--- a/components/python/python27/python-27-tests.p5m	Fri Jun 20 11:01:19 2014 -0700
+++ b/components/python/python27/python-27-tests.p5m	Fri Jun 20 12:39:21 2014 -0700
@@ -29,6 +29,8 @@
 set name=pkg.fmri \
     value=pkg:/runtime/python-27/tests@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The Python tests"
+# This package name has known conflicts with other packages in the WOS
+set name=pkg.linted.pkglint.manifest004 value=true
 set name=com.oracle.info.description value="test cases for Python 2.7"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
@@ -42,14 +44,7 @@
 # PSARC 2014/183 Python 2.7.6
 
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-# This package name has known conflicts with other packages in the WOS
-set pkg.linted.pkglint.manifest004=true
-
-
-license python27.license license="PSFv2"
-
-
+#
 file path=usr/lib/python2.7/ctypes/test/__init__.py
 file path=usr/lib/python2.7/ctypes/test/runtests.py
 file path=usr/lib/python2.7/ctypes/test/test_anon.py
@@ -103,6 +98,7 @@
 file path=usr/lib/python2.7/ctypes/test/test_values.py
 file path=usr/lib/python2.7/ctypes/test/test_varsize_struct.py
 file path=usr/lib/python2.7/ctypes/test/test_win32.py
+file path=usr/lib/python2.7/ctypes/test/test_wintypes.py
 file path=usr/lib/python2.7/distutils/tests/Setup.sample
 file path=usr/lib/python2.7/distutils/tests/__init__.py
 file path=usr/lib/python2.7/distutils/tests/setuptools_build_ext.py
@@ -203,6 +199,22 @@
 file path=usr/lib/python2.7/email/test/test_email_codecs_renamed.py
 file path=usr/lib/python2.7/email/test/test_email_renamed.py
 file path=usr/lib/python2.7/email/test/test_email_torture.py
+file path=usr/lib/python2.7/idlelib/idle_test/README.txt
+file path=usr/lib/python2.7/idlelib/idle_test/__init__.py
+file path=usr/lib/python2.7/idlelib/idle_test/htest.py
+file path=usr/lib/python2.7/idlelib/idle_test/mock_idle.py
+file path=usr/lib/python2.7/idlelib/idle_test/mock_tk.py
+file path=usr/lib/python2.7/idlelib/idle_test/test_calltips.py
+file path=usr/lib/python2.7/idlelib/idle_test/test_config_name.py
+file path=usr/lib/python2.7/idlelib/idle_test/test_delegator.py
+file path=usr/lib/python2.7/idlelib/idle_test/test_formatparagraph.py
+file path=usr/lib/python2.7/idlelib/idle_test/test_grep.py
+file path=usr/lib/python2.7/idlelib/idle_test/test_idlehistory.py
+file path=usr/lib/python2.7/idlelib/idle_test/test_pathbrowser.py
+file path=usr/lib/python2.7/idlelib/idle_test/test_rstrip.py
+file path=usr/lib/python2.7/idlelib/idle_test/test_searchengine.py
+file path=usr/lib/python2.7/idlelib/idle_test/test_text.py
+file path=usr/lib/python2.7/idlelib/idle_test/test_warning.py
 file path=usr/lib/python2.7/idlelib/testcode.py
 file path=usr/lib/python2.7/json/tests/__init__.py
 file path=usr/lib/python2.7/json/tests/test_check_circular.py
@@ -220,6 +232,7 @@
 file path=usr/lib/python2.7/json/tests/test_scanstring.py
 file path=usr/lib/python2.7/json/tests/test_separators.py
 file path=usr/lib/python2.7/json/tests/test_speedups.py
+file path=usr/lib/python2.7/json/tests/test_tool.py
 file path=usr/lib/python2.7/json/tests/test_unicode.py
 file path=usr/lib/python2.7/lib-dynload/64/_ctypes_test.so
 file path=usr/lib/python2.7/lib-dynload/64/_testcapi.so
@@ -230,12 +243,15 @@
 file path=usr/lib/python2.7/lib-tk/test/test_tkinter/__init__.py
 file path=usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.py
 file path=usr/lib/python2.7/lib-tk/test/test_tkinter/test_text.py
+file path=usr/lib/python2.7/lib-tk/test/test_tkinter/test_variables.py
+file path=usr/lib/python2.7/lib-tk/test/test_tkinter/test_widgets.py
 file path=usr/lib/python2.7/lib-tk/test/test_ttk/__init__.py
 file path=usr/lib/python2.7/lib-tk/test/test_ttk/support.py
 file path=usr/lib/python2.7/lib-tk/test/test_ttk/test_extensions.py
 file path=usr/lib/python2.7/lib-tk/test/test_ttk/test_functions.py
 file path=usr/lib/python2.7/lib-tk/test/test_ttk/test_style.py
 file path=usr/lib/python2.7/lib-tk/test/test_ttk/test_widgets.py
+file path=usr/lib/python2.7/lib-tk/test/widget_tests.py
 file path=usr/lib/python2.7/lib2to3/tests/__init__.py
 file path=usr/lib/python2.7/lib2to3/tests/data/README
 file path=usr/lib/python2.7/lib2to3/tests/data/bom.py
@@ -277,10 +293,25 @@
 file path=usr/lib/python2.7/test/185test.db
 file path=usr/lib/python2.7/test/Sine-1000Hz-300ms.aif
 file path=usr/lib/python2.7/test/__init__.py
+file path=usr/lib/python2.7/test/audiodata/pluck-pcm16.aiff
+file path=usr/lib/python2.7/test/audiodata/pluck-pcm16.au
+file path=usr/lib/python2.7/test/audiodata/pluck-pcm16.wav
+file path=usr/lib/python2.7/test/audiodata/pluck-pcm24.aiff
+file path=usr/lib/python2.7/test/audiodata/pluck-pcm24.wav
+file path=usr/lib/python2.7/test/audiodata/pluck-pcm32.aiff
+file path=usr/lib/python2.7/test/audiodata/pluck-pcm32.au
+file path=usr/lib/python2.7/test/audiodata/pluck-pcm32.wav
+file path=usr/lib/python2.7/test/audiodata/pluck-pcm8.aiff
+file path=usr/lib/python2.7/test/audiodata/pluck-pcm8.au
+file path=usr/lib/python2.7/test/audiodata/pluck-pcm8.wav
+file path=usr/lib/python2.7/test/audiodata/pluck-ulaw.aifc
+file path=usr/lib/python2.7/test/audiodata/pluck-ulaw.au
 file path=usr/lib/python2.7/test/audiotest.au
+file path=usr/lib/python2.7/test/audiotests.py
 file path=usr/lib/python2.7/test/autotest.py
 file path=usr/lib/python2.7/test/bad_coding.py
 file path=usr/lib/python2.7/test/bad_coding2.py
+file path=usr/lib/python2.7/test/bad_coding3.py
 file path=usr/lib/python2.7/test/badcert.pem
 file path=usr/lib/python2.7/test/badkey.pem
 file path=usr/lib/python2.7/test/badsyntax_future3.py
@@ -293,10 +324,9 @@
 file path=usr/lib/python2.7/test/badsyntax_nocaret.py
 file path=usr/lib/python2.7/test/buffer_tests.py
 file path=usr/lib/python2.7/test/cfgparser.1
-file usr/bin/check_offset \
-    path=usr/lib/python2.7/test/check_offset mode=0555
-file usr/bin/$(MACH64)/check_offset \
-    path=usr/lib/python2.7/test/check_offset64 mode=0555
+file usr/bin/check_offset path=usr/lib/python2.7/test/check_offset mode=0555
+file usr/bin/$(MACH64)/check_offset path=usr/lib/python2.7/test/check_offset64 \
+    mode=0555
 file path=usr/lib/python2.7/test/check_soundcard.vbs
 file path=usr/lib/python2.7/test/cjkencodings/big5-utf8.txt
 file path=usr/lib/python2.7/test/cjkencodings/big5.txt
@@ -486,6 +516,17 @@
 file path=usr/lib/python2.7/test/greyrgb.uue
 file path=usr/lib/python2.7/test/https_svn_python_org_root.pem
 file path=usr/lib/python2.7/test/ieee754.txt
+file path=usr/lib/python2.7/test/imghdrdata/python.bmp
+file path=usr/lib/python2.7/test/imghdrdata/python.gif
+file path=usr/lib/python2.7/test/imghdrdata/python.jpg
+file path=usr/lib/python2.7/test/imghdrdata/python.pbm
+file path=usr/lib/python2.7/test/imghdrdata/python.pgm
+file path=usr/lib/python2.7/test/imghdrdata/python.png
+file path=usr/lib/python2.7/test/imghdrdata/python.ppm
+file path=usr/lib/python2.7/test/imghdrdata/python.ras
+file path=usr/lib/python2.7/test/imghdrdata/python.sgi
+file path=usr/lib/python2.7/test/imghdrdata/python.tiff
+file path=usr/lib/python2.7/test/imghdrdata/python.xbm
 file path=usr/lib/python2.7/test/infinite_reload.py
 file path=usr/lib/python2.7/test/inspect_fodder.py
 file path=usr/lib/python2.7/test/inspect_fodder2.py
@@ -494,6 +535,7 @@
 file path=usr/lib/python2.7/test/lock_tests.py
 file path=usr/lib/python2.7/test/mapping_tests.py
 file path=usr/lib/python2.7/test/math_testcases.txt
+file path=usr/lib/python2.7/test/mp_fork_bomb.py
 file path=usr/lib/python2.7/test/nokia.pem
 file path=usr/lib/python2.7/test/nullbytecert.pem
 file path=usr/lib/python2.7/test/nullcert.pem
@@ -513,6 +555,8 @@
 file path=usr/lib/python2.7/test/relimport.py
 file path=usr/lib/python2.7/test/reperf.py
 file path=usr/lib/python2.7/test/sample_doctest.py
+file path=usr/lib/python2.7/test/sample_doctest_no_docstrings.py
+file path=usr/lib/python2.7/test/sample_doctest_no_doctests.py
 file path=usr/lib/python2.7/test/script_helper.py
 file path=usr/lib/python2.7/test/seq_tests.py
 file path=usr/lib/python2.7/test/sgml_input.html
@@ -520,12 +564,14 @@
 file path=usr/lib/python2.7/test/sortperf.py
 file path=usr/lib/python2.7/test/string_tests.py
 file path=usr/lib/python2.7/test/subprocessdata/sigchild_ignore.py
+file path=usr/lib/python2.7/test/symlink_support.py
 file path=usr/lib/python2.7/test/test_MimeWriter.py
 file path=usr/lib/python2.7/test/test_SimpleHTTPServer.py
 file path=usr/lib/python2.7/test/test_StringIO.py
 file path=usr/lib/python2.7/test/test___all__.py
 file path=usr/lib/python2.7/test/test___future__.py
 file path=usr/lib/python2.7/test/test__locale.py
+file path=usr/lib/python2.7/test/test__osx_support.py
 file path=usr/lib/python2.7/test/test_abc.py
 file path=usr/lib/python2.7/test/test_abstract_numbers.py
 file path=usr/lib/python2.7/test/test_aepack.py
@@ -650,6 +696,7 @@
 file path=usr/lib/python2.7/test/test_fcntl.py
 file path=usr/lib/python2.7/test/test_file.py
 file path=usr/lib/python2.7/test/test_file2k.py
+file path=usr/lib/python2.7/test/test_file_eintr.py
 file path=usr/lib/python2.7/test/test_filecmp.py
 file path=usr/lib/python2.7/test/test_fileinput.py
 file path=usr/lib/python2.7/test/test_fileio.py
@@ -695,9 +742,11 @@
 file path=usr/lib/python2.7/test/test_htmlparser.py
 file path=usr/lib/python2.7/test/test_httplib.py
 file path=usr/lib/python2.7/test/test_httpservers.py
+file path=usr/lib/python2.7/test/test_idle.py
 file path=usr/lib/python2.7/test/test_imageop.py pkg.depend.bypass-generate=.*
 file path=usr/lib/python2.7/test/test_imaplib.py
 file path=usr/lib/python2.7/test/test_imgfile.py
+file path=usr/lib/python2.7/test/test_imghdr.py
 file path=usr/lib/python2.7/test/test_imp.py
 file path=usr/lib/python2.7/test/test_import.py
 file path=usr/lib/python2.7/test/test_importhooks.py
@@ -727,6 +776,7 @@
 file path=usr/lib/python2.7/test/test_macos.py
 file path=usr/lib/python2.7/test/test_macostools.py
 file path=usr/lib/python2.7/test/test_macpath.py
+file path=usr/lib/python2.7/test/test_macurl2path.py
 file path=usr/lib/python2.7/test/test_mailbox.py
 file path=usr/lib/python2.7/test/test_marshal.py
 file path=usr/lib/python2.7/test/test_math.py
@@ -744,12 +794,14 @@
 file path=usr/lib/python2.7/test/test_multibytecodec.py
 file path=usr/lib/python2.7/test/test_multibytecodec_support.py
 file path=usr/lib/python2.7/test/test_multifile.py
-file path=usr/lib/python2.7/test/test_multiprocessing.py pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.7/test/test_multiprocessing.py \
+    pkg.depend.bypass-generate=.*
 file path=usr/lib/python2.7/test/test_mutants.py
 file path=usr/lib/python2.7/test/test_mutex.py
 file path=usr/lib/python2.7/test/test_netrc.py
 file path=usr/lib/python2.7/test/test_new.py
 file path=usr/lib/python2.7/test/test_nis.py
+file path=usr/lib/python2.7/test/test_nntplib.py
 file path=usr/lib/python2.7/test/test_normalization.py
 file path=usr/lib/python2.7/test/test_ntpath.py
 file path=usr/lib/python2.7/test/test_old_mailbox.py
@@ -789,8 +841,8 @@
 file path=usr/lib/python2.7/test/test_pstats.py
 file path=usr/lib/python2.7/test/test_pty.py
 file path=usr/lib/python2.7/test/test_pwd.py
+file path=usr/lib/python2.7/test/test_py3kwarn.py
 file path=usr/lib/python2.7/test/test_py_compile.py
-file path=usr/lib/python2.7/test/test_py3kwarn.py
 file path=usr/lib/python2.7/test/test_pyclbr.py
 file path=usr/lib/python2.7/test/test_pydoc.py
 file path=usr/lib/python2.7/test/test_pyexpat.py
@@ -830,6 +882,7 @@
 file path=usr/lib/python2.7/test/test_sqlite.py
 file path=usr/lib/python2.7/test/test_ssl.py
 file path=usr/lib/python2.7/test/test_startfile.py
+file path=usr/lib/python2.7/test/test_stat.py
 file path=usr/lib/python2.7/test/test_str.py
 file path=usr/lib/python2.7/test/test_strftime.py
 file path=usr/lib/python2.7/test/test_string.py
@@ -841,6 +894,7 @@
 file path=usr/lib/python2.7/test/test_structmembers.py
 file path=usr/lib/python2.7/test/test_structseq.py
 file path=usr/lib/python2.7/test/test_subprocess.py
+file path=usr/lib/python2.7/test/test_sunau.py
 file path=usr/lib/python2.7/test/test_sunaudiodev.py
 file path=usr/lib/python2.7/test/test_sundry.py
 file path=usr/lib/python2.7/test/test_support.py
@@ -939,3 +993,5 @@
 file path=usr/lib/python2.7/test/xmltestdata/test.xml.out
 file path=usr/lib/python2.7/test/xmltests.py
 file path=usr/lib/python2.7/test/zipdir.zip
+#
+license python27.license license=PSFv2

--- a/components/python/python27/python-27.p5m	Fri Jun 20 11:01:19 2014 -0700
+++ b/components/python/python27/python-27.p5m	Fri Jun 20 12:39:21 2014 -0700
@@ -209,6 +209,7 @@
 file path=usr/lib/python2.7/__future__.py
 file path=usr/lib/python2.7/__phello__.foo.py
 file path=usr/lib/python2.7/_abcoll.py
+file path=usr/lib/python2.7/_osx_support.py
 file path=usr/lib/python2.7/_pyio.py
 file path=usr/lib/python2.7/_strptime.py
 file path=usr/lib/python2.7/_sysconfigdata.py
@@ -539,6 +540,13 @@
 file path=usr/lib/python2.7/idlelib/IOBinding.py
 file path=usr/lib/python2.7/idlelib/Icons/folder.gif
 file path=usr/lib/python2.7/idlelib/Icons/idle.icns
+file path=usr/lib/python2.7/idlelib/Icons/idle.ico
+file path=usr/lib/python2.7/idlelib/Icons/idle_16.gif
+file path=usr/lib/python2.7/idlelib/Icons/idle_16.png
+file path=usr/lib/python2.7/idlelib/Icons/idle_32.gif
+file path=usr/lib/python2.7/idlelib/Icons/idle_32.png
+file path=usr/lib/python2.7/idlelib/Icons/idle_48.gif
+file path=usr/lib/python2.7/idlelib/Icons/idle_48.png
 file path=usr/lib/python2.7/idlelib/Icons/minusnode.gif
 file path=usr/lib/python2.7/idlelib/Icons/openfolder.gif
 file path=usr/lib/python2.7/idlelib/Icons/plusnode.gif