From 87cb68aecad08775808f1c28d84f3935fe8bb274 Mon Sep 17 00:00:00 2001 From: Nikolai Vavilov Date: Sat, 6 Dec 2014 16:42:24 +0200 Subject: [PATCH] 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 --- lib/path.js | 6 ------ test/simple/test-module-nodemodulepaths.js | 5 ++--- test/simple/test-path.js | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/lib/path.js b/lib/path.js index 8b08496b48e9fe..61f35b39273b24 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 af44840b4b49eb..3d48d99ab94b72 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 cdd59bcd5d93ec..7a8a1b14a904a6 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'],