diff options
author | Brandon Benvie <brandon@bbenvie.com> | 2012-01-29 08:13:42 +0400 |
---|---|---|
committer | Ben Noordhuis <info@bnoordhuis.nl> | 2012-01-30 03:27:07 +0400 |
commit | 5403a8ce4cce83a13569b09ee5b2ba3d1ad8c176 (patch) | |
tree | fec6c0c58f9e75ebf4b161d8cfc1fb7626f00192 /lib | |
parent | e3c0c86b280854e4ad8db9bd5f6c645ffe9e9966 (diff) |
core: add `NativeModule.prototype.deprecate`
Formalize and cleanup handling of deprecated core methods.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/http.js | 9 | ||||
-rw-r--r-- | lib/os.js | 3 | ||||
-rw-r--r-- | lib/path.js | 6 | ||||
-rw-r--r-- | lib/util.js | 31 |
4 files changed, 12 insertions, 37 deletions
diff --git a/lib/http.js b/lib/http.js index ad1e71baebb..f41b94d45c2 100644 --- a/lib/http.js +++ b/lib/http.js @@ -1606,9 +1606,7 @@ exports._connectionListener = connectionListener; // Legacy Interface function Client(port, host) { - // TODO http.Client can be removed in v0.9. Until then leave this message. - util._deprecationWarning('http', 'http.Client is a legacy interface' + - ' and will be removed in the near future. Do not use it.'); + if (!(this instanceof Client)) return new Client(port, host); host = host || 'localhost'; port = port || 80; this.host = host; @@ -1646,6 +1644,11 @@ Client.prototype.request = function(method, path, headers) { }; exports.Client = Client; + +// TODO http.Client can be removed in v0.9. Until then leave this message. +module.deprecate('Client', 'It will be removed in the near future. Do not use it.'); + exports.createClient = function(port, host) { return new Client(port, host); }; +module.deprecate('createClient', 'Use `http.request` instead.'); diff --git a/lib/os.js b/lib/os.js index f226e3ecbf2..21a95a13597 100644 --- a/lib/os.js +++ b/lib/os.js @@ -38,7 +38,6 @@ exports.platform = function() { }; exports.getNetworkInterfaces = function() { - require('util')._deprecationWarning('os', - 'os.getNetworkInterfaces() is deprecated - use os.networkInterfaces()'); return exports.networkInterfaces(); }; +module.deprecate('getNetworkInterfaces', 'It is now called `os.networkInterfaces`.'); diff --git a/lib/path.js b/lib/path.js index bdae368c256..14805e05b8a 100644 --- a/lib/path.js +++ b/lib/path.js @@ -403,18 +403,18 @@ exports.extname = function(path) { exports.exists = function(path, callback) { - _deprecationWarning('path', '`path.exists` is now called `fs.exists`'); require('fs').exists(path, callback); }; +module.deprecate('exists', 'It is now called `fs.exists`.'); exports.existsSync = function(path) { - _deprecationWarning('path', '`path.exists` is now called `fs.exists`'); return require('fs').existsSync(path); }; +module.deprecate('existsSync', 'It is now called `fs.existsSync`.'); -exports._makeLong = isWindows ? +exports._makeLong = isWindows ? function(path) { var resolvedPath = exports.resolve(path); diff --git a/lib/util.js b/lib/util.js index d3b13066f88..5750159e827 100644 --- a/lib/util.js +++ b/lib/util.js @@ -407,18 +407,12 @@ function objectToString(o) { } -var pWarning; - exports.p = function() { - if (!pWarning) { - pWarning = 'util.p will be removed in future versions of Node. ' + - 'Use util.puts(util.inspect()) instead.\n'; - exports.error(pWarning); - } for (var i = 0, len = arguments.length; i < len; ++i) { error(exports.inspect(arguments[i])); } }; +module.deprecate('p', 'Use `util.puts(util.inspect())` instead.'); function pad(n) { @@ -444,15 +438,10 @@ exports.log = function(msg) { }; -var execWarning; exports.exec = function() { - if (!execWarning) { - execWarning = 'util.exec has moved to the "child_process" module.' + - ' Please update your source code.'; - error(execWarning); - } return require('child_process').exec.apply(this, arguments); }; +module.deprecate('exec', 'It is now called `child_process.exec`.'); exports.pump = function(readStream, writeStream, callback) { @@ -517,19 +506,3 @@ exports.inherits = function(ctor, superCtor) { } }); }; - -var deprecationWarnings; - -exports._deprecationWarning = function(moduleId, message) { - if (!deprecationWarnings) - deprecationWarnings = {}; - else if (message in deprecationWarnings) - return; - - deprecationWarnings[message] = true; - - if ((new RegExp('\\b' + moduleId + '\\b')).test(process.env.NODE_DEBUG)) - console.trace(message); - else - console.error(message); -}; |