Fix nodejs#1707 hasOwnProperty usage

pmario · Sep 15, 2011 · 98990b9 · 98990b9
1 parent 5724b54
commit 98990b9
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/lib/module.js b/lib/module.js
@@ -25,6 +25,12 @@ var runInThisContext = Script.runInThisContext;
 var runInNewContext = Script.runInNewContext;
 var assert = require('assert').ok;
 
+
+function hOP(obj, prop) {
+  return Object.prototype.hasOwnProperty.call(obj, prop);
+}
+
+
 function Module(id, parent) {
   this.id = id;
   this.exports = {};
@@ -85,7 +91,7 @@ function statPath(path) {
 var packageCache = {};
 
 function readPackage(requestPath) {
-  if (packageCache.hasOwnProperty(requestPath)) {
+  if (hOP(packageCache, requestPath)) {
     return packageCache[requestPath];
   }
 

diff --git a/lib/querystring.js b/lib/querystring.js
@@ -25,6 +25,11 @@ var QueryString = exports;
 var urlDecode = process.binding('http_parser').urlDecode;
 
 
+function hOP(obj, prop) {
+  return Object.prototype.hasOwnProperty.call(obj, prop);
+}
+
+
 function charCode(c) {
   return c.charCodeAt(0);
 }
@@ -166,7 +171,7 @@ QueryString.parse = QueryString.decode = function(qs, sep, eq) {
     var k = QueryString.unescape(x[0], true);
     var v = QueryString.unescape(x.slice(1).join(eq), true);
 
-    if (!obj.hasOwnProperty(k)) {
+    if (!hOP(obj, k)) {
       obj[k] = v;
     } else if (!Array.isArray(obj[k])) {
       obj[k] = [obj[k], v];

diff --git a/lib/repl.js b/lib/repl.js
@@ -46,6 +46,12 @@ var path = require('path');
 var fs = require('fs');
 var rl = require('readline');
 
+
+function hOP(obj, prop) {
+  return Object.prototype.hasOwnProperty.call(obj, prop);
+}
+
+
 var context;
 
 var disableColors = true;
@@ -446,7 +452,7 @@ REPLServer.prototype.complete = function(line) {
       group.sort();
       for (var j = 0; j < group.length; j++) {
         c = group[j];
-        if (!uniq.hasOwnProperty(c)) {
+        if (!hOP(uniq, c)) {
           completions.push(c);
           uniq[c] = true;
         }