App::import to App::uses

lib/Cake/Console/Command/Task/TestTask.php

@@ -279,7 +279,7 @@ class TestTask extends BakeTask {
  */
 	public function buildTestSubject($type, $class) {
 		ClassRegistry::flush();
-		App::import($type, $class);
+		App::uses($class, $type);
 		$class = $this->getRealClassName($type, $class);
 		if (strtolower($type) === 'model') {
 			$instance = ClassRegistry::init($class);

lib/Cake/Network/Email/CakeEmail.php

@@ -24,7 +24,6 @@ App::uses('AbstractTransport', 'Network/Email');
 App::uses('File', 'Utility');
 App::uses('String', 'Utility');
 App::uses('View', 'View');
-App::import('I18n', 'Multibyte');
 
 /**
  * Cake e-mail class.
@@ -980,7 +979,7 @@ class CakeEmail {
  *		'contentDisposition' => false
  * ));
  * }}}
- * 
+ *
  * Attach a file from string and specify additional properties:
  *
  * {{{

lib/Cake/Utility/Sanitize.php

@@ -20,7 +20,7 @@
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 
-App::import('Model', 'ConnectionManager');
+App::uses('ConnectionManager', 'Model');
 
 /**
  * Data Sanitization.