Skip to content

Commit

Permalink
Merge pull request #2007 from simov/fix-extend
Browse files Browse the repository at this point in the history
Use the `extend` module instead of util._extend
  • Loading branch information
simov committed Jan 13, 2016
2 parents dd168ae + 2976339 commit 85f8235
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
5 changes: 3 additions & 2 deletions lib/har.js
Expand Up @@ -3,7 +3,7 @@
var fs = require('fs')
var qs = require('querystring')
var validate = require('har-validator')
var util = require('util')
var extend = require('extend')

function Har (request) {
this.request = request
Expand Down Expand Up @@ -118,7 +118,8 @@ Har.prototype.options = function (options) {
return options
}

var har = util._extend({}, options.har)
var har = {}
extend(har, options.har)

// only process the first entry
if (har.log && har.log.entries) {
Expand Down
3 changes: 2 additions & 1 deletion request.js
Expand Up @@ -15,6 +15,7 @@ var http = require('http')
, caseless = require('caseless')
, ForeverAgent = require('forever-agent')
, FormData = require('form-data')
, extend = require('extend')
, isTypedArray = require('is-typedarray').strict
, helpers = require('./lib/helpers')
, cookies = require('./lib/cookies')
Expand Down Expand Up @@ -123,7 +124,7 @@ function Request (options) {
var reserved = Object.keys(Request.prototype)
var nonReserved = filterForNonReserved(reserved, options)

util._extend(self, nonReserved)
extend(self, nonReserved)
options = filterOutReservedFunctions(reserved, options)

self.readable = true
Expand Down

0 comments on commit 85f8235

Please sign in to comment.