diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/src/Nucleus/Binder/Bounding.php b/src/Nucleus/Binder/Bounding.php
index <HASH>..<HASH> 100644
--- a/src/Nucleus/Binder/Bounding.php
+++ b/src/Nucleus/Binder/Bounding.php
@@ -1,17 +1,17 @@
<?php
-namespace Nucleus\Binder\Bound;
+namespace Nucleus\Binder;
/**
* @Annotation
- *
+ *
* @Target({"PROPERTY"})
*/
class Bounding
{
public $scope = IBinder::DEFAULT_SCOPE;
- public $namespace = IBinder::DEFAULT_NAMESPACE;
+ public $namespace = null;
public $variableName = null;
}
\ No newline at end of file
|
[b] wrong namespace for the Bounding class
|
diff --git a/src/org/zaproxy/zap/extension/bruteforce/BruteForcePanel.java b/src/org/zaproxy/zap/extension/bruteforce/BruteForcePanel.java
index <HASH>..<HASH> 100644
--- a/src/org/zaproxy/zap/extension/bruteforce/BruteForcePanel.java
+++ b/src/org/zaproxy/zap/extension/bruteforce/BruteForcePanel.java
@@ -146,7 +146,7 @@ public class BruteForcePanel extends AbstractPanel implements BruteForceListenne
// Wont need to do this if/when this class is changed to extend ScanPanel
scanStatus = new ScanStatus(
new ImageIcon(
- BruteForcePanel.class.getResource("/resource/icon/16/086.png")),
+ BruteForcePanel.class.getResource(ExtensionBruteForce.HAMMER_ICON_RESOURCE)),
Constant.messages.getString("bruteforce.panel.title"));
if (View.isInitialised()) {
|
Issue <I> - Forced Browse footer status label still uses spanner icon
Changed to use the hammer icon.
|
diff --git a/www/src/Lib/_struct.py b/www/src/Lib/_struct.py
index <HASH>..<HASH> 100644
--- a/www/src/Lib/_struct.py
+++ b/www/src/Lib/_struct.py
@@ -439,6 +439,23 @@ def _clearcache():
"Clear the internal cache."
# No cache in this implementation
+class Struct:
+
+ def __init__(self, fmt):
+ self.format = fmt
+
+ def pack(self, *args):
+ return pack(self.format, *args)
+
+ def pack_into(self, *args):
+ return pack_into(self.format, *args)
+
+ def unpack(self, *args):
+ return unpack(self.format, *args)
+
+ def unpack_from(self, *args):
+ return unpack_from(self.format, *args)
+
if __name__=='__main__':
t = pack('Bf',1,2)
print(t, len(t))
|
Fixes issue #<I> : "struct" module is missing the "Struct" class
|
diff --git a/tests/unit/test_handler.py b/tests/unit/test_handler.py
index <HASH>..<HASH> 100644
--- a/tests/unit/test_handler.py
+++ b/tests/unit/test_handler.py
@@ -190,4 +190,4 @@ def test_invalid_client_certs():
incorrect arguments specifying client cert/key verification"""
with pytest.raises(ValueError):
# missing client cert
- GELFTLSHandler("127.0.0.1", keyfile="badkey")
+ GELFTLSHandler("127.0.0.1", keyfile="/dev/null")
|
changing keyfile to valid file for test
|
diff --git a/app/xmpp/msg-processors/room-info.js b/app/xmpp/msg-processors/room-info.js
index <HASH>..<HASH> 100644
--- a/app/xmpp/msg-processors/room-info.js
+++ b/app/xmpp/msg-processors/room-info.js
@@ -45,6 +45,10 @@ module.exports = MessageProcessor.extend({
});
query.c('feature', {
+ var: 'muc_persistent'
+ });
+
+ query.c('feature', {
var: 'muc_open'
});
@@ -56,6 +60,10 @@ module.exports = MessageProcessor.extend({
var: 'muc_nonanonymous'
});
+ query.c('feature', {
+ var: 'muc_unsecured'
+ });
+
cb(null, stanza);
},
|
Improved XMPP room info
|
diff --git a/framework/db/ar/CActiveRecord.php b/framework/db/ar/CActiveRecord.php
index <HASH>..<HASH> 100644
--- a/framework/db/ar/CActiveRecord.php
+++ b/framework/db/ar/CActiveRecord.php
@@ -66,6 +66,8 @@ abstract class CActiveRecord extends CModel
/**
* Constructor.
* @param string $scenario scenario name. See {@link CModel::scenario} for more details about this parameter.
+ * Note: in order to setup initial model parameters use {@link init()} or {@link afterConstruct()}.
+ * Do NOT override the constructor unless it is absolutely necessary!
*/
public function __construct($scenario='insert')
{
|
Note about overriding "CActiveRecord::__construct()" has been added.
|
diff --git a/python/herald/transports/xmpp/utils.py b/python/herald/transports/xmpp/utils.py
index <HASH>..<HASH> 100644
--- a/python/herald/transports/xmpp/utils.py
+++ b/python/herald/transports/xmpp/utils.py
@@ -137,7 +137,7 @@ class RoomCreator(object):
self.__lock = threading.Lock()
def create_room(self, room, service, nick, config=None,
- callback=None, errback=None):
+ callback=None, errback=None, room_jid=None):
"""
Prepares the creation of a room.
@@ -157,12 +157,16 @@ class RoomCreator(object):
:param config: Configuration of the room
:param callback: Method called back on success
:param errback: Method called on error
+ :param room_jid: Forced room JID
"""
self.__logger.debug("Creating room: %s", room)
with self.__lock:
- # Format the room JID
- room_jid = sleekxmpp.JID(local=room, domain=service).bare
+ if not room_jid:
+ # Generate/Format the room JID if not given
+ room_jid = sleekxmpp.JID(local=room, domain=service).bare
+
+ self.__logger.debug("... Room JID: %s", room_jid)
if not self.__rooms:
# First room to create: register to events
|
Support for forced room JID in XMPP RoomCreator
|
diff --git a/vel/rl/commands/record_movie_command.py b/vel/rl/commands/record_movie_command.py
index <HASH>..<HASH> 100644
--- a/vel/rl/commands/record_movie_command.py
+++ b/vel/rl/commands/record_movie_command.py
@@ -76,7 +76,7 @@ class RecordMovieCommand:
video = cv2.VideoWriter(takename, fourcc, self.fps, (frames[0].shape[1], frames[0].shape[0]))
for i in tqdm.trange(len(frames), file=sys.stdout):
- video.write(frames[i])
+ video.write(cv2.cvtColor(frames[i], cv2.COLOR_RGB2BGR))
video.release()
print(f"Written {takename}")
|
Fixing colorspace in movie recording code.
|
diff --git a/web/concrete/elements/custom_style.php b/web/concrete/elements/custom_style.php
index <HASH>..<HASH> 100644
--- a/web/concrete/elements/custom_style.php
+++ b/web/concrete/elements/custom_style.php
@@ -82,9 +82,8 @@ $alignmentOptions = array(
);
-$customClassesSelect = array(
- '' => t('None')
-);
+$customClassesSelect = array();
+
if (is_array($customClasses)) {
foreach($customClasses as $class) {
$customClassesSelect[$class] = $class;
@@ -302,7 +301,7 @@ $form = Core::make('helper/form');
<div>
<?=t('Custom Class')?>
- <?=$form->select('customClass', $customClassesSelect, $customClass);?>
+ <?= $form->text('customClass', $customClass);?>
</div>
<hr/>
@@ -337,4 +336,5 @@ $form = Core::make('helper/form');
<script type="text/javascript">
$('#ccm-inline-design-form').<?=$method?>();
+ $("#customClass").select2({tags:<?= json_encode(array_values($customClassesSelect)); ?>, separator: " "});
</script>
\ No newline at end of file
|
Convert custom block class selection into a select2 tag selection field to support custom and multiple classes.
Former-commit-id: <I>d<I>e<I>debf<I>aad0fff8bc<I>e<I>
|
diff --git a/lib/datagrid/drivers/array.rb b/lib/datagrid/drivers/array.rb
index <HASH>..<HASH> 100644
--- a/lib/datagrid/drivers/array.rb
+++ b/lib/datagrid/drivers/array.rb
@@ -3,7 +3,7 @@ module Datagrid
class Array < AbstractDriver #:nodoc:
def self.match?(scope)
- !Datagrid::Drivers::ActiveRecord.match?(scope) && scope.is_a?(::Array)
+ !Datagrid::Drivers::ActiveRecord.match?(scope) && (scope.is_a?(::Array) || scope.is_a?(Enumerator))
end
def to_scope(scope)
diff --git a/spec/datagrid/drivers/array_spec.rb b/spec/datagrid/drivers/array_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/datagrid/drivers/array_spec.rb
+++ b/spec/datagrid/drivers/array_spec.rb
@@ -89,5 +89,18 @@ describe Datagrid::Drivers::Array do
it {should == [third, first, second]}
end
end
+
end
+ describe "when using enumerator scope" do
+
+ it "should work fine" do
+ grid = test_report(to_enum: true) do
+ scope {[]}
+ filter(:to_enum, :boolean) do |_, scope|
+ scope.to_enum
+ end
+ end
+ grid.assets.should_not be_any
+ end
+ end
end
|
Ability to use enumerator as array driver
|
diff --git a/addict/__init__.py b/addict/__init__.py
index <HASH>..<HASH> 100644
--- a/addict/__init__.py
+++ b/addict/__init__.py
@@ -2,7 +2,7 @@ from .addict import Dict
__title__ = 'addict'
-__version__ = '1.0.0'
+__version__ = '1.1.0'
__author__ = 'Mats Julian Olsen'
__license__ = 'MIT'
__copyright__ = 'Copyright 2014, 2015, 2016 Mats Julian Olsen'
|
<I>
Added __add__ and bugfix to __init__.
|
diff --git a/src/Assets/js/wasabi.js b/src/Assets/js/wasabi.js
index <HASH>..<HASH> 100644
--- a/src/Assets/js/wasabi.js
+++ b/src/Assets/js/wasabi.js
@@ -67,6 +67,20 @@ var WS = (function() {
return this.modules[name];
}
console.debug('module "' + name + " is not registered.");
+ },
+
+ createView: function(viewClass, options) {
+ return this.viewFactory.create(viewClass, options || {});
+ },
+
+ createViews: function($elements, ViewClass, options) {
+ var views = [];
+ if ($elements.length > 0) {
+ $elements.each(function(index, el) {
+ views.push(WS.createView(ViewClass, _.extend({el: el}, options || {})));
+ });
+ }
+ return views;
}
};
|
add createView and createViews helper methods to initialize a single or multiple backbone views for the given element(s)
|
diff --git a/client/api/story.js b/client/api/story.js
index <HASH>..<HASH> 100644
--- a/client/api/story.js
+++ b/client/api/story.js
@@ -39,14 +39,14 @@ Story.prototype.setHash = function(name, hash) {
return this;
};
-Story.prototype.getData = function(name) {
+Story.prototype.getData = (name) => {
const nameData = name + '-data';
const data = localStorage.getItem(nameData);
return data || '';
};
-Story.prototype.getHash = function(name) {
+Story.prototype.getHash = (name) => {
const item = name + '-hash';
const data = localStorage.getItem(item);
|
chore(story) lint
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -7,6 +7,9 @@ function furkotTrip() {
var form, stops;
function plan(data) {
+ if (!form) {
+ form = createForm();
+ }
stops.value = JSON.stringify(data);
return form.submit();
}
@@ -16,13 +19,19 @@ function furkotTrip() {
return hidden ? '_blank' : '_top';
}
- form = document.createElement('form');
- form.action = 'https://trips.furkot.com/trip';
- form.method = 'post';
- form.target = target();
- stops = document.createElement('input');
- stops.name = 'stops';
- form.appendChild(stops);
+ function createForm() {
+ var form = document.createElement('form');
+ form.style.display = 'none';
+ form.action = 'https://trips.furkot.com/trip';
+ form.method = 'post';
+ form.target = target();
+ stops = document.createElement('input');
+ stops.name = 'stops';
+ form.appendChild(stops);
+ // Firefox needs form in DOM
+ document.body.appendChild(form);
+ return form;
+ }
return {
plan: plan
|
fix form submission on Firefox
Firefox does not submit forms unless they are added to document body
|
diff --git a/lib/moped/node.rb b/lib/moped/node.rb
index <HASH>..<HASH> 100644
--- a/lib/moped/node.rb
+++ b/lib/moped/node.rb
@@ -502,7 +502,7 @@ module Moped
instrument_start = (logger = Moped.logger) && logger.debug? && Time.new
yield
ensure
- log_operations(logger, operations, Time.new - instrument_start) if instrument_start && !$!
+ log_operations(logger, operations, Time.new - instrument_start) if instrument_start
end
def log_operations(logger, ops, duration)
|
Log even if end of file reached.
|
diff --git a/config/webpack/build.webpack.config.js b/config/webpack/build.webpack.config.js
index <HASH>..<HASH> 100644
--- a/config/webpack/build.webpack.config.js
+++ b/config/webpack/build.webpack.config.js
@@ -37,10 +37,11 @@ const SaveStats = function () {
* @name SaveMetadata
*/
const SaveMetadata = function () {
+ const metadata = [];
+
this.plugin('emit', (compilation, done) => {
const formatName = 'SKY_PAGES_READY_%s';
const formatDeclare = '%s\nvar %s = true;\n';
- const metadata = [];
// Only care about JS files
Object.keys(compilation.assets).forEach((key) => {
@@ -61,9 +62,11 @@ const SaveMetadata = function () {
fallback: fallback
});
});
+ done();
+ });
+ this.plugin('done', () => {
writeJson('metadata.json', metadata);
- done();
});
};
|
Waiting until done to write metadata file
|
diff --git a/client/state/login/reducer.js b/client/state/login/reducer.js
index <HASH>..<HASH> 100644
--- a/client/state/login/reducer.js
+++ b/client/state/login/reducer.js
@@ -253,17 +253,17 @@ export const socialAccountLink = createReducer(
);
export default combineReducers( {
+ isFormDisabled,
isRequesting,
isRequestingTwoFactorAuth,
magicLogin,
redirectTo,
- isFormDisabled,
requestError,
requestNotice,
requestSuccess,
- twoFactorAuth,
- twoFactorAuthRequestError,
- twoFactorAuthPushPoll,
socialAccount,
socialAccountLink,
+ twoFactorAuth,
+ twoFactorAuthPushPoll,
+ twoFactorAuthRequestError,
} );
|
Login: Order exports in reducer alphabetically
|
diff --git a/src/main/java/org/asteriskjava/manager/action/OriginateAction.java b/src/main/java/org/asteriskjava/manager/action/OriginateAction.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/asteriskjava/manager/action/OriginateAction.java
+++ b/src/main/java/org/asteriskjava/manager/action/OriginateAction.java
@@ -131,7 +131,8 @@ public class OriginateAction extends AbstractManagerAction
* presentation indicator.<br>
* In essence, it says, 'Is the person who has been called allowed to see the callers number?'
* (presentation) and 'What authority was used to verify that this is a genuine number?'
- * (screening).<br>
+ * (screening).<br>
+ * <br>
* Presentation indicator (Bits 6 and 7):
* <pre>
* Bits Meaning
@@ -141,7 +142,6 @@ public class OriginateAction extends AbstractManagerAction
* 1 0 Number not available due to interworking
* 1 1 Reserved
* </pre>
- *
* Screening indicator (Bits 1 and 2):
* <pre>
* Bits Meaning
@@ -151,7 +151,6 @@ public class OriginateAction extends AbstractManagerAction
* 1 0 User-provided, verified and failed
* 1 1 Network provided
* </pre>
- *
* Examples for some general settings:
* <pre>
* Presentation Allowed, Network Provided: 3 (00000011)
|
Fixed callingPres property (Boolean -> Integer) and its documentation
|
diff --git a/bin/whistle.js b/bin/whistle.js
index <HASH>..<HASH> 100755
--- a/bin/whistle.js
+++ b/bin/whistle.js
@@ -1,6 +1,6 @@
#! /usr/bin/env node
-var program = require('../../starting');
+var program = require('starting');
var path = require('path');
var os = require('os');
var config = require('../lib/config');
|
refactor: show plugins debug info
|
diff --git a/hvac/api/secrets_engines/aws.py b/hvac/api/secrets_engines/aws.py
index <HASH>..<HASH> 100644
--- a/hvac/api/secrets_engines/aws.py
+++ b/hvac/api/secrets_engines/aws.py
@@ -326,8 +326,8 @@ class Aws(VaultApiBase):
name=name,
)
- response = self._adapter.post(
+ response = self._adapter.get(
url=api_path,
- json=params,
+ params=params,
)
return response.json()
diff --git a/tests/unit_tests/api/secrets_engines/test_aws.py b/tests/unit_tests/api/secrets_engines/test_aws.py
index <HASH>..<HASH> 100644
--- a/tests/unit_tests/api/secrets_engines/test_aws.py
+++ b/tests/unit_tests/api/secrets_engines/test_aws.py
@@ -75,7 +75,7 @@ class TestAws(TestCase):
aws = Aws(adapter=Request())
with requests_mock.mock() as requests_mocker:
requests_mocker.register_uri(
- method='POST',
+ method='GET',
url=mock_url,
status_code=expected_status_code,
json=mock_response,
|
Change AWS `generate_credentials` request method to GET (#<I>)
* Change AWS `generate_credentials` request method to GET
* Update aws.py
|
diff --git a/lib/docker-json-client.js b/lib/docker-json-client.js
index <HASH>..<HASH> 100644
--- a/lib/docker-json-client.js
+++ b/lib/docker-json-client.js
@@ -199,7 +199,7 @@ DockerJsonClient.prototype.parse = function parse(req, callback) {
res.on('data', function onData(chunk) {
if (contentMd5Hash) {
- contentMd5Hash.update(chunk);
+ contentMd5Hash.update(chunk.toString('utf8'));
}
if (gz) {
|
encode content as utf-8 for content-md5 checking
Somewhat inferred from <URL>
|
diff --git a/Form/Type/DateRangeType.php b/Form/Type/DateRangeType.php
index <HASH>..<HASH> 100644
--- a/Form/Type/DateRangeType.php
+++ b/Form/Type/DateRangeType.php
@@ -20,6 +20,9 @@ class DateRangeType extends AbstractType
{
unset($options['years']);
+ $options['from']['required'] = $options['required'];
+ $options['to']['required'] = $options['required'];
+
$builder
->add('from', new DateType(), $options['from'])
->add('to', new DateType(), $options['to']);
|
Pass the required to from & to
|
diff --git a/common/compiler/solidity.go b/common/compiler/solidity.go
index <HASH>..<HASH> 100644
--- a/common/compiler/solidity.go
+++ b/common/compiler/solidity.go
@@ -48,6 +48,7 @@ func (s *Solidity) makeArgs() []string {
p := []string{
"--combined-json", "bin,bin-runtime,srcmap,srcmap-runtime,abi,userdoc,devdoc",
"--optimize", // code optimizer switched on
+ "--allow-paths", "., ./, ../", //default to support relative path： ./ ../ .
}
if s.Major > 0 || s.Minor > 4 || s.Patch > 6 {
p[1] += ",metadata,hashes"
|
common/compiler: support relative import paths (#<I>)
|
diff --git a/test/fog/xml/connection_test.rb b/test/fog/xml/connection_test.rb
index <HASH>..<HASH> 100644
--- a/test/fog/xml/connection_test.rb
+++ b/test/fog/xml/connection_test.rb
@@ -2,7 +2,7 @@ require "minitest/autorun"
require "fog"
# Note this is going to be part of fog-xml eventually
-class TestFogXMLConnection < Minitest::Test
+class Fog::XML::ConnectionTest < Minitest::Test
def setup
@connection = Fog::XML::Connection.new("http://localhost")
end
|
Rename testing class to fit filename
`TestFogXMLConnection` didn't really match with the file name of
`test/fog/xml/connection_test.rb` due to the namespacing and placement
of "Test"
|
diff --git a/test/load_brocfile_test.js b/test/load_brocfile_test.js
index <HASH>..<HASH> 100644
--- a/test/load_brocfile_test.js
+++ b/test/load_brocfile_test.js
@@ -51,7 +51,7 @@ describe('loadBrocfile', function() {
});
context('with invalid Brocfile.ts', function() {
- this.slow(2000);
+ this.slow(8000);
it('throws an error for invalid syntax', function() {
chai
@@ -61,7 +61,7 @@ describe('loadBrocfile', function() {
});
context('with Brocfile.ts', function() {
- this.slow(2000);
+ this.slow(8000);
it('compiles and return tree definition', function() {
process.chdir(projectPathTs);
|
Increase TS load timeout to avoid appveyor timeout (#<I>)
|
diff --git a/library/src/com/nostra13/universalimageloader/core/DisplayImageOptions.java b/library/src/com/nostra13/universalimageloader/core/DisplayImageOptions.java
index <HASH>..<HASH> 100644
--- a/library/src/com/nostra13/universalimageloader/core/DisplayImageOptions.java
+++ b/library/src/com/nostra13/universalimageloader/core/DisplayImageOptions.java
@@ -291,12 +291,16 @@ public final class DisplayImageOptions {
public Builder cloneFrom(DisplayImageOptions options) {
stubImage = options.stubImage;
imageForEmptyUri = options.imageForEmptyUri;
+ imageOnFail = options.imageOnFail;
resetViewBeforeLoading = options.resetViewBeforeLoading;
cacheInMemory = options.cacheInMemory;
cacheOnDisc = options.cacheOnDisc;
imageScaleType = options.imageScaleType;
bitmapConfig = options.bitmapConfig;
delayBeforeLoading = options.delayBeforeLoading;
+ extraForDownloader = options.extraForDownloader;
+ preProcessor = options.preProcessor;
+ postProcessor = options.postProcessor;
displayer = options.displayer;
return this;
}
|
Issue #<I> - cloneFrom does not clone pre/postprocessor
|
diff --git a/addon/components/ui-dropdown.js b/addon/components/ui-dropdown.js
index <HASH>..<HASH> 100644
--- a/addon/components/ui-dropdown.js
+++ b/addon/components/ui-dropdown.js
@@ -44,7 +44,7 @@ export default Ember.Select.extend(Base, DataAttributes, {
// Without this, Dropdown Items will not be clickable if the content
// is set after the initial render.
Ember.run.scheduleOnce('afterRender', this, function() {
- if (this.isDestroyed || this.isDestroying) return;
+ if (this.get('isDestroyed') || this.get('isDestroying')) return;
this.didInsertElement();
this.set_value();
});
|
Switch to using get rather than accessing properties directly
|
diff --git a/actor-apps/app-web/src/app/index.js b/actor-apps/app-web/src/app/index.js
index <HASH>..<HASH> 100644
--- a/actor-apps/app-web/src/app/index.js
+++ b/actor-apps/app-web/src/app/index.js
@@ -35,7 +35,11 @@ const initReact = () => {
crosstab.broadcast(ActorInitEvent, {});
}
- window.messenger = new window.actor.ActorApp();
+ if (location.pathname === '/app') {
+ window.messenger = new window.actor.ActorApp('wss://' + location.hostname + ':9080/');
+ } else {
+ window.messenger = new window.actor.ActorApp();
+ }
}
const App = React.createClass({
|
feat(web): detect local version and set proper endpoint
|
diff --git a/src/Unirest/Request.php b/src/Unirest/Request.php
index <HASH>..<HASH> 100755
--- a/src/Unirest/Request.php
+++ b/src/Unirest/Request.php
@@ -399,6 +399,9 @@ class Request
if ($method === Method::POST) {
curl_setopt(self::$handle, CURLOPT_POST, true);
} else {
+ if ($method === Method::HEAD) {
+ curl_setopt(self::$handle, CURLOPT_NOBODY, true);
+ }
curl_setopt(self::$handle, CURLOPT_CUSTOMREQUEST, $method);
}
diff --git a/tests/Unirest/RequestTest.php b/tests/Unirest/RequestTest.php
index <HASH>..<HASH> 100644
--- a/tests/Unirest/RequestTest.php
+++ b/tests/Unirest/RequestTest.php
@@ -251,6 +251,16 @@ class UnirestRequestTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('John', $response->body->queryString->name[1]);
}
+ // HEAD
+ public function testHead()
+ {
+ $response = Request::head('http://mockbin.com/request?name=Mark', array(
+ 'Accept' => 'application/json'
+ ));
+
+ $this->assertEquals(200, $response->code);
+ }
+
// POST
public function testPost()
{
|
feat(HEAD): CURLOPT_NOBODY option for HEAD requests
* When using HEAD requests set the appropriate curl header to not wait for a response body. See <URL>
|
diff --git a/zappa/handler.py b/zappa/handler.py
index <HASH>..<HASH> 100644
--- a/zappa/handler.py
+++ b/zappa/handler.py
@@ -258,7 +258,7 @@ class LambdaHandler(object):
Support S3, SNS, DynamoDB and kinesis events
"""
if 's3' in record:
- return record['s3']['configurationId']
+ return record['s3']['configurationId'].split(':')[-1]
arn = None
if 'Sns' in record:
diff --git a/zappa/util.py b/zappa/util.py
index <HASH>..<HASH> 100644
--- a/zappa/util.py
+++ b/zappa/util.py
@@ -157,6 +157,8 @@ def get_event_source(event_source, lambda_arn, target_function, boto_session, dr
arn_back = split_arn[-1]
ctx.environment = arn_back
funk.arn = arn_front
+ funk.name = target_function
+ funk.name = ':'.join([arn_back, target_function])
else:
funk.arn = lambda_arn
|
* set the funk name to <project-name>:<event_function>
* changed the get_function_for_aws_event to returen the function part of the
record['s3']['configurationId']
|
diff --git a/tasks/utils.js b/tasks/utils.js
index <HASH>..<HASH> 100644
--- a/tasks/utils.js
+++ b/tasks/utils.js
@@ -39,7 +39,7 @@ module.exports.getRevision = function(cb) {
};
module.exports.getConfigFor = function(prop) {
- return deployConfig[prop] && deployConfig[prop][env()];
+ return deployConfig[prop] && deployConfig[prop][env()] || deployConfig[prop];
};
module.exports.getRedisClient = function(config, callback) {
|
allow environment agnostic config
|
diff --git a/lojix/wam/src/main/com/thesett/aima/logic/fol/wam/compiler/WAMInstruction.java b/lojix/wam/src/main/com/thesett/aima/logic/fol/wam/compiler/WAMInstruction.java
index <HASH>..<HASH> 100644
--- a/lojix/wam/src/main/com/thesett/aima/logic/fol/wam/compiler/WAMInstruction.java
+++ b/lojix/wam/src/main/com/thesett/aima/logic/fol/wam/compiler/WAMInstruction.java
@@ -1275,6 +1275,16 @@ public class WAMInstruction implements Sizeable
}
/**
+ * Provides the human readable form of the instruction.
+ *
+ * @return The human readable form of the instruction.
+ */
+ public String getPretty()
+ {
+ return pretty;
+ }
+
+ /**
* Prints the human readable form of the instruction for debugging purposes.
*
* @param instruction The instruction, including its arguments.
|
Added access to the pretty version of instruction mnemonics.
|
diff --git a/hooks/after_prepare_android.js b/hooks/after_prepare_android.js
index <HASH>..<HASH> 100644
--- a/hooks/after_prepare_android.js
+++ b/hooks/after_prepare_android.js
@@ -54,7 +54,7 @@ if (platformDir) {
}
if (!fs.existsSync(manifestFile)) {
- throw new Error("! Can't find the AndroidManifest.xml. This shouldn't happen, please contact us for support.\n")
+ throw new Error("! Can't find the AndroidManifest.xml. This shouldn't happen: try running `cordova prepare`, if it doesn\'t fix the issue please contact us for support.\n")
}
/**
|
refactor(hooks): better error message
|
diff --git a/config.js b/config.js
index <HASH>..<HASH> 100644
--- a/config.js
+++ b/config.js
@@ -38,5 +38,10 @@ config.get = function(name, type) {
logger.logerror(err.name + ': ' + err.message);
}
}
- return results;
+ // Pass arrays by value to prevent config being modified accidentally.
+ if (typeof results === 'object' && results.constructor.name === 'Array') {
+ return results.slice();
+ } else {
+ return results;
+ }
};
|
Pass config results by value to prevent them from being overwritten
|
diff --git a/lib/sinja/version.rb b/lib/sinja/version.rb
index <HASH>..<HASH> 100644
--- a/lib/sinja/version.rb
+++ b/lib/sinja/version.rb
@@ -1,4 +1,4 @@
# frozen_string_literal: true
module Sinja
- VERSION = '1.2.0.pre1'
+ VERSION = '1.2.0.pre2'
end
|
Bump to <I>.pre2
|
diff --git a/lxd/device/nic_routed.go b/lxd/device/nic_routed.go
index <HASH>..<HASH> 100644
--- a/lxd/device/nic_routed.go
+++ b/lxd/device/nic_routed.go
@@ -23,8 +23,14 @@ type nicRouted struct {
deviceCommon
}
-func (d *nicRouted) CanHotPlug() (bool, []string) {
- return false, []string{"limits.ingress", "limits.egress", "limits.max"}
+// CanHotPlug returns whether the device can be managed whilst the instance is running.
+func (d *nicRouted) CanHotPlug() bool {
+ return false
+}
+
+// UpdatableFields returns a list of fields that can be updated without triggering a device remove & add.
+func (d *nicRouted) UpdatableFields() []string {
+ return []string{"limits.ingress", "limits.egress", "limits.max"}
}
// validateConfig checks the supplied config for correctness.
|
lxd/device/nic/routed: Splits CanHotPlug function into new CanHotPlug and UpdatableFields functions
|
diff --git a/lib/OpenLayers/Feature/WFS.js b/lib/OpenLayers/Feature/WFS.js
index <HASH>..<HASH> 100644
--- a/lib/OpenLayers/Feature/WFS.js
+++ b/lib/OpenLayers/Feature/WFS.js
@@ -24,6 +24,13 @@ OpenLayers.Feature.WFS.prototype =
this.layer.addMarker(this.marker);
}
},
+
+ destroy: function() {
+ if (this.marker != null) {
+ this.layer.removeMarker(this.marker);
+ }
+ OpenLayers.Feature.prototype.destroy.apply(this, arguments);
+ },
/**
* @param {XMLNode} xmlNode
|
on destroy() of a WFS feature, remove its marker
git-svn-id: <URL>
|
diff --git a/redis/__init__.py b/redis/__init__.py
index <HASH>..<HASH> 100644
--- a/redis/__init__.py
+++ b/redis/__init__.py
@@ -37,7 +37,7 @@ def int_or_str(value):
return value
-__version__ = "4.0.1"
+__version__ = "4.0.2"
VERSION = tuple(map(int_or_str, __version__.split('.')))
diff --git a/redis/connection.py b/redis/connection.py
index <HASH>..<HASH> 100755
--- a/redis/connection.py
+++ b/redis/connection.py
@@ -9,7 +9,6 @@ import io
import os
import socket
import threading
-import warnings
import weakref
from redis.exceptions import (
@@ -67,9 +66,6 @@ if HIREDIS_AVAILABLE:
# only use byte buffer if hiredis supports it
if not HIREDIS_SUPPORTS_BYTE_BUFFER:
HIREDIS_USE_BYTE_BUFFER = False
-else:
- msg = "redis-py works best with hiredis. Please consider installing"
- warnings.warn(msg)
SYM_STAR = b'*'
SYM_DOLLAR = b'$'
|
Better removal of hiredis warning (#<I>)
|
diff --git a/lib/active_record/connection_adapters/ovirt_postgresql_adapter.rb b/lib/active_record/connection_adapters/ovirt_postgresql_adapter.rb
index <HASH>..<HASH> 100644
--- a/lib/active_record/connection_adapters/ovirt_postgresql_adapter.rb
+++ b/lib/active_record/connection_adapters/ovirt_postgresql_adapter.rb
@@ -11,7 +11,8 @@ module ActiveRecord
valid_conn_param_keys = PG::Connection.conndefaults_hash.keys + [:requiressl]
conn_params.slice!(*valid_conn_param_keys)
- ConnectionAdapters::OvirtPostgreSQLAdapter.new(nil, logger, conn_params, config)
+ conn = PG.connect(conn_params) if ActiveRecord::VERSION::MAJOR >= 6
+ ConnectionAdapters::OvirtPostgreSQLAdapter.new(conn, logger, conn_params, config)
end
end
@@ -27,4 +28,4 @@ module ActiveRecord
end
end
end
-end
\ No newline at end of file
+end
|
Pass in a connection when initializing pg adapter
On ActiveRecord <I>+ the `ConnectionAdapters::PostgreSQLAdapter#initialize` expects to be passed in a valid postgres connection, where previous versions expected this to be `nil`.
|
diff --git a/src/components/input.js b/src/components/input.js
index <HASH>..<HASH> 100644
--- a/src/components/input.js
+++ b/src/components/input.js
@@ -65,22 +65,27 @@ export default class Input extends React.Component {
*/
validate() {
+ /* istanbul ignore next */
return this.refs.unboundInput.validate()
}
isValid() {
+ /* istanbul ignore next */
return this.refs.unboundInput.isValid()
}
isModified() {
+ /* istanbul ignore next */
return this.refs.unboundInput.isModified()
}
resetModified() {
+ /* istanbul ignore next */
return this.refs.unboundInput.resetModified()
}
reset() {
+ /* istanbul ignore next */
return this.refs.unboundInput.reset()
}
|
Add Ignore Code Coverage, Public Function In Input (#<I>)
Add Ignore code coverage to public functions in Input component because
those functions are just returning the results from UnboundInput's
public functions so testing those will only be testing the results of
functions which are already been tested.
|
diff --git a/lib/rally_api/version.rb b/lib/rally_api/version.rb
index <HASH>..<HASH> 100644
--- a/lib/rally_api/version.rb
+++ b/lib/rally_api/version.rb
@@ -4,5 +4,5 @@
#of the applicable Subscription Agreement between your company and
#Rally Software Development Corp.
module RallyAPI
- VERSION = "0.9.2"
+ VERSION = "0.9.3"
end
diff --git a/test/rally_api_update_spec.rb b/test/rally_api_update_spec.rb
index <HASH>..<HASH> 100644
--- a/test/rally_api_update_spec.rb
+++ b/test/rally_api_update_spec.rb
@@ -93,4 +93,20 @@ describe "Rally Json Update Tests" do
bottom_story["ObjectID"].should == @test_story["ObjectID"]
end
+ it "should do rank to with params on a plain update" do
+ defect_hash = {}
+ defect_hash["Severity"] = "Major Problem"
+ params = {:rankTo => "BOTTOM"}
+ updated_defect = @rally.update(:defect, @test_defect.ObjectID, defect_hash, params)
+ updated_defect.Severity.should == "Major Problem"
+ bottom_defects = @rally.find do |q|
+ q.type = :defect
+ q.order = "Rank Desc"
+ q.limit = 20
+ q.page_size = 20
+ q.fetch = "Name,Rank,ObjectID"
+ end
+ bottom_defects[0]["ObjectID"].should == @test_defect["ObjectID"]
+ end
+
end
|
Rev to <I> change to add params to url for update method
|
diff --git a/etc/reset.py b/etc/reset.py
index <HASH>..<HASH> 100755
--- a/etc/reset.py
+++ b/etc/reset.py
@@ -118,10 +118,10 @@ def find_in_json(j, f):
def print_status(status):
print("===> {}".format(status))
-def run(cmd, *args, raise_on_error=True, stdin=None, capture_output=False):
+def run(cmd, *args, raise_on_error=True, stdin=None, capture_output=False, timeout=None):
all_args = [cmd, *args]
print_status("running: `{}`".format(" ".join(all_args)))
- return subprocess.run(all_args, check=raise_on_error, capture_output=capture_output, input=stdin, encoding="utf8")
+ return subprocess.run(all_args, check=raise_on_error, capture_output=capture_output, input=stdin, encoding="utf8", timeout=timeout)
def capture(cmd, *args):
return run(cmd, *args, capture_output=True).stdout
@@ -148,7 +148,7 @@ def main():
# latter doesn't catch when `pachctl` doesn't exist -- an error case which
# we also want to ignore
try:
- run("pachctl", "delete", "all")
+ run("pachctl", "delete", "all", stdin="yes\n", timeout=5)
except:
pass
|
Set a timeout and automatically confirm when deleting pachyderm resources
|
diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HiveWriteUtils.java b/presto-hive/src/main/java/com/facebook/presto/hive/HiveWriteUtils.java
index <HASH>..<HASH> 100644
--- a/presto-hive/src/main/java/com/facebook/presto/hive/HiveWriteUtils.java
+++ b/presto-hive/src/main/java/com/facebook/presto/hive/HiveWriteUtils.java
@@ -13,6 +13,7 @@
*/
package com.facebook.presto.hive;
+import com.facebook.presto.cache.CachingFileSystem;
import com.facebook.presto.common.block.Block;
import com.facebook.presto.common.type.BigintType;
import com.facebook.presto.common.type.BooleanType;
@@ -405,6 +406,9 @@ public final class HiveWriteUtils
if (fileSystem instanceof HadoopExtendedFileSystem) {
return getRawFileSystem(((HadoopExtendedFileSystem) fileSystem).getRawFileSystem());
}
+ if (fileSystem instanceof CachingFileSystem) {
+ return getRawFileSystem(((CachingFileSystem) fileSystem).getDataTier());
+ }
return fileSystem;
}
|
get raw filesystem should consider CachingFileSystem
|
diff --git a/pyradigm/base.py b/pyradigm/base.py
index <HASH>..<HASH> 100644
--- a/pyradigm/base.py
+++ b/pyradigm/base.py
@@ -15,6 +15,11 @@ from warnings import warn
import numpy as np
+class PyradigmException(Exception):
+ """Custom exception to highlight pyradigm-specific issues."""
+ pass
+
+
def is_iterable_but_not_str(value):
"""Boolean check for iterables that are not strings"""
|
pyradigm's custom exception
|
diff --git a/Lib/AssetConfig.php b/Lib/AssetConfig.php
index <HASH>..<HASH> 100644
--- a/Lib/AssetConfig.php
+++ b/Lib/AssetConfig.php
@@ -47,7 +47,7 @@ class AssetConfig {
public $constantMap = array(
'APP/' => APP,
'WEBROOT/' => WWW_ROOT,
- 'ROOT/' => ROOT
+ 'ROOT' => ROOT
);
const FILTERS = 'filters';
|
Remove trailing / from ROOT
The constant doesn't contain a / neither should the replacement.
Refs #<I>
|
diff --git a/opentracing-api/src/main/java/io/opentracing/Tracer.java b/opentracing-api/src/main/java/io/opentracing/Tracer.java
index <HASH>..<HASH> 100644
--- a/opentracing-api/src/main/java/io/opentracing/Tracer.java
+++ b/opentracing-api/src/main/java/io/opentracing/Tracer.java
@@ -68,7 +68,7 @@ public interface Tracer {
* Tracer tracer = ...
* TextMap httpHeadersCarrier = new AnHttpHeaderCarrier(httpRequest);
* SpanContext spanCtx = tracer.extract(Format.Builtin.HTTP_HEADERS, httpHeadersCarrier);
- * tracer.buildSpan('...').withChildOf(spanCtx).start();
+ * tracer.buildSpan('...').asChildOf(spanCtx).start();
* }</pre>
*
* If the span serialized state is invalid (corrupt, wrong version, etc) inside the carrier this will result in an
|
Fix Javadoc withChildOf -> asChildOf (#<I>)
|
diff --git a/galpy/util/bovy_plot.py b/galpy/util/bovy_plot.py
index <HASH>..<HASH> 100644
--- a/galpy/util/bovy_plot.py
+++ b/galpy/util/bovy_plot.py
@@ -1162,11 +1162,15 @@ def scatterplot(x,y,*args,**kwargs):
if kwargs.has_key('onedhistxweights'):
onedhistxweights= kwargs['onedhistxweights']
kwargs.pop('onedhistxweights')
+ elif not weights is None:
+ onedhistxweights= weights
else:
onedhistxweights= None
if kwargs.has_key('onedhistyweights'):
onedhistyweights= kwargs['onedhistyweights']
kwargs.pop('onedhistyweights')
+ elif not weights is None:
+ onedhistyweights= weights
else:
onedhistyweights= None
if kwargs.has_key('retAxes'):
|
better handling of weights in scatterplot
|
diff --git a/src/consumer/runner.js b/src/consumer/runner.js
index <HASH>..<HASH> 100644
--- a/src/consumer/runner.js
+++ b/src/consumer/runner.js
@@ -1,6 +1,8 @@
const createRetry = require('../retry')
const { KafkaJSError } = require('../errors')
+const isTestMode = process.env.NODE_ENV === 'test'
+
const isRebalancing = e =>
e.type === 'REBALANCE_IN_PROGRESS' || e.type === 'NOT_COORDINATOR_FOR_GROUP'
@@ -75,7 +77,9 @@ module.exports = class Runner {
this.running = false
try {
- await this.waitForConsumer()
+ if (!isTestMode) {
+ await this.waitForConsumer()
+ }
await this.consumerGroup.leave()
} catch (e) {}
}
|
Don't wait for consumers to shutdown when running in test mode
|
diff --git a/tests/settings.py b/tests/settings.py
index <HASH>..<HASH> 100755
--- a/tests/settings.py
+++ b/tests/settings.py
@@ -17,6 +17,8 @@ DATABASES = {
SECRET_KEY = 'fn)t*+$)ugeyip6-#txyy$5wf2ervc0d2n#h)qb)y5@ly$t*@w'
INSTALLED_APPS = (
+ 'django.contrib.staticfiles',
+
# rest framework
'rest_framework',
'rest_framework_gis',
|
Added django.contrib.staticfiles in tests.settings
|
diff --git a/src/DataApi/Sections/InteractionsSection.php b/src/DataApi/Sections/InteractionsSection.php
index <HASH>..<HASH> 100644
--- a/src/DataApi/Sections/InteractionsSection.php
+++ b/src/DataApi/Sections/InteractionsSection.php
@@ -38,15 +38,16 @@ class InteractionsSection extends Section
* @param string $itemId
* @param string $interactionId
* @param DateTime|NULL $time
+ * @param array|NULL $attributes
* @return NULL
* @throws InvalidArgumentException when given user id is empty string value
* @throws InvalidArgumentException when given item id is empty string value
* @throws InvalidArgumentException when given interaction id is empty string value
* @throws RequestFailedException when request failed for some reason
*/
- public function insertInteraction($userId, $itemId, $interactionId, DateTime $time = NULL)
+ public function insertInteraction($userId, $itemId, $interactionId, DateTime $time = NULL, array $attributes = NULL)
{
- $batch = (new InteractionsBatch())->addInteraction($userId, $itemId, $interactionId, $time);
+ $batch = (new InteractionsBatch())->addInteraction($userId, $itemId, $interactionId, $time, $attributes);
return $this->insertInteractions($batch);
}
|
fix missing attributes in method insertInteraction in interaction section
|
diff --git a/test/basic_test.js b/test/basic_test.js
index <HASH>..<HASH> 100644
--- a/test/basic_test.js
+++ b/test/basic_test.js
@@ -6,6 +6,7 @@ var expect = require('expect.js');
var utils = require('./utils');
var loader = require('../index.js');
+/* global describe, it */
describe('svg-jsx-loader', function() {
it('should convert attributes to camelCase', function(done) {
var executor = new utils.Executor(loader);
|
ESLint warns about undefined globals in tests
|
diff --git a/src/Resources/Environment.php b/src/Resources/Environment.php
index <HASH>..<HASH> 100644
--- a/src/Resources/Environment.php
+++ b/src/Resources/Environment.php
@@ -83,6 +83,7 @@ class Environment extends BaseSystemResource
$result['platform']['install_path'] = base_path() . DIRECTORY_SEPARATOR;
$result['platform']['log_path'] = env('DF_MANAGED_LOG_PATH',
storage_path('logs')) . DIRECTORY_SEPARATOR;
+ $result['platform']['app_debug'] = env('APP_DEBUG', false);
$result['platform']['log_mode'] = \Config::get('logging.log');
$result['platform']['log_level'] = \Config::get('logging.log_level');
$result['platform']['cache_driver'] = \Config::get('cache.default');
|
DP-<I> Test datasource connection upon service creation
- add app_debug to environment endpoint
|
diff --git a/sgp4/ext.py b/sgp4/ext.py
index <HASH>..<HASH> 100644
--- a/sgp4/ext.py
+++ b/sgp4/ext.py
@@ -470,13 +470,11 @@ def rv2coe(r, v, mu):
* --------------------------------------------------------------------------- */
"""
-def jday(
- year, mon, day, hr, minute, sec,
- ):
+def jday(year, mon, day, hr, minute, sec):
return (367.0 * year -
- floor((7 * (year + floor((mon + 9) / 12.0))) * 0.25) +
- floor( 275 * mon / 9.0 ) +
+ 7.0 * (year + ((mon + 9.0) // 12.0)) * 0.25 // 1.0 +
+ 275.0 * mon // 9.0 +
day + 1721013.5 +
((sec / 60.0 + minute) / 60.0 + hr) / 24.0 # ut in days
# - 0.5*sgn(100.0*year + mon - 190002.5) + 0.5;
|
Replace floor() with native // in jday()
|
diff --git a/Kwf/Assets/Modernizr/Dependency.php b/Kwf/Assets/Modernizr/Dependency.php
index <HASH>..<HASH> 100644
--- a/Kwf/Assets/Modernizr/Dependency.php
+++ b/Kwf/Assets/Modernizr/Dependency.php
@@ -80,6 +80,9 @@ class Kwf_Assets_Modernizr_Dependency extends Kwf_Assets_Dependency_Abstract
$ret = file_get_contents($outputFile);
unlink($outputFile);
+ //remove comments containing selected tests
+ $ret = preg_replace("#\n/\*!\n\{.*?\}\n!\*/\n#s", '', $ret);
+
$ret = Kwf_SourceMaps_SourceMap::createEmptyMap($ret);
$map = $ret->getMapContentsData(false);
|
Modernizr Dependency: remove comments containing selected tests
For every test the following was added in the build:
/*!
{
"name": "CSS Media Queries",
"caniuse": "css-mediaqueries",
"property": "mediaqueries",
"tags": ["css"],
"builderAliases": ["css_mediaqueries"]
}
!*/
this regexp removes it
|
diff --git a/test/createLogicMiddleware-latest.spec.js b/test/createLogicMiddleware-latest.spec.js
index <HASH>..<HASH> 100644
--- a/test/createLogicMiddleware-latest.spec.js
+++ b/test/createLogicMiddleware-latest.spec.js
@@ -345,7 +345,7 @@ describe('createLogicMiddleware-latest', () => {
...action,
type: 'BAR'
});
- }, 10);
+ }, 20);
}
});
mw = createLogicMiddleware([logicA]);
|
add delay to test to ensure messages have fired consistently
|
diff --git a/openquake/engine/tests/performance_monitor_test.py b/openquake/engine/tests/performance_monitor_test.py
index <HASH>..<HASH> 100644
--- a/openquake/engine/tests/performance_monitor_test.py
+++ b/openquake/engine/tests/performance_monitor_test.py
@@ -23,15 +23,6 @@ class TestCase(unittest.TestCase):
self.assertGreaterEqual(pmon.duration, 0)
self.assertGreaterEqual(pmon.mem[0], 0)
- # the base monitor does not save on the engine db
- @attr('slow')
- def test_performance_monitor(self):
- ls = []
- with PerformanceMonitor([os.getpid()]) as pmon:
- for _ in range(1000 * 1000):
- ls.append(range(50)) # 50 million of integers
- self._check_result(pmon)
-
def test_light_monitor(self):
mon = LightMonitor('test', 1)
with mon:
|
Removed test on the PerformanceMonitor that should not be here
Former-commit-id: <I>f<I>b<I>c<I>c<I>f<I>df<I>f0aa8d<I>eedc
|
diff --git a/src/Web.php b/src/Web.php
index <HASH>..<HASH> 100644
--- a/src/Web.php
+++ b/src/Web.php
@@ -46,7 +46,6 @@ class Web implements MiddlewareInterface
* services and filters
*/
const ROUTE_NAMES = 'namedRoutes';
- const RENDER_ENGINE = 'renderer';
const CS_RF_FILTER = 'csrf';
const ERROR_VIEWS = 'error-view-files';
const REFERRER_URI = 'referrer-uri';
@@ -176,8 +175,8 @@ class Web implements MiddlewareInterface
*/
public function getViewEngine()
{
- if($this->app->exists(Web::RENDER_ENGINE)) {
- return $this->app->get(Web::RENDER_ENGINE);
+ if($this->app->exists(ViewEngineInterface::class)) {
+ return $this->app->get(ViewEngineInterface::class);
}
$locator = new Locator($this->view_dir);
if ($doc_root = $this->docs_dir) {
@@ -186,7 +185,7 @@ class Web implements MiddlewareInterface
}
$renderer = new Renderer($locator);
$view = new View($renderer, new Value());
- $this->app->set(self::RENDER_ENGINE, $view, true);
+ $this->app->set(ViewEngineInterface::class, $view, true);
return $view;
}
|
use ViewEngineInterface as name for renderer.
|
diff --git a/src/Aggregation/Bucketing/DateRangeAggregation.php b/src/Aggregation/Bucketing/DateRangeAggregation.php
index <HASH>..<HASH> 100644
--- a/src/Aggregation/Bucketing/DateRangeAggregation.php
+++ b/src/Aggregation/Bucketing/DateRangeAggregation.php
@@ -51,7 +51,8 @@ class DateRangeAggregation extends AbstractAggregation
foreach ($ranges as $range) {
$from = isset($range['from']) ? $range['from'] : null;
$to = isset($range['to']) ? $range['to'] : null;
- $this->addRange($from, $to);
+ $key = isset($range['key']) ? $range['key'] : null;
+ $this->addRange($from, $to, $key);
}
}
@@ -78,12 +79,13 @@ class DateRangeAggregation extends AbstractAggregation
*
* @throws \LogicException
*/
- public function addRange($from = null, $to = null)
+ public function addRange($from = null, $to = null, $key = null)
{
$range = array_filter(
[
'from' => $from,
'to' => $to,
+ 'key' => $key,
]
);
|
fixes #<I> - added support for date range keys (#<I>)
(cherry picked from commit <I>ac9)
|
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index <HASH>..<HASH> 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -587,7 +587,6 @@ class MigrationTest < ActiveRecord::TestCase
if current_adapter?(:Mysql2Adapter, :PostgreSQLAdapter)
def test_out_of_range_limit_should_raise
- Person.connection.drop_table :test_limits rescue nil
e = assert_raise(ActiveRecord::ActiveRecordError, "integer limit didn't raise") do
Person.connection.create_table :test_integer_limits, :force => true do |t|
t.column :bigone, :integer, :limit => 10
@@ -603,8 +602,6 @@ class MigrationTest < ActiveRecord::TestCase
end
end
end
-
- Person.connection.drop_table :test_limits rescue nil
end
end
|
Remove needless `drop_table :test_limits`
A `:test_limits` table has not been created.
|
diff --git a/code/model/SiteTreeFolderExtension.php b/code/model/SiteTreeFolderExtension.php
index <HASH>..<HASH> 100644
--- a/code/model/SiteTreeFolderExtension.php
+++ b/code/model/SiteTreeFolderExtension.php
@@ -19,14 +19,14 @@ class SiteTreeFolderExtension extends DataExtension {
}
foreach($classes as $className) {
- $query = singleton($className)->extendedSQL();
+ $query = new DataQuery($className);
$ids = $query->execute()->column();
if(!count($ids)) continue;
foreach(singleton($className)->has_one() as $relName => $joinClass) {
if($joinClass == 'Image' || $joinClass == 'File') {
$fieldName = $relName .'ID';
- $query = singleton($className)->extendedSQL("$fieldName > 0");
+ $query = DataList::create($className)->where("$fieldName > 0");
$query->distinct = true;
$query->select(array($fieldName));
$usedFiles = array_merge($usedFiles, $query->execute()->column());
|
BUG: Replaced extendedSQL with DataList as per ticket <I>
|
diff --git a/core/src/main/java/fr/putnami/pwt/core/widget/client/OutputStaticText.java b/core/src/main/java/fr/putnami/pwt/core/widget/client/OutputStaticText.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/fr/putnami/pwt/core/widget/client/OutputStaticText.java
+++ b/core/src/main/java/fr/putnami/pwt/core/widget/client/OutputStaticText.java
@@ -25,6 +25,10 @@ public class OutputStaticText extends AbstractOutput<Object> {
public OutputStaticText() {
}
+ public OutputStaticText(String text) {
+ setText(text);
+ }
+
protected OutputStaticText(OutputStaticText source) {
super(source);
}
|
[core][feature] Add OutputStaticText Constructor acceptiong String
|
diff --git a/src/plugins/cache/operations/command.spec.js b/src/plugins/cache/operations/command.spec.js
index <HASH>..<HASH> 100644
--- a/src/plugins/cache/operations/command.spec.js
+++ b/src/plugins/cache/operations/command.spec.js
@@ -18,26 +18,6 @@ const config = [
},
invalidates: ['user'],
invalidatesOn: ['GET']
- },
- {
- name: 'userPreview',
- ttl: 200,
- api: {
- getPreviews: (x) => x,
- updatePreview: (x) => x
- },
- invalidates: ['fda'],
- viewOf: 'user'
- },
- {
- name: 'listUser',
- ttl: 200,
- api: {
- getPreviews: (x) => x,
- updatePreview: (x) => x
- },
- invalidates: ['fda'],
- viewOf: 'user'
}
];
|
refactor(command) Remove unnecessary spec setup
|
diff --git a/lib/Stripe/ApiRequestor.php b/lib/Stripe/ApiRequestor.php
index <HASH>..<HASH> 100644
--- a/lib/Stripe/ApiRequestor.php
+++ b/lib/Stripe/ApiRequestor.php
@@ -348,7 +348,7 @@ class Stripe_ApiRequestor
return true;
}
- if (strpos(PHP_VERSION, 'hiphop') !== false) {
+ if (strpos(PHP_VERSION, 'hiphop') !== false || strpos(PHP_VERSION, 'hhvm') !== false) {
error_log(
'Warning: HHVM does not support Stripe\'s SSL certificate '.
'verification. (See http://docs.hhvm.com/manual/en/context.ssl.php) '.
|
Update ApiRequestor for newer hhvm
Current versions of HHVM don't include 'hiphop' in the PHP_VERSION string; they are using hhvm. Update the SSL Cert check to ignore those versions as well, or your application will return an 'unable to connect to stripe' error.
|
diff --git a/spec/http_helper.rb b/spec/http_helper.rb
index <HASH>..<HASH> 100644
--- a/spec/http_helper.rb
+++ b/spec/http_helper.rb
@@ -16,15 +16,15 @@ def define_helper(name)
}
end
-%w[
- delete
- get
- head
- options
- patch
- post
- put
- trace
+[
+ "delete",
+ "get",
+ "head",
+ "options",
+ "patch",
+ "post",
+ "put",
+ "trace",
].each do |name|
define_helper name
end
|
Fix linter warning in spec/http_helper.rb
|
diff --git a/stdlib/sql.go b/stdlib/sql.go
index <HASH>..<HASH> 100644
--- a/stdlib/sql.go
+++ b/stdlib/sql.go
@@ -136,7 +136,7 @@ func (c *Conn) Query(query string, argsV []driver.Value) (driver.Rows, error) {
rowCount := 0
columnsChan := make(chan []string)
errChan := make(chan error)
- rowChan := make(chan []driver.Value)
+ rowChan := make(chan []driver.Value, 8)
go func() {
err := c.conn.SelectFunc(query, func(r *pgx.DataRowReader) error {
|
Use buffered chan for stdlib.Rows
Improved performance slightly
|
diff --git a/spec/caching_policy_spec.rb b/spec/caching_policy_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/caching_policy_spec.rb
+++ b/spec/caching_policy_spec.rb
@@ -96,3 +96,18 @@ describe "Storing and retrieving policies" do
expect(policy.policies.max_age).to eq(300)
end
end
+
+describe "Handling situations where the content type is nil" do
+ class CachingPolicy
+ include Middleman::S3Sync::CachingPolicy
+ end
+
+ let(:caching_policy) { CachingPolicy.new }
+
+ it "returns the default caching policy when the content type is nil" do
+ caching_policy.add_caching_policy(:default, max_age:(60 * 60 * 24 * 365))
+
+ expect(caching_policy.caching_policy_for(nil)).to_not be_nil
+ expect(caching_policy.caching_policy_for(nil).policies[:max_age]).to eq(60 * 60 * 24 * 365)
+ end
+end
|
This also goes with #<I>
|
diff --git a/generator/lib/builder/om/PHP5ObjectBuilder.php b/generator/lib/builder/om/PHP5ObjectBuilder.php
index <HASH>..<HASH> 100644
--- a/generator/lib/builder/om/PHP5ObjectBuilder.php
+++ b/generator/lib/builder/om/PHP5ObjectBuilder.php
@@ -136,7 +136,7 @@ class PHP5ObjectBuilder extends ObjectBuilder
} catch (Exception $x) {
// prevent endless loop when timezone is undefined
date_default_timezone_set('America/Los_Angeles');
- throw new EngineException("Unable to parse default temporal value for " . $col->getFullyQualifiedName() . ": " .$this->getDefaultValueString($col), $x);
+ throw new EngineException(sprintf('Unable to parse default temporal value "%s" for column "%s"', $col->getDefaultValueString(), $col->getFullyQualifiedName()), $x);
}
} else {
if ($col->isPhpPrimitiveType()) {
|
[<I>][<I>] Fixed infinite loop when reverse engineering date fields in postgresql and in PHP<I> (closes #<I>)
|
diff --git a/pymatgen/analysis/chemenv/connectivity/structure_connectivity.py b/pymatgen/analysis/chemenv/connectivity/structure_connectivity.py
index <HASH>..<HASH> 100644
--- a/pymatgen/analysis/chemenv/connectivity/structure_connectivity.py
+++ b/pymatgen/analysis/chemenv/connectivity/structure_connectivity.py
@@ -107,7 +107,7 @@ class StructureConnectivity():
self._environment_subgraph.add_node(env_node)
break
#Find the connections between the environments
- nodes = self._environment_subgraph.nodes()
+ nodes = list(self._environment_subgraph.nodes())
for inode1, node1 in enumerate(nodes):
isite1 = node1.isite
links_node1 = self._graph.edges(isite1, data=True)
|
Fix for networkx versions >= 2.
|
diff --git a/treetime/treeanc.py b/treetime/treeanc.py
index <HASH>..<HASH> 100644
--- a/treetime/treeanc.py
+++ b/treetime/treeanc.py
@@ -66,6 +66,13 @@ class TreeAnc(object):
def gtr(self):
return self._gtr
+ @gtr.setter
+ def gtr(self, value):
+ if not isinstance(value, GTR):
+ raise TypeError(" GTR instance expected")
+ self._gtr = value
+
+
def set_gtr(self, in_gtr, **kwargs):
"""
Create new GTR model, if needed, and set the model as the attribute of the
|
Added setter for GTR, which takes only GTR type instance
|
diff --git a/src/test/java/org/syphr/prom/PropertiesManagerTest.java b/src/test/java/org/syphr/prom/PropertiesManagerTest.java
index <HASH>..<HASH> 100644
--- a/src/test/java/org/syphr/prom/PropertiesManagerTest.java
+++ b/src/test/java/org/syphr/prom/PropertiesManagerTest.java
@@ -230,6 +230,14 @@ public class PropertiesManagerTest
PropertiesManager<Key1> prom = PropertiesManagers.newManager(TEST_PROPS_1, Key1.class);
prom.getProperty(Key1.SOME_KEY);
}
+
+ @Test
+ public void testManagedPropertiesCached()
+ {
+ Assert.assertSame("Single property managers are not cached correctly",
+ test1Manager.getManagedProperty(Key1.SOME_KEY),
+ test1Manager.getManagedProperty(Key1.SOME_KEY));
+ }
public static enum Key1 implements Defaultable
{
|
added a test for proper caching of calls to getManagedProperty (each call that provides the same key must get the same object back)
|
diff --git a/indra/sources/indra_db_rest/api.py b/indra/sources/indra_db_rest/api.py
index <HASH>..<HASH> 100644
--- a/indra/sources/indra_db_rest/api.py
+++ b/indra/sources/indra_db_rest/api.py
@@ -271,14 +271,17 @@ def get_statement_queries(stmts, **params):
"""
def pick_ns(ag):
+ # If the Agent has grounding, in order of preference, in any of these
+ # name spaces then we look it up based on grounding.
for ns in ['HGNC', 'FPLX', 'CHEMBL', 'CHEBI', 'GO', 'MESH']:
if ns in ag.db_refs.keys():
dbid = ag.db_refs[ns]
- break
- else:
- ns = 'TEXT'
- dbid = ag.name
- return '%s@%s' % (dbid, ns)
+ return '%s@%s' % (dbid, ns)
+ # Otherwise, we search by Agent name - if the name is standardized,
+ # this will still yield good results. If it isn't standardized, then
+ # the name will match the raw entity text so again this lookup will
+ # work.
+ return ag.name
queries = []
url_base = get_url_base('statements/from_agents')
|
Use name-based lookup by default
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -29,6 +29,7 @@ module.exports = {
},
prepare: function(context) {
var d = context.gitDeploy;
+ this.log("preparing git in " + d.worktreePath, { verbose: true });
return git.prepareTree(d.worktreePath, d.myRepo, d.repo, d.branch);
},
upload: function(context) {
|
Add verbose log message pointing to sibling git dir
Adds a log message showing the location of the directory where the actual git prepare is running (but only if `--verbose` is passed).
Might be useful for other users encountering git errors and not being able to reproduce/fix because they are not aware of the "sibling directory" being used. Like was the case here <URL>
|
diff --git a/lib/textlint.js b/lib/textlint.js
index <HASH>..<HASH> 100644
--- a/lib/textlint.js
+++ b/lib/textlint.js
@@ -174,7 +174,7 @@ api.lintFile = function (filePath) {
api.pushReport = function (ruleId, txtNode, error) {
debug("api.pushReport %s", error);
messages.push(objectAssign({
- id: ruleId,
+ ruleId: ruleId,
message: error.message,
line: error.line ? txtNode.loc.start.line + error.line : txtNode.loc.start.line,
column: error.column ? txtNode.loc.start.column + error.column : txtNode.loc.start.column,
|
chore(textlint): reaname "id" to "ruleId"
|
diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/Cql2ElmVisitor.java b/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/Cql2ElmVisitor.java
index <HASH>..<HASH> 100755
--- a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/Cql2ElmVisitor.java
+++ b/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/Cql2ElmVisitor.java
@@ -2836,7 +2836,12 @@ public class Cql2ElmVisitor extends cqlBaseVisitor {
catch (Exception e) {
// If something goes wrong attempting to resolve, just set to the expression and report it as a warning,
// it shouldn't prevent translation unless the modelinfo indicates strict retrieve typing
- retrieve.setCodes(terminology);
+ if (!(terminology.getResultType() instanceof ListType)) {
+ retrieve.setCodes(libraryBuilder.resolveToList(terminology));
+ }
+ else {
+ retrieve.setCodes(terminology);
+ }
// ERROR:
// WARNING:
libraryBuilder.recordParsingException(new CqlSemanticException("Could not resolve membership operator for terminology target of the retrieve.",
|
#<I>: Fixed retrieve incorrectly inserting a list promotion for a direct-code reference in some cases.
|
diff --git a/db/seeds.rb b/db/seeds.rb
index <HASH>..<HASH> 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -16,7 +16,7 @@ end
# Global parameters used in configuration snippets
parameters = [
- { :name => 'chef_handler_foreman_url', :value => SmartProxy.chef_proxies.first.try(:url) || Setting.foreman_url },
+ { :name => 'chef_handler_foreman_url', :value => SmartProxy.with_features('Chef').first.try(:url) || Setting.foreman_url },
{ :name => 'chef_server_url', :value => "https://#{Socket.gethostbyname(Socket.gethostname).first}" },
{ :name => 'chef_validation_private_key', :value => 'UNSPECIFIED, you must upload your validation key here' },
{ :name => 'chef_bootstrap_template', :value => 'chef-client omnibus bootstrap' },
|
fixes #<I> - don't use deprecated proxy scope
|
diff --git a/kernel/private/classes/ezpcontentpublishingprocess.php b/kernel/private/classes/ezpcontentpublishingprocess.php
index <HASH>..<HASH> 100644
--- a/kernel/private/classes/ezpcontentpublishingprocess.php
+++ b/kernel/private/classes/ezpcontentpublishingprocess.php
@@ -259,6 +259,15 @@ class ezpContentPublishingProcess extends eZPersistentObject
{
$this->reset();
}
+
+ // generate static cache
+ $ini = eZINI::instance();
+ if ( $ini->variable( 'ContentSettings', 'StaticCache' ) == 'enabled' )
+ {
+ $staticCacheHandlerClassName = $ini->variable( 'ContentSettings', 'StaticCacheHandler' );
+ $staticCacheHandlerClassName::executeActions();
+ }
+
eZScript::instance()->shutdown();
exit;
}
|
Fix EZP-<I>: async publishing should generate static cache
Static cache tasks weren't processed after publishing.
Asynchronous handling doesn't require that static cache
generation is left to the cronjob, since it will happen
after content has been published.
It will however slow publishing down, since publishing
processes will spend some time taking care of static
cache.
|
diff --git a/lib/UnsupportedFeatureWarning.js b/lib/UnsupportedFeatureWarning.js
index <HASH>..<HASH> 100644
--- a/lib/UnsupportedFeatureWarning.js
+++ b/lib/UnsupportedFeatureWarning.js
@@ -2,14 +2,19 @@
MIT License http://www.opensource.org/licenses/mit-license.php
Author Tobias Koppers @sokra
*/
-function UnsupportedFeatureWarning(module, message) {
- Error.call(this);
- Error.captureStackTrace(this, UnsupportedFeatureWarning);
- this.name = "UnsupportedFeatureWarning";
- this.message = message;
- this.origin = this.module = module;
+"use strict";
+
+class UnsupportedFeatureWarning extends Error {
+
+ constructor(module, message) {
+ super();
+ if(Error.hasOwnProperty("captureStackTrace")) {
+ Error.captureStackTrace(this, this.constructor);
+ }
+ this.name = "UnsupportedFeatureWarning";
+ this.message = message;
+ this.origin = this.module = module;
+ }
}
-module.exports = UnsupportedFeatureWarning;
-UnsupportedFeatureWarning.prototype = Object.create(Error.prototype);
-UnsupportedFeatureWarning.prototype.constructor = UnsupportedFeatureWarning;
+module.exports = UnsupportedFeatureWarning;
|
refactor(ES6): upgrade UnsupportedFeatureWarning to ES6 (#<I>)
|
diff --git a/docker/transport/basehttpadapter.py b/docker/transport/basehttpadapter.py
index <HASH>..<HASH> 100644
--- a/docker/transport/basehttpadapter.py
+++ b/docker/transport/basehttpadapter.py
@@ -3,4 +3,6 @@ import requests.adapters
class BaseHTTPAdapter(requests.adapters.HTTPAdapter):
def close(self):
- self.pools.clear()
+ super(BaseHTTPAdapter, self).close()
+ if hasattr(self, 'pools'):
+ self.pools.clear()
|
Fix BaseHTTPAdapter for the SSL case
|
diff --git a/api/auth.go b/api/auth.go
index <HASH>..<HASH> 100644
--- a/api/auth.go
+++ b/api/auth.go
@@ -328,6 +328,7 @@ func AddUserToTeam(w http.ResponseWriter, r *http.Request, t *auth.Token) error
if err != nil {
return err
}
+ rec.Log(u.Email, "add-user-to-team", "team="+team, "user="+email)
return addUserToTeam(email, team, u)
}
diff --git a/api/auth_test.go b/api/auth_test.go
index <HASH>..<HASH> 100644
--- a/api/auth_test.go
+++ b/api/auth_test.go
@@ -638,6 +638,12 @@ func (s *AuthSuite) TestAddUserToTeam(c *gocheck.C) {
c.Assert(err, gocheck.IsNil)
c.Assert(t, ContainsUser, s.user)
c.Assert(t, ContainsUser, u)
+ action := testing.Action{
+ Action: "add-user-to-team",
+ User: s.user.Email,
+ Extra: []interface{}{"team=tsuruteam", "user=" + u.Email},
+ }
+ c.Assert(action, testing.IsRecorded)
}
func (s *AuthSuite) TestAddUserToTeamShouldReturnNotFoundIfThereIsNoTeamWithTheGivenName(c *gocheck.C) {
|
api: record user action in the AddUserToTeam handler
Related to #<I>.
|
diff --git a/hiddenlayer/graph.py b/hiddenlayer/graph.py
index <HASH>..<HASH> 100644
--- a/hiddenlayer/graph.py
+++ b/hiddenlayer/graph.py
@@ -142,7 +142,9 @@ def build_graph(model=None, args=None, input_names=None,
elif framework == "tensorflow":
from .tf_builder import import_graph, FRAMEWORK_TRANSFORMS
import_graph(g, model)
-
+ else:
+ raise ValueError("`model` input param must be a PyTorch, TensorFlow, or Keras-with-TensorFlow-backend model.")
+
# Apply Transforms
if framework_transforms:
if framework_transforms == "default":
|
Raise exception when we fail to detect the model's framework
|
diff --git a/tests/utils/test_utils.py b/tests/utils/test_utils.py
index <HASH>..<HASH> 100644
--- a/tests/utils/test_utils.py
+++ b/tests/utils/test_utils.py
@@ -71,7 +71,9 @@ class TestUtils(unittest.TestCase):
def test_evaluate_condition(self):
if not is_backend_enabled("onnxruntime"):
return
- value = [evaluate_condition("onnxruntime", "StrictVersion(onnxruntime.__version__) <= StrictVersion('0.%d.3')" % i) for i in range(0, 5)]
+ value = [
+ evaluate_condition("onnxruntime", "StrictVersion(onnxruntime.__version__) <= StrictVersion('0.%d.3')" % i)
+ for i in (1, 9999)]
self.assertNotEqual(min(value), max(value))
def test_optimizer(self):
|
Fix the nightly/CI build error.
|
diff --git a/lib/squib/conf.rb b/lib/squib/conf.rb
index <HASH>..<HASH> 100644
--- a/lib/squib/conf.rb
+++ b/lib/squib/conf.rb
@@ -1,6 +1,7 @@
-require 'squib'
require 'forwardable'
+require 'squib'
require 'squib/args/typographer'
+require 'yaml'
module Squib
# @api private
diff --git a/lib/squib/layout_parser.rb b/lib/squib/layout_parser.rb
index <HASH>..<HASH> 100644
--- a/lib/squib/layout_parser.rb
+++ b/lib/squib/layout_parser.rb
@@ -1,3 +1,5 @@
+require 'yaml'
+
module Squib
# Internal class for handling layouts
#@api private
@@ -86,4 +88,4 @@ module Squib
end
end
-end
\ No newline at end of file
+end
|
Require yaml just in case
|
diff --git a/lib/pincers/support/http_client.rb b/lib/pincers/support/http_client.rb
index <HASH>..<HASH> 100644
--- a/lib/pincers/support/http_client.rb
+++ b/lib/pincers/support/http_client.rb
@@ -26,11 +26,11 @@ module Pincers::Support
attr_reader :proxy_addr, :proxy_port, :cookies
def initialize(_options={})
- if _options.key? :proxy
+ if _options[:proxy]
@proxy_addr, @proxy_port = _options[:proxy].split ':'
end
- @cookies = if _options.key? :cookies
+ @cookies = if _options[:cookies]
_options[:cookies].copy
else
CookieJar.new
|
refactor(http_client): makes http_client more resilent to nil options
|
diff --git a/httpd/response_logger.go b/httpd/response_logger.go
index <HASH>..<HASH> 100644
--- a/httpd/response_logger.go
+++ b/httpd/response_logger.go
@@ -82,6 +82,7 @@ func buildLogLine(l *responseLogger, r *http.Request, start time.Time) string {
detect(referer, "-"),
detect(userAgent, "-"),
r.Header.Get("Request-Id"),
+ fmt.Sprintf("%s", time.Since(start)),
}
return strings.Join(fields, " ")
|
add time taken to the http server logs
|
diff --git a/core/server/worker/src/main/java/alluxio/worker/block/evictor/LRFUEvictor.java b/core/server/worker/src/main/java/alluxio/worker/block/evictor/LRFUEvictor.java
index <HASH>..<HASH> 100644
--- a/core/server/worker/src/main/java/alluxio/worker/block/evictor/LRFUEvictor.java
+++ b/core/server/worker/src/main/java/alluxio/worker/block/evictor/LRFUEvictor.java
@@ -56,7 +56,7 @@ public final class LRFUEvictor extends AbstractEvictor {
private final Map<Long, Double> mBlockIdToCRFValue = new ConcurrentHashMapV8<>();
// In the range of [0, 1]. Closer to 0, LRFU closer to LFU. Closer to 1, LRFU closer to LRU
private final double mStepFactor;
- /** The attention factor is in the range of [2, INF] */
+ /** The attention factor is in the range of [2, INF]. */
private final double mAttenuationFactor;
//logic time count
|
Fix comment style LRUEvictor.java
|
diff --git a/tests/system-logger.js b/tests/system-logger.js
index <HASH>..<HASH> 100644
--- a/tests/system-logger.js
+++ b/tests/system-logger.js
@@ -11,8 +11,8 @@ const DELAYTOCHECKTESTLOGFILE = 1000;
const TESTLOGFILE = './tests/testArea/test.log';
describe('logging Tests', function() {
- before(() => {
- fs.unlinkSync(TESTLOGFILE); // No need to check file exist fs.existsSync(TESTLOGFILE). unlinkSync will skip when file no exist
+ after(() => {
+ fs.unlinkSync(TESTLOGFILE);
});
describe('Setting Tests', function() {
it('verify converseLeveValue', function() {
|
test(syste-logger): Change the cleanup after the test
|
diff --git a/lib/onebox/engine.rb b/lib/onebox/engine.rb
index <HASH>..<HASH> 100644
--- a/lib/onebox/engine.rb
+++ b/lib/onebox/engine.rb
@@ -97,6 +97,7 @@ require_relative "engine/sound_cloud_onebox"
require_relative "engine/spotify_onebox"
require_relative "engine/stack_exchange_onebox"
require_relative "engine/ted_onebox"
+require_relative "engine/twitter_onebox"
require_relative "engine/viddler_onebox"
require_relative "engine/vimeo_onebox"
require_relative "engine/wikipedia_onebox"
|
require twitter onebox in engine.rb #<I>
|
diff --git a/src/Carbon/Lang/fa.php b/src/Carbon/Lang/fa.php
index <HASH>..<HASH> 100644
--- a/src/Carbon/Lang/fa.php
+++ b/src/Carbon/Lang/fa.php
@@ -24,6 +24,6 @@ return array(
'second' => ':count ثانیه',
'ago' => ':time پیش',
'from_now' => ':time بعد',
- 'after' => ':time پیش از',
- 'before' => ':time پس از',
+ 'after' => ':time پس از',
+ 'before' => ':time پیش از',
);
|
Update fa.php
Farsi translations of 'after' and 'before' switched to correct the meanings.
|
diff --git a/pymc3/tests/test_examples.py b/pymc3/tests/test_examples.py
index <HASH>..<HASH> 100644
--- a/pymc3/tests/test_examples.py
+++ b/pymc3/tests/test_examples.py
@@ -15,9 +15,9 @@ def check_example(example_name):
example.run("short")
-def test_examples0():
- for t in itertools.islice(get_examples(), 0, 10):
- yield t
+# def test_examples0():
+# for t in itertools.islice(get_examples(), 0, 10):
+# yield t
def test_examples1():
for t in itertools.islice(get_examples(), 10, 20):
|
Removed first set of example tests to check on speedup
|
diff --git a/src/openaccess_epub/opf/opf.py b/src/openaccess_epub/opf/opf.py
index <HASH>..<HASH> 100644
--- a/src/openaccess_epub/opf/opf.py
+++ b/src/openaccess_epub/opf/opf.py
@@ -80,10 +80,10 @@ class OPF(object):
instance with the title argument, or calling set_title() at any time
before writing will give it a title.
"""
- #Set internal variables to defaults
- self.reset_state()
#Set Collection Mode by argument
self.collection_mode = collection_mode
+ #Set internal variables to defaults
+ self.reset_state()
#Set location by argument
self.location = location
#Create the basic document
|
fixing error caused by reordering of resets
|
diff --git a/lib/editor/htmlarea.php b/lib/editor/htmlarea.php
index <HASH>..<HASH> 100644
--- a/lib/editor/htmlarea.php
+++ b/lib/editor/htmlarea.php
@@ -2324,8 +2324,9 @@ HTMLArea.getHTML = function(root, outputRoot, editor) {
break; // skip comments, for now.
}
- return HTMLArea.formathtml(html);
- //return html;
+ // Still not workin' correctly...
+ //return HTMLArea.formathtml(html);
+ return html;
};
HTMLArea.prototype.stripBaseURL = function(string) {
|
HTMLArea.formathtml still not working correctly I've comment it out.
|
diff --git a/src/Layout.php b/src/Layout.php
index <HASH>..<HASH> 100644
--- a/src/Layout.php
+++ b/src/Layout.php
@@ -161,7 +161,7 @@ class Layout
$app = \Slim\Slim::getInstance();
$app->response()->status($status);
- $app->header('Content-Type', 'application/json');
+ $app->response()->header('Content-Type', 'application/json');
$body = json_encode($data);
$app->response()->body($data);
|
BUG: Didn't call response() for the header.
|
diff --git a/src/widgets/droppable/droppable.js b/src/widgets/droppable/droppable.js
index <HASH>..<HASH> 100644
--- a/src/widgets/droppable/droppable.js
+++ b/src/widgets/droppable/droppable.js
@@ -75,9 +75,11 @@
}
- _isPointHovering ( pointXY ) {
+ _isPointHovering ( pointXY, event ) {
- return !!this.$droppable.touching ({ point: pointXY }).length;
+ let point = pointXY || $.eventXY ( event, 'clientX', 'clientY' );
+
+ return !!this.$droppable.touching ({ point }).length;
}
@@ -119,7 +121,7 @@
if ( this._isCompatible ( data.draggable ) ) {
- let isHovering = this._isPointHovering ( data.moveXY );
+ let isHovering = this._isPointHovering ( false, data.moveEvent );
if ( isHovering !== this._wasHovering ) {
@@ -151,7 +153,7 @@
this.$droppable.removeClass ( this.options.classes.target );
- if ( this._isPointHovering ( data.endXY ) ) {
+ if ( this._isPointHovering ( false, data.endEvent ) ) {
if ( this._wasHovering ) {
|
Droppable: fixed usage when scrolled
|
diff --git a/transport/http/src/main/java/org/kaazing/gateway/transport/http/bridge/filter/HttpPersistenceFilter.java b/transport/http/src/main/java/org/kaazing/gateway/transport/http/bridge/filter/HttpPersistenceFilter.java
index <HASH>..<HASH> 100644
--- a/transport/http/src/main/java/org/kaazing/gateway/transport/http/bridge/filter/HttpPersistenceFilter.java
+++ b/transport/http/src/main/java/org/kaazing/gateway/transport/http/bridge/filter/HttpPersistenceFilter.java
@@ -139,6 +139,9 @@ public class HttpPersistenceFilter extends HttpFilterAdapter<IoSessionEx> {
@Override
public void operationComplete(WriteFuture future) {
IoSession session = future.getSession();
+ if (logger.isTraceEnabled()) {
+ logger.trace(String.format("Closing session %s because of Connection: close header in HTTP request", session));
+ }
// close on flush at server
session.close(false);
|
Adding a log message when a session is closed due to Connection: close
header in HTTP request
|
diff --git a/bmds/bmds3/recommender/checks.py b/bmds/bmds3/recommender/checks.py
index <HASH>..<HASH> 100644
--- a/bmds/bmds3/recommender/checks.py
+++ b/bmds/bmds3/recommender/checks.py
@@ -331,7 +331,7 @@ class NoDegreesOfFreedom(Check):
if dataset.dtype in constants.DICHOTOMOUS_DTYPES:
value = model.results.gof.df
elif dataset.dtype in constants.CONTINUOUS_DTYPES:
- value = model.results.fit.total_df
+ value = model.results.tests.dfs[3]
else:
raise ValueError("Unknown dtype")
|
use correct degree of freedom for continuous checks
|
diff --git a/pmdarima/arima/_context.py b/pmdarima/arima/_context.py
index <HASH>..<HASH> 100644
--- a/pmdarima/arima/_context.py
+++ b/pmdarima/arima/_context.py
@@ -37,7 +37,7 @@ class AbstractContext(ABC):
def __init__(self, **kwargs):
# remove None valued entries,
# since __getattr__ returns None if an attr is not present
- self.props = {k: v for k,v in kwargs.items() if v is not None} \
+ self.props = {k: v for k, v in kwargs.items() if v is not None} \
if kwargs else {}
def __enter__(self):
@@ -91,6 +91,7 @@ class _emptyContext(AbstractContext):
def get_type(self):
return ContextType.EMPTY
+
class ContextStore:
"""A class to wrap access to threading.local() context store
@@ -197,7 +198,8 @@ class ContextStore:
context_type = ctx.get_type()
- if context_type not in _ctx.store or len(_ctx.store[context_type]) == 0:
+ if context_type not in _ctx.store or \
+ len(_ctx.store[context_type]) == 0:
return
_ctx.store[context_type].pop()
|
resolve lint issues related to Context Manager changes
|
diff --git a/tasks/gss_pull.js b/tasks/gss_pull.js
index <HASH>..<HASH> 100644
--- a/tasks/gss_pull.js
+++ b/tasks/gss_pull.js
@@ -61,9 +61,12 @@ module.exports = function(grunt) {
var fetch_each_sheet = function(sheet, key) {
var promise = new Promise.Promise();
- var sheet_id = sheet.link[3].href.substr(
- sheet.link[3].href.length - 3, 3
- );
+
+ // It is a bit arbitrary, but the best way to get the sheet ID,
+ // which is something like "od6", is to use the last item link.
+ var sheet_link = sheet.link[sheet.link.length - 1].href;
+ var sheet_id = sheet_link.substr(sheet_link.length - 3, 3);
+
var url = "http://spreadsheets.google.com/feeds/list/" + key + "/" + sheet_id + "/public/values?alt=json";
http.get(url, function(res) {
var response_data = '';
@@ -102,7 +105,7 @@ module.exports = function(grunt) {
element[ column_names[j] ] = cell.$t;
}
}
- if(element.rowNumber === undefined) {
+ if(element.rowNumber === undefined) {
element.rowNumber = i + 1;
}
elements.push(element);
|
A bit more flexinibility in getting the right sheet id.
|
diff --git a/src/Common/Model/Base.php b/src/Common/Model/Base.php
index <HASH>..<HASH> 100644
--- a/src/Common/Model/Base.php
+++ b/src/Common/Model/Base.php
@@ -2087,7 +2087,8 @@ abstract class Base
protected function describeFieldsPrepareLabel($sLabel)
{
$aPatterns = [
- '/\bid\b/i' => 'ID',
+ '/\bid\b/i' => 'ID',
+ '/\burl\b/i' => 'URL',
];
$sLabel = ucwords(preg_replace('/[\-_]/', ' ', $sLabel));
|
Added `URL` to the `describeFieldsPrepareLabel`method
|
diff --git a/lib/que/locker.rb b/lib/que/locker.rb
index <HASH>..<HASH> 100644
--- a/lib/que/locker.rb
+++ b/lib/que/locker.rb
@@ -170,8 +170,7 @@ module Que
)
sort_keys.each do |sort_key|
- # TODO: Add a proper assertion helper.
- raise unless @locks.add?(sort_key.fetch(:id))
+ mark_id_as_locked(sort_key.fetch(:id))
end
push_jobs(sort_keys)
@@ -213,7 +212,7 @@ module Que
return false if @locks.include?(id)
return false unless lock_job(id)
- @locks.add(id)
+ mark_id_as_locked(id)
true
end
@@ -248,6 +247,12 @@ module Que
ids.each { |id| @locks.delete(id) }
end
+ def mark_id_as_locked(id)
+ Que.assert(@locks.add?(id)) do
+ "Job erroneously locked a second time: #{id}"
+ end
+ end
+
def wait_for_job(timeout = nil)
checkout do |conn|
conn.wait_for_notify(timeout) do |_, _, payload|
|
Use Que.assert to ensure that jobs aren't locked multiple times.
|
diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/TcpTransportFactory.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/TcpTransportFactory.java
index <HASH>..<HASH> 100644
--- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/TcpTransportFactory.java
+++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/TcpTransportFactory.java
@@ -270,7 +270,7 @@ public class TcpTransportFactory implements TransportFactory {
}
synchronized (lock) {
if (connectionPool.getMaxActive() > 0) {
- return connectionPool.getMaxActive() * servers.size();
+ return Math.max(connectionPool.getMaxActive() * servers.size(), connectionPool.getMaxActive()); //to avoid int overflow when maxActive is very high!
} else {
return 10 * servers.size();
}
|
ISPN-<I> - RemoteCacheManager failure in multi-threaded environment with maxActive=Integer.MAX_VALUE
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.