diff options
author | Nikolai Vavilov <vvnicholas@gmail.com> | 2014-12-06 16:42:24 +0200 |
---|---|---|
committer | Bert Belder <bertbelder@gmail.com> | 2014-12-08 17:35:52 +0100 |
commit | e24fa83e69194f05999c4d559482ca87dda2af44 (patch) | |
tree | 94a7edc187b30e79b39dbb96a377eddaed8249d0 | |
parent | e3aa802b382d2893db0218730b70f60e0c16874a (diff) | |
download | android-node-v8-e24fa83e69194f05999c4d559482ca87dda2af44.tar.gz android-node-v8-e24fa83e69194f05999c4d559482ca87dda2af44.tar.bz2 android-node-v8-e24fa83e69194f05999c4d559482ca87dda2af44.zip |
Revert "path: resolve normalize drive letter to lower case"
This reverts commit f6e574018090ed4d63596b8a3bb614f8f48b6267.
Changing drive letters to lowercase violates the principle of
least surprise. Other functions that do this should get fixed too.
Conflicts:
lib/path.js
PR-URL: https://github.com/iojs/io.js/pull/100
Reviewed-By: Bert Belder <bertbelder@gmail.com>
-rw-r--r-- | lib/path.js | 6 | ||||
-rw-r--r-- | test/simple/test-module-nodemodulepaths.js | 5 | ||||
-rw-r--r-- | test/simple/test-path.js | 2 |
3 files changed, 3 insertions, 10 deletions
diff --git a/lib/path.js b/lib/path.js index 8b08496b48..61f35b3927 100644 --- a/lib/path.js +++ b/lib/path.js @@ -162,12 +162,6 @@ win32.resolve = function() { resolvedTail = normalizeArray(resolvedTail.split(/[\\\/]+/).filter(f), !resolvedAbsolute).join('\\'); - // If device is a drive letter, we'll normalize to lower case. - if (resolvedDevice && resolvedDevice.charAt(1) === ':') { - resolvedDevice = resolvedDevice[0].toLowerCase() + - resolvedDevice.substr(1); - } - return (resolvedDevice + (resolvedAbsolute ? '\\' : '') + resolvedTail) || '.'; }; diff --git a/test/simple/test-module-nodemodulepaths.js b/test/simple/test-module-nodemodulepaths.js index af44840b4b..3d48d99ab9 100644 --- a/test/simple/test-module-nodemodulepaths.js +++ b/test/simple/test-module-nodemodulepaths.js @@ -21,7 +21,6 @@ var common = require('../common'); var assert = require('assert'); -var path = require('path'); var module = require('module'); @@ -30,7 +29,7 @@ var isWindows = process.platform === 'win32'; var file, delimiter, paths; if (isWindows) { - file = path.normalize('C:\\Users\\Rocko Artischocko\\node_stuff\\foo'); + file = 'C:\\Users\\Rocko Artischocko\\node_stuff\\foo'; delimiter = '\\' } else { file = '/usr/test/lib/node_modules/npm/foo'; @@ -40,4 +39,4 @@ if (isWindows) { paths = module._nodeModulePaths(file); assert.ok(paths.indexOf(file + delimiter + 'node_modules') !== -1); -assert.ok(Array.isArray(paths)); +assert.ok(Array.isArray(paths));
\ No newline at end of file diff --git a/test/simple/test-path.js b/test/simple/test-path.js index cdd59bcd5d..7a8a1b14a9 100644 --- a/test/simple/test-path.js +++ b/test/simple/test-path.js @@ -311,7 +311,7 @@ if (isWindows) { [['c:/ignore', 'd:\\a/b\\c/d', '\\e.exe'], 'd:\\e.exe'], [['c:/ignore', 'c:/some/file'], 'c:\\some\\file'], [['d:/ignore', 'd:some/dir//'], 'd:\\ignore\\some\\dir'], - [['.'], path.normalize(process.cwd())], + [['.'], process.cwd()], [['//server/share', '..', 'relative\\'], '\\\\server\\share\\relative'], [['c:/', '//'], 'c:\\'], [['c:/', '//dir'], 'c:\\dir'], |