Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use the extend module instead of util._extend #2007

Merged
merged 1 commit into from Jan 13, 2016
Merged

Use the extend module instead of util._extend #2007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions lib/har.js
View file
Open in desktop
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
View file
Open in desktop
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