Index: library/init.tcl
===================================================================
RCS file: /cvsroot/tcl/tcl/library/init.tcl,v
retrieving revision 1.121
diff -w -u -r1.121 init.tcl
--- library/init.tcl	9 Mar 2009 09:12:39 -0000	1.121
+++ library/init.tcl	1 Dec 2009 22:28:08 -0000
@@ -14,7 +14,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
 
-if {[info commands package] == ""} {
+if {![llength [info commands package]]} {
     error "version mismatch: library\nscripts expect Tcl version 7.5b1 or later but the loaded version is\nonly [info patchlevel]"
 }
 package require -exact Tcl 8.6b1.1
Index: library/tcltest/tcltest.tcl
===================================================================
RCS file: /cvsroot/tcl/tcl/library/tcltest/tcltest.tcl,v
retrieving revision 1.106
diff -w -u -r1.106 tcltest.tcl
--- library/tcltest/tcltest.tcl	1 Sep 2009 14:13:23 -0000	1.106
+++ library/tcltest/tcltest.tcl	1 Dec 2009 22:28:08 -0000
@@ -255,9 +255,9 @@
     # tests that use threads need to know which is the main thread
     Default mainThread 1
     variable mainThread
-    if {[info commands thread::id] != {}} {
+    if {[llength [info commands thread::id]]} {
 	set mainThread [thread::id]
-    } elseif {[info commands testthread] != {}} {
+    } elseif {[llength [info commands testthread]]} {
 	set mainThread [testthread id]
     }
 
@@ -1317,7 +1317,7 @@
 
     # Check for internationalization
     ConstraintInitializer hasIsoLocale {
-	if {[llength [info commands testlocale]] == 0} {
+	if {![llength [info commands testlocale]]} {
 	    set code 0
 	} else {
 	    set code [string length [SetIso8859_1_Locale]]
@@ -2308,7 +2308,7 @@
 #       additional things that should be done at cleanup.
 #
 
-if {[llength [info commands tcltest::cleanupTestsHook]] == 0} {
+if {![llength [info commands tcltest::cleanupTestsHook]]} {
     proc tcltest::cleanupTestsHook {} {}
 }
 
@@ -3201,7 +3201,7 @@
 proc tcltest::SetIso8859_1_Locale {} {
     variable previousLocale
     variable isoLocale
-    if {[info commands testlocale] != ""} {
+    if {[llength [info commands testlocale]]} {
 	set previousLocale [testlocale ctype]
 	testlocale ctype $isoLocale
     }
@@ -3223,7 +3223,7 @@
 
 proc tcltest::RestoreLocale {} {
     variable previousLocale
-    if {[info commands testlocale] != ""} {
+    if {[llength [info commands testlocale]]} {
 	testlocale ctype $previousLocale
     }
     return
@@ -3245,7 +3245,7 @@
 #
 
 proc tcltest::threadReap {} {
-    if {[info commands testthread] != {}} {
+    if {[llength [info commands testthread]]} {
 
 	# testthread built into tcltest
 
@@ -3265,7 +3265,7 @@
 	}
 	testthread errorproc ThreadError
 	return [llength [testthread names]]
-    } elseif {[info commands thread::id] != {}} {
+    } elseif {[llength [info commands thread::id]]} {
 	
 	# Thread extension
 
