diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/simuvex/storage/paged_memory.py b/simuvex/storage/paged_memory.py
index <HASH>..<HASH> 100644
--- a/simuvex/storage/paged_memory.py
+++ b/simuvex/storage/paged_memory.py
@@ -117,7 +117,7 @@ class Page(object):
self._storage[end] = last_mo
else:
# we need to find all the gaps, and fill them in
- next_addr = start if floor_value is None else floor_value.last_addr + 1
+ next_addr = start if floor_value is None or not floor_value.includes(start) else floor_value.last_addr + 1
while next_addr < end:
try:
next_mo = self._storage.ceiling_item(next_addr)[1]
|
only fill in holes when it makes sense
|
diff --git a/graylog2-web-interface/src/views/stores/SearchStore.js b/graylog2-web-interface/src/views/stores/SearchStore.js
index <HASH>..<HASH> 100644
--- a/graylog2-web-interface/src/views/stores/SearchStore.js
+++ b/graylog2-web-interface/src/views/stores/SearchStore.js
@@ -111,7 +111,7 @@ export const SearchStore = singletonStore(
},
execute(executionState: SearchExecutionState): Promise<SearchExecutionResult> {
- if (this.executePromise) {
+ if (this.executePromise && this.executePromise.cancel) {
this.executePromise.cancel();
}
if (this.search) {
|
Actually check if we can cancel the promise before.
|
diff --git a/contribs/gmf/src/directives/filterselector.js b/contribs/gmf/src/directives/filterselector.js
index <HASH>..<HASH> 100644
--- a/contribs/gmf/src/directives/filterselector.js
+++ b/contribs/gmf/src/directives/filterselector.js
@@ -1,4 +1,3 @@
-goog.provide('gmf.FilterselectorController');
goog.provide('gmf.filterselectorComponent');
goog.require('gmf');
@@ -14,6 +13,7 @@ gmf.FilterselectorController = class {
* @param {gmfx.User} gmfUser User.
* @param {ngeo.DataSources} ngeoDataSources Ngeo collection of data sources
* objects.
+ * @private
* @ngInject
* @ngdoc controller
* @ngname GmfFilterselectorController
|
Filter - Remove filterselector controller's goog.require
|
diff --git a/core/src/main/java/io/undertow/Undertow.java b/core/src/main/java/io/undertow/Undertow.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/io/undertow/Undertow.java
+++ b/core/src/main/java/io/undertow/Undertow.java
@@ -263,7 +263,12 @@ public final class Undertow {
* Only shutdown the worker if it was created during start()
*/
if (internalWorker && worker != null) {
- worker.shutdownNow();
+ worker.shutdown();
+ try {
+ worker.awaitTermination();
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
worker = null;
}
xnio = null;
|
UNDERTOW-<I> Undertow does not shut down immediately on calling .stop()
|
diff --git a/data/node.js b/data/node.js
index <HASH>..<HASH> 100644
--- a/data/node.js
+++ b/data/node.js
@@ -24,6 +24,8 @@ function Node( properties ) {
this.properties = _.extend({}, this.getDefaultProperties(), properties);
this.properties.type = this.constructor.static.name;
this.properties.id = this.properties.id || uuid(this.properties.type);
+
+ this.didInitialize();
}
Node.Prototype = function() {
@@ -38,6 +40,8 @@ Node.Prototype = function() {
id: 'string'
};
+ this.didInitialize = function() {};
+
/**
* Serialize to JSON.
*
|
Added a didInitialize hook for Nodes.
|
diff --git a/SwatDB/SwatDBDataObject.php b/SwatDB/SwatDBDataObject.php
index <HASH>..<HASH> 100644
--- a/SwatDB/SwatDBDataObject.php
+++ b/SwatDB/SwatDBDataObject.php
@@ -53,6 +53,7 @@ class SwatDBDataObject extends SwatObject implements Serializable
protected $id_field = null;
// }}}
+
// {{{ public function __construct()
/**
@@ -611,7 +612,7 @@ class SwatDBDataObject extends SwatObject implements Serializable
// }}}
- // serializing
+ // serialization
// {{{ public function serialize()
public function serialize()
@@ -655,19 +656,19 @@ class SwatDBDataObject extends SwatObject implements Serializable
}
// }}}
- // {{{ protected function getSerializableSubDataObjects()
+ // {{{ public function __wakeup()
- protected function getSerializableSubDataObjects()
+ public function __wakeup()
{
- return array();
+ // here for subclasses
}
// }}}
- // {{{ public function __wakeup()
+ // {{{ protected function getSerializableSubDataObjects()
- public function __wakeup()
+ protected function getSerializableSubDataObjects()
{
- // here for subclasses
+ return array();
}
// }}}
|
- serializing/serialization
- public before protected
svn commit r<I>
|
diff --git a/src/FacebookServiceProvider.php b/src/FacebookServiceProvider.php
index <HASH>..<HASH> 100644
--- a/src/FacebookServiceProvider.php
+++ b/src/FacebookServiceProvider.php
@@ -43,7 +43,7 @@ class FacebookServiceProvider extends ServiceProvider
{
$source = realpath(__DIR__.'/../config/facebook.php');
- if (class_exists('Illuminate\Foundation\Application', false)) {
+ if (class_exists('Illuminate\Foundation\Application', false) && $app->runningInConsole()) {
$this->publishes([$source => config_path('facebook.php')]);
} elseif (class_exists('Laravel\Lumen\Application', false)) {
$app->configure('facebook');
|
Added extra check before registering publish command
|
diff --git a/test/test.load.js b/test/test.load.js
index <HASH>..<HASH> 100644
--- a/test/test.load.js
+++ b/test/test.load.js
@@ -37,7 +37,7 @@ describe(".load([callback])", function () {
// blow away the stack trace. Hack for Mocha:
// https://github.com/visionmedia/mocha/issues/502
- beforeEach(function(done){
+ beforeEach(function (done) {
setTimeout(done, 0);
});
@@ -113,7 +113,7 @@ describe(".load([callback])", function () {
expect(previewer.body.scrollTop).to.be.greaterThan(0);
previewer.body.scrollTop = 0;
- anchor.href = window.location.hostname+'#test';
+ anchor.href = window.location.hostname + '#test';
// Again, this is for IE
anchor.hostname = originalHostname
anchor.click();
|
trivial - fixing linting errors in loading test
|
diff --git a/lib/appsignal/cli/install.rb b/lib/appsignal/cli/install.rb
index <HASH>..<HASH> 100644
--- a/lib/appsignal/cli/install.rb
+++ b/lib/appsignal/cli/install.rb
@@ -85,7 +85,7 @@ module Appsignal
puts 'Installing for Sinatra'
config[:name] = required_input(' Enter application name: ')
puts
- configure(config, ['production', 'staging'], true)
+ configure(config, ['development', 'production', 'staging'], true)
puts "Finish Sinatra configuration"
puts " Sinatra requires some manual configuration."
@@ -107,7 +107,7 @@ module Appsignal
config[:name] = required_input(' Enter application name: ')
puts
- configure(config, ['production', 'staging'], true)
+ configure(config, ['development', 'production', 'staging'], true)
puts "Finish Padrino installation"
puts " Padrino requires some manual configuration."
@@ -127,7 +127,7 @@ module Appsignal
config[:name] = required_input(' Enter application name: ')
puts
- configure(config, ['production', 'staging'], true)
+ configure(config, ['development', 'production', 'staging'], true)
puts "Manual Grape configuration needed"
puts " See the installation instructions here:"
|
Add development to environments for yml file
This makes this onboarding easier for people testing their first
requests in development mode. It also follows the Rails defaults.
|
diff --git a/spyder/app/tests/test_mainwindow.py b/spyder/app/tests/test_mainwindow.py
index <HASH>..<HASH> 100644
--- a/spyder/app/tests/test_mainwindow.py
+++ b/spyder/app/tests/test_mainwindow.py
@@ -212,7 +212,7 @@ def test_run_cython_code(main_window, qtbot):
@flaky(max_runs=3)
-@pytest.mark.skipif(os.name == 'nt' or PYQT_WHEEL,
+@pytest.mark.skipif(True, #os.name == 'nt' or PYQT_WHEEL,
reason="It times out sometimes on Windows and using PyQt wheels")
def test_open_notebooks_from_project_explorer(main_window, qtbot):
"""Test that notebooks are open from the Project explorer."""
|
Testing: Skip test_open_notebooks_from_project_explorer because it's timing out
|
diff --git a/dist/zect.js b/dist/zect.js
index <HASH>..<HASH> 100644
--- a/dist/zect.js
+++ b/dist/zect.js
@@ -1,5 +1,5 @@
/**
-* Zect v1.0.4
+* Zect v1.0.5
* (c) 2015 guankaishe
* Released under the MIT License.
*/
diff --git a/dist/zect.min.js b/dist/zect.min.js
index <HASH>..<HASH> 100644
--- a/dist/zect.min.js
+++ b/dist/zect.min.js
@@ -1,5 +1,5 @@
/**
-* Zect v1.0.4
+* Zect v1.0.5
* (c) 2015 guankaishe
* Released under the MIT License.
*/
diff --git a/package.json b/package.json
index <HASH>..<HASH> 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "zect",
- "version": "1.0.4",
+ "version": "1.0.5",
"description": "A lightweight Web components and MVVM framework.",
"main": "index.js",
"scripts": {
|
version is corrected to <I>
|
diff --git a/src/core/Engine.js b/src/core/Engine.js
index <HASH>..<HASH> 100644
--- a/src/core/Engine.js
+++ b/src/core/Engine.js
@@ -286,6 +286,9 @@ var Engine = {};
* @param {vector} gravity
*/
var _bodiesApplyGravity = function(bodies, gravity) {
+ if (gravity.x === 0 && gravity.y === 0) {
+ return;
+ }
for (var i = 0; i < bodies.length; i++) {
var body = bodies[i];
|
don't calculate gravity force if there is no actual gravity
|
diff --git a/allaccess/models.py b/allaccess/models.py
index <HASH>..<HASH> 100644
--- a/allaccess/models.py
+++ b/allaccess/models.py
@@ -22,10 +22,10 @@ class Provider(models.Model):
"Configuration for OAuth provider."
name = models.CharField(max_length=50, unique=True)
- request_token_url = models.URLField(blank=True)
- authorization_url = models.URLField()
- access_token_url = models.URLField()
- profile_url = models.URLField()
+ request_token_url = models.CharField(blank=True, max_length=255)
+ authorization_url = models.CharField(max_length=255)
+ access_token_url = models.CharField(max_length=255)
+ profile_url = models.CharField(max_length=255)
consumer_key = EncryptedField(blank=True, null=True, default=None)
consumer_secret = EncryptedField(blank=True, null=True, default=None)
|
Changed Provider model to accept Microsoft Live urls
|
diff --git a/visidata/path.py b/visidata/path.py
index <HASH>..<HASH> 100644
--- a/visidata/path.py
+++ b/visidata/path.py
@@ -20,6 +20,8 @@ def vstat(path, force=False):
def filesize(path):
if hasattr(path, 'filesize') and path.filesize is not None:
return path.filesize
+ if path.is_url():
+ return 0
st = path.stat() # vstat(path)
return st and st.st_size
|
[path-] filesize of url is 0
|
diff --git a/voltdb/tests/conftest.py b/voltdb/tests/conftest.py
index <HASH>..<HASH> 100644
--- a/voltdb/tests/conftest.py
+++ b/voltdb/tests/conftest.py
@@ -46,7 +46,7 @@ def dd_environment(instance):
else:
e2e_metadata = {}
- with docker_run(compose_file, conditions=conditions, env_vars=env_vars, mount_logs=True):
+ with docker_run(compose_file, conditions=conditions, env_vars=env_vars, mount_logs=True, attempts=2):
yield instance, e2e_metadata
|
Add attempts to voltdb environment (#<I>)
|
diff --git a/lib/Teepee.js b/lib/Teepee.js
index <HASH>..<HASH> 100644
--- a/lib/Teepee.js
+++ b/lib/Teepee.js
@@ -485,12 +485,11 @@ Teepee.prototype.request = function (options, cb) {
currentRequest.end(body);
}
- var requestTimeoutId;
if (typeof timeout === 'number') {
currentRequest.setTimeout(timeout);
- requestTimeoutId = setTimeout(function () {
+ currentRequest.on('timeout', function () {
handleRequestError(new socketErrors.ETIMEDOUT());
- }, timeout);
+ });
}
function retryUponError(err) {
@@ -502,9 +501,6 @@ Teepee.prototype.request = function (options, cb) {
}
function handleRequestError(err) {
- if (requestTimeoutId) {
- clearTimeout(requestTimeoutId);
- }
currentRequest = null;
if (eventEmitter.done) {
return;
@@ -520,10 +516,6 @@ Teepee.prototype.request = function (options, cb) {
}
currentRequest.on('error', handleRequestError).on('response', function (response) {
- if (requestTimeoutId) {
- clearTimeout(requestTimeoutId);
- }
-
currentResponse = response;
var hasEnded = false,
responseError;
|
Timeout handling: Rely exclusively on the request object emitting a 'timeout' event, and don't use window.setTimeout.
|
diff --git a/google-cloud-storage/samples/storage_create_bucket_turbo_replication.rb b/google-cloud-storage/samples/storage_create_bucket_turbo_replication.rb
index <HASH>..<HASH> 100644
--- a/google-cloud-storage/samples/storage_create_bucket_turbo_replication.rb
+++ b/google-cloud-storage/samples/storage_create_bucket_turbo_replication.rb
@@ -21,10 +21,11 @@ def create_bucket_turbo_replication bucket_name:
storage = Google::Cloud::Storage.new
bucket = storage.create_bucket bucket_name,
- location: "ASIA",
+ location: "ASIA1",
rpo: "ASYNC_TURBO"
- puts "Created bucket #{bucket.name} in #{bucket.location} with turbo replication set to #{bucket.rpo}."
+ puts "Created bucket #{bucket.name} in #{bucket.location} with "
+ + "the recovery point objective (RPO) set to #{bucket.rpo}."
end
# [END storage_create_bucket_turbo_replication]
|
sample(google-cloud-storage): Update storage_create_bucket_turbo_replication.rb (#<I>)
|
diff --git a/source/application/controllers/admin/vendor_main.php b/source/application/controllers/admin/vendor_main.php
index <HASH>..<HASH> 100644
--- a/source/application/controllers/admin/vendor_main.php
+++ b/source/application/controllers/admin/vendor_main.php
@@ -139,9 +139,9 @@ class Vendor_Main extends oxAdminDetails
$oVendor = oxNew("oxvendor");
- if ($soxId != "-1")
+ if ($soxId != "-1") {
$oVendor->loadInLang($this->_iEditLang, $soxId);
- else {
+ } else {
$aParams['oxvendor__oxid'] = null;
}
|
Fix checkstyle warnings of "Type NotAllowed" - Inline control structures are not allowed
|
diff --git a/src/js/components/forms/inputs/SimpleInput.js b/src/js/components/forms/inputs/SimpleInput.js
index <HASH>..<HASH> 100644
--- a/src/js/components/forms/inputs/SimpleInput.js
+++ b/src/js/components/forms/inputs/SimpleInput.js
@@ -266,19 +266,13 @@ class SimpleInput extends InputBase {
}
case displayTypes.react:
return React.createElement(propDesc.$component, {
- storeName: this.props.storeName,
- storeDesc: this.props.storeDesc,
+ ...this.props,
disabled,
onChange: this.handleValueChange,
onBlur: this.handleBlur,
onFocus: this.handleFocus,
value,
- item,
- performAction: this.props.performAction,
propDesc,
- user,
- baseItem,
- combinedBaseItem,
});
case displayTypes.autocomplete:
return (
|
SimpleInput redirect props from react displayType
|
diff --git a/test/playback.spec.js b/test/playback.spec.js
index <HASH>..<HASH> 100644
--- a/test/playback.spec.js
+++ b/test/playback.spec.js
@@ -88,6 +88,10 @@ describe('Sono playback', function() {
});
});
+ // Firefox 35 and less has a bug where audio param ramping does not change the readable value in the param itself
+ // Fading still audibly affects the sound, but the value is untouched
+ if(navigator.userAgent.toLowerCase().indexOf('firefox') > -1) { return; }
+
describe('fade master', function() {
beforeEach(function(done) {
setTimeout(function() {
|
exclude firefox from fade tests for now
|
diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HiveClient.java b/presto-hive/src/main/java/com/facebook/presto/hive/HiveClient.java
index <HASH>..<HASH> 100644
--- a/presto-hive/src/main/java/com/facebook/presto/hive/HiveClient.java
+++ b/presto-hive/src/main/java/com/facebook/presto/hive/HiveClient.java
@@ -281,6 +281,9 @@ public class HiveClient
{
try {
Table table = metastore.getTable(tableName.getSchemaName(), tableName.getTableName());
+ if (table.getTableType().equals(TableType.VIRTUAL_VIEW.name())) {
+ throw new TableNotFoundException(tableName);
+ }
List<ColumnMetadata> columns = ImmutableList.copyOf(transform(getColumnHandles(table, false), columnMetadataGetter()));
return new ConnectorTableMetadata(tableName, columns, table.getOwner());
}
|
Fix listing columns from Presto views in Hive
|
diff --git a/lib/active_scaffold/helpers/action_link_helpers.rb b/lib/active_scaffold/helpers/action_link_helpers.rb
index <HASH>..<HASH> 100644
--- a/lib/active_scaffold/helpers/action_link_helpers.rb
+++ b/lib/active_scaffold/helpers/action_link_helpers.rb
@@ -124,7 +124,7 @@ module ActiveScaffold
link.crud_type = :read
end
- unless column_link_authorized?(link, link.column, record, associated)
+ unless column_link_authorized?(link, link.column, record, associated)[0]
link.action = nil
# if action is edit and is not authorized, fallback to show if it's enabled
if link.crud_type == :update && actions.include?(:show)
|
fix checking permission of singular association columns, column_link_authorized? return array of authorized and reason
|
diff --git a/packages/babel-plugin-minify-dead-code-elimination/src/index.js b/packages/babel-plugin-minify-dead-code-elimination/src/index.js
index <HASH>..<HASH> 100644
--- a/packages/babel-plugin-minify-dead-code-elimination/src/index.js
+++ b/packages/babel-plugin-minify-dead-code-elimination/src/index.js
@@ -699,6 +699,9 @@ module.exports = ({ types: t, traverse }) => {
keepFnArgs = false,
} = {}
} = {}) {
+ traverse.clearCache();
+ path.scope.crawl();
+
// We need to run this plugin in isolation.
path.traverse(main, {
functionToBindings: new Map(),
|
Fix dce - recompute path & scope before pass
|
diff --git a/src/OpenTok/Util/Validators.php b/src/OpenTok/Util/Validators.php
index <HASH>..<HASH> 100644
--- a/src/OpenTok/Util/Validators.php
+++ b/src/OpenTok/Util/Validators.php
@@ -146,7 +146,7 @@ class Validators
}
public static function validateArchiveData($archiveData)
{
- if (!self::$schemaUri) { self::$schemaUri = realpath(__DIR__.'/archive-schema.json'); }
+ if (!self::$schemaUri) { self::$schemaUri = __DIR__.'/archive-schema.json'; }
$document = new Document();
// have to do a encode+decode so that json objects decoded as arrays from Guzzle
// are re-encoded as objects instead
@@ -162,7 +162,7 @@ class Validators
}
public static function validateArchiveListData($archiveListData)
{
- if (!self::$schemaUri) { self::$schemaUri = realpath(__DIR__.'/archive-schema.json'); }
+ if (!self::$schemaUri) { self::$schemaUri = __DIR__.'/archive-schema.json'; }
$document = new Document();
// have to do a encode+decode so that json objects decoded as arrays from Guzzle
// are re-encoded as objects instead
|
Proposed fix for issue #<I>
|
diff --git a/twstock/__init__.py b/twstock/__init__.py
index <HASH>..<HASH> 100644
--- a/twstock/__init__.py
+++ b/twstock/__init__.py
@@ -11,4 +11,4 @@ from twstock.codes import twse, tpex, codes
from twstock.stock import Stock
-__version__ = '0.1.2-dev'
+__version__ = '0.1.3-dev'
|
Bump up the version to <I>-dev
|
diff --git a/core/src/test/java/io/cucumber/core/runner/TestHelper.java b/core/src/test/java/io/cucumber/core/runner/TestHelper.java
index <HASH>..<HASH> 100644
--- a/core/src/test/java/io/cucumber/core/runner/TestHelper.java
+++ b/core/src/test/java/io/cucumber/core/runner/TestHelper.java
@@ -77,6 +77,7 @@ public class TestHelper {
private TestHelper() {
}
+ @Deprecated
public static Builder builder() {
return new Builder();
}
|
[Core] Deprecate TestHelper
The `TestHelper` is an overly complex way to run tests. Building a runtime
and stubbing the step definitions provides a much simpler and more reliable
way to test Cucumbers execution.
See the `JUnitFormatterTest` for implementation examples.
|
diff --git a/src/core/services/theming/theming.js b/src/core/services/theming/theming.js
index <HASH>..<HASH> 100644
--- a/src/core/services/theming/theming.js
+++ b/src/core/services/theming/theming.js
@@ -45,7 +45,7 @@ var LIGHT_FOREGROUND = {
name: 'light',
'1': 'rgba(255,255,255,1.0)',
'2': 'rgba(255,255,255,0.7)',
- '3': 'rgba(255,255,255,0.3)',
+ '3': 'rgba(255,255,255,0.35)',
'4': 'rgba(255,255,255,0.12)'
};
|
style(): raise opacity of foreground-3 by 5%
|
diff --git a/lib/util/fileHelpers.js b/lib/util/fileHelpers.js
index <HASH>..<HASH> 100644
--- a/lib/util/fileHelpers.js
+++ b/lib/util/fileHelpers.js
@@ -21,6 +21,11 @@ module.exports = {
path.sep, filePath);
return JSON.parse(fs.readFileSync(fullPathToFile));
},
+ getFileAsString: function(filePath) {
+ var fullPathToFile = (filePath.charAt(0) === path.sep) ? filePath : path.join(process.cwd(),
+ path.sep, filePath);
+ return fs.readFileSync(fullPathToFile,'utf-8');
+ },
getFileAsArray: function(filePath) {
var fullPathToFile = (filePath.charAt(0) === path.sep) ? filePath : path.join(process.cwd(),
|
read plain text to String #<I>
|
diff --git a/src/javascript/ZeroClipboard/position.js b/src/javascript/ZeroClipboard/position.js
index <HASH>..<HASH> 100644
--- a/src/javascript/ZeroClipboard/position.js
+++ b/src/javascript/ZeroClipboard/position.js
@@ -9,7 +9,7 @@ ZeroClipboard.getDOMObjectPosition = function (obj) {
};
// float just above object, or default zIndex if dom element isn't set
- if (object.style.zIndex) {
+ if (obj.style.zIndex) {
info.zIndex = parseInt(element.style.zIndex, 10);
}
|
Typo, this should be obj
|
diff --git a/app/scripts/tests/globals.js b/app/scripts/tests/globals.js
index <HASH>..<HASH> 100644
--- a/app/scripts/tests/globals.js
+++ b/app/scripts/tests/globals.js
@@ -1,8 +1,8 @@
var sandbox, xhr, requests
var wysihtml5 = {
- Editor() {
+ Editor: function() {
return {
- on() {}
+ on: function() {}
}
}
}
|
Changes globals.js to old syntax to try to fix travis
|
diff --git a/repository/filepicker.js b/repository/filepicker.js
index <HASH>..<HASH> 100644
--- a/repository/filepicker.js
+++ b/repository/filepicker.js
@@ -434,7 +434,7 @@ M.core_filepicker.init = function(Y, options) {
draggable: true,
close: true,
underlay: 'none',
- zindex: 9999999,
+ zindex: 9999990,
monitorresize: false,
xy: [50, YAHOO.util.Dom.getDocumentScrollTop()+20]
});
@@ -917,12 +917,12 @@ M.core_filepicker.init = function(Y, options) {
search_dialog.cancel();
}
- var search_dialog = new YAHOO.widget.Dialog("fp-search-dlg", {
+ search_dialog = new YAHOO.widget.Dialog("fp-search-dlg", {
postmethod: 'async',
draggable: true,
width : "30em",
fixedcenter : true,
- zindex: 766667,
+ zindex: 9999991,
visible : false,
constraintoviewport : true,
buttons: [
|
"MDL-<I>, fixed zindex value for search dialog"
|
diff --git a/lib/ohai/plugins/network_listeners.rb b/lib/ohai/plugins/network_listeners.rb
index <HASH>..<HASH> 100644
--- a/lib/ohai/plugins/network_listeners.rb
+++ b/lib/ohai/plugins/network_listeners.rb
@@ -16,8 +16,6 @@
# limitations under the License.
#
-require 'sigar'
-
Ohai.plugin(:NetworkListeners) do
provides "network/listeners"
diff --git a/lib/ohai/runner.rb b/lib/ohai/runner.rb
index <HASH>..<HASH> 100644
--- a/lib/ohai/runner.rb
+++ b/lib/ohai/runner.rb
@@ -42,13 +42,17 @@ module Ohai
return false
end
- case plugin.version
- when :version7
- run_v7_plugin(plugin, force)
- when :version6
- run_v6_plugin(plugin, force)
- else
- raise ArgumentError, "Invalid plugin version #{plugin.version} for plugin #{plugin}"
+ begin
+ case plugin.version
+ when :version7
+ run_v7_plugin(plugin, force)
+ when :version6
+ run_v6_plugin(plugin, force)
+ else
+ raise ArgumentError, "Invalid plugin version #{plugin.version} for plugin #{plugin}"
+ end
+ rescue Exception,Errno::ENOENT => e
+ Ohai::Log.debug("Plugin #{plugin.name} threw exception #{e.inspect} #{e.backtrace.join("\n")}")
end
end
|
rescue exceptions thrown collecting data
back out the require 'sigar' hack
|
diff --git a/src/parser.js b/src/parser.js
index <HASH>..<HASH> 100644
--- a/src/parser.js
+++ b/src/parser.js
@@ -380,10 +380,30 @@ export default class Parser {
this.handleSwaggerMethod(resource, href, pathObjectParameters, methodValue, method);
});
+ this.handleSwaggerVendorExtensions(resource, pathValue);
+
return resource;
});
}
+ // Converts all unknown Swagger vendor extensions from an object into a API Element extension
+ handleSwaggerVendorExtensions(element, object) {
+ const extensions = _.chain(object)
+ .pick(isExtension)
+ .omit('x-description', 'x-summary', 'x-group-name')
+ .value();
+
+ if (Object.keys(extensions).length > 0) {
+ const {Link, Extension} = this.minim.elements;
+ const link = new Link();
+ link.relation = 'profile';
+ link.href = 'http://swagger.io/specification/#vendorExtensions';
+ const extension = new Extension(extensions);
+ extension.links = [link];
+ element.content.push(extension);
+ }
+ }
+
// Convert a Swagger method into a Refract transition.
handleSwaggerMethod(resource, href, resourceParameters, methodValue, method) {
const {Copy, Transition} = this.minim.elements;
|
Translate Swagger path-info extensions to resource extensions
|
diff --git a/tests/test_potential.py b/tests/test_potential.py
index <HASH>..<HASH> 100644
--- a/tests/test_potential.py
+++ b/tests/test_potential.py
@@ -160,7 +160,6 @@ def test_TwoPowerSphericalPotentialIntegerSelf():
def test_ZIsNone():
# TODO replace manual additions with an automatic method
# that checks the signatures all methods in all potentials
-
kw = dict(amp=1.,a=1.,normalize=False,ro=None,vo=None)
Rs= numpy.array([0.5,1.,2.])
|
retriggering codecov
I don’t believe the results.
|
diff --git a/lib/gettext_i18n_rails/ruby_gettext_extractor.rb b/lib/gettext_i18n_rails/ruby_gettext_extractor.rb
index <HASH>..<HASH> 100644
--- a/lib/gettext_i18n_rails/ruby_gettext_extractor.rb
+++ b/lib/gettext_i18n_rails/ruby_gettext_extractor.rb
@@ -44,7 +44,11 @@ module RubyGettextExtractor
end
def run(content)
- self.parse(content)
+ # ruby parser has an ugly bug which causes that several \000's take
+ # ages to parse. This avoids this probelm by stripping them away (they probably wont appear in keys anyway)
+ # See bug report: http://rubyforge.org/tracker/index.php?func=detail&aid=26898&group_id=439&atid=1778
+ safe_content = content.gsub(/\\\d\d\d/, '')
+ self.parse(safe_content)
return @results
end
|
Workaround for a problem in the ruby parser
A bug in the ruby parser can cause gettext:find to
hang. The workaround removes all \<I> from the input
before parsing.
See bug report:
<URL>
|
diff --git a/admin/tool/generator/tests/maketestcourse_test.php b/admin/tool/generator/tests/maketestcourse_test.php
index <HASH>..<HASH> 100644
--- a/admin/tool/generator/tests/maketestcourse_test.php
+++ b/admin/tool/generator/tests/maketestcourse_test.php
@@ -112,7 +112,6 @@ class tool_generator_maketestcourse_testcase extends advanced_testcase {
* Creates an small test course with fixed data set and checks the used sections and users.
*/
public function test_fixed_data_set() {
- global $DB;
$this->resetAfterTest();
$this->setAdminUser();
@@ -127,14 +126,12 @@ class tool_generator_maketestcourse_testcase extends advanced_testcase {
// Check module instances belongs to section 1.
$instances = $modinfo->get_instances_of('page');
- $npageinstances = count($instances);
foreach ($instances as $instance) {
$this->assertEquals(1, $instance->sectionnum);
}
// Users that started discussions are the same.
$forums = $modinfo->get_instances_of('forum');
- $nforuminstances = count($forums);
$discussions = forum_get_discussions(reset($forums), 'd.timemodified ASC');
$lastusernumber = 0;
$discussionstarters = array();
|
MDL-<I> tool_generator: Removing unused vars
|
diff --git a/lxd/devlxd_test.go b/lxd/devlxd_test.go
index <HASH>..<HASH> 100644
--- a/lxd/devlxd_test.go
+++ b/lxd/devlxd_test.go
@@ -11,6 +11,7 @@ import (
"testing"
"github.com/lxc/lxd/lxd/sys"
+ "github.com/lxc/lxd/lxd/ucred"
)
var testDir string
@@ -103,13 +104,13 @@ func TestCredsSendRecv(t *testing.T) {
}
defer conn.Close()
- cred, err := getCred(conn)
+ cred, err := ucred.GetCred(conn)
if err != nil {
t.Log(err)
result <- -1
return
}
- result <- cred.pid
+ result <- cred.PID
}()
conn, err := connect(fmt.Sprintf("%s/test-devlxd-sock", testDir))
|
test: Updates devlxd tests to use ucred package
|
diff --git a/src/bootstrap-table.js b/src/bootstrap-table.js
index <HASH>..<HASH> 100644
--- a/src/bootstrap-table.js
+++ b/src/bootstrap-table.js
@@ -956,8 +956,7 @@ class BootstrapTable {
return
}
- const s = this.searchText && (this.fromHtml ?
- Utils.escapeHTML(this.searchText) : this.searchText).toLowerCase()
+ const s = this.searchText && (this.fromHtml ? Utils.escapeHTML(this.searchText) : this.searchText).toLowerCase()
const f = Utils.isEmptyObject(this.filterColumns) ? null : this.filterColumns
// Check filter
@@ -1041,7 +1040,7 @@ class BootstrapTable {
}
} else {
const largerSmallerEqualsRegex = /(?:(<=|=>|=<|>=|>|<)(?:\s+)?(-?\d+)?|(-?\d+)?(\s+)?(<=|=>|=<|>=|>|<))/gm
- const matches = largerSmallerEqualsRegex.exec(s)
+ const matches = largerSmallerEqualsRegex.exec(this.searchText)
let comparisonCheck = false
if (matches) {
|
Use the original search text instead of the (maybe) escaped one, to
prevent issues with tables based on html
|
diff --git a/pygubudesigner/widgets/imageentry.py b/pygubudesigner/widgets/imageentry.py
index <HASH>..<HASH> 100644
--- a/pygubudesigner/widgets/imageentry.py
+++ b/pygubudesigner/widgets/imageentry.py
@@ -58,10 +58,11 @@ class ImagePropertyEditor(PropertyEditor):
fname = tk.filedialog.askopenfilename(**options)
if fname:
base, name = os.path.split(fname)
- self._set_value(name)
- self._on_variable_changed(event=None)
+ # Register image before change event is generated:
if not StockImage.is_registered(name):
StockImage.register(name, fname)
+ self._set_value(name)
+ self._on_variable_changed(event=None)
register_editor('imageentry', ImagePropertyEditor)
|
Register image before change event is generated.
|
diff --git a/src/ol/interaction/draginteraction.js b/src/ol/interaction/draginteraction.js
index <HASH>..<HASH> 100644
--- a/src/ol/interaction/draginteraction.js
+++ b/src/ol/interaction/draginteraction.js
@@ -39,12 +39,12 @@ ol.interaction.Drag = function() {
/**
* @type {number}
*/
- this.offsetX = 0;
+ this.deltaX = 0;
/**
* @type {number}
*/
- this.offsetY = 0;
+ this.deltaY = 0;
/**
* @type {ol.Coordinate}
|
Rename offset* attributes to delta*
|
diff --git a/pipe_test.go b/pipe_test.go
index <HASH>..<HASH> 100644
--- a/pipe_test.go
+++ b/pipe_test.go
@@ -12,7 +12,10 @@ func TestPipe(t *testing.T) {
go func() {
for i := 0; i < 10; i++ {
- w.Write([]byte(fmt.Sprintf("%d", i)))
+ if _, err := w.Write([]byte(fmt.Sprintf("%d", i))); err != nil {
+ t.Error(err.Error())
+ return
+ }
}
w.Close()
}()
|
Added break into test if Write fails
|
diff --git a/lib/netsuite/actions/search.rb b/lib/netsuite/actions/search.rb
index <HASH>..<HASH> 100644
--- a/lib/netsuite/actions/search.rb
+++ b/lib/netsuite/actions/search.rb
@@ -120,14 +120,18 @@ module NetSuite
else
if condition[:value].is_a?(Array) && condition[:value].first.respond_to?(:to_record)
# TODO need to update to the latest savon so we don't need to duplicate the same workaround above again
+ # TODO it's possible that this might break, not sure if platformCore:SearchMultiSelectField is the right type in every situation
- # h[element_name] = {
- # "platformCore:searchValue" => {
- # :content! => condition[:value].map(&:to_record),
- # '@internalId' => condition[:value].internal_id,
- # '@operator' => condition[:operator]
- # }
- # }
+ h[element_name] = {
+ '@operator' => condition[:operator],
+ '@xsi:type' => 'platformCore:SearchMultiSelectField',
+ "platformCore:searchValue" => {
+ :content! => condition[:value].map(&:to_record),
+ '@internalId' => condition[:value].map(&:internal_id),
+ '@xsi:type' => 'platformCore:RecordRef',
+ '@type' => 'account'
+ }
+ }
else
h[element_name] = {
"platformCore:searchValue" => condition[:value]
|
Handle anyOf searches outside the customFieldList and join context
|
diff --git a/km3pipe/pumps/daq.py b/km3pipe/pumps/daq.py
index <HASH>..<HASH> 100644
--- a/km3pipe/pumps/daq.py
+++ b/km3pipe/pumps/daq.py
@@ -47,7 +47,10 @@ class DAQPump(Pump):
except struct.error:
raise StopIteration
- data_type = DATA_TYPES[preamble.data_type]
+ try:
+ data_type = DATA_TYPES[preamble.data_type]
+ except KeyError:
+ data_type = 'Unknown'
blob = Blob()
blob[data_type] = None
|
Handle exception if data type is unknown
|
diff --git a/tests/ember_debug/object-inspector-test.js b/tests/ember_debug/object-inspector-test.js
index <HASH>..<HASH> 100644
--- a/tests/ember_debug/object-inspector-test.js
+++ b/tests/ember_debug/object-inspector-test.js
@@ -772,14 +772,8 @@ module('Ember Debug - Object Inspector', function (hooks) {
'Correctly merges properties'
);
- const hasChildren = A(message.details[3].properties).findBy(
- 'name',
- 'hasChildren'
- );
- const expensiveProperty = A(message.details[3].properties).findBy(
- 'name',
- 'expensiveProperty'
- );
+ const hasChildren = message.details[3].properties.find((p) => p.name === 'hasChildren');
+ const expensiveProperty = message.details[3].properties.find((p) => p.name === 'expensiveProperty');
assert.equal(hasChildren.name, 'hasChildren');
assert.equal(
expensiveProperty.name,
|
Update tests/ember_debug/object-inspector-test.js
|
diff --git a/packages/create-razzle-app/templates/default/src/index.js b/packages/create-razzle-app/templates/default/src/index.js
index <HASH>..<HASH> 100644
--- a/packages/create-razzle-app/templates/default/src/index.js
+++ b/packages/create-razzle-app/templates/default/src/index.js
@@ -19,7 +19,7 @@ if (module.hot) {
const noErrors = () => {
try {
- require('./server.js').default;
+ require('./server').default;
} catch (error) {
console.error(error);
return false;
|
cleanup: remove .js extensions from require
|
diff --git a/src/Routing/Route/Route.php b/src/Routing/Route/Route.php
index <HASH>..<HASH> 100644
--- a/src/Routing/Route/Route.php
+++ b/src/Routing/Route/Route.php
@@ -265,8 +265,6 @@ class Route
*/
public function parse($url)
{
- $request = Router::getRequest(true) ?: Request::createFromGlobals();
-
if (empty($this->_compiledRoute)) {
$this->compile();
}
@@ -277,6 +275,7 @@ class Route
}
if (isset($this->defaults['_method'])) {
+ $request = Router::getRequest(true) ?: Request::createFromGlobals();
$method = $request->env('REQUEST_METHOD');
if (!in_array($method, (array)$this->defaults['_method'], true)) {
return false;
|
Micro-optimization in route parsing.
Save a few function calls when parsing routes. Only fetch the request
when we actually need it.
|
diff --git a/test/index.js b/test/index.js
index <HASH>..<HASH> 100644
--- a/test/index.js
+++ b/test/index.js
@@ -29,6 +29,14 @@ var deep = {
}
};
+test('missing arguments', function (t) {
+ t.deepEqual(extend(undefined, { a: 1 }), { a: 1 }, 'missing first argument is second argument');
+ t.deepEqual(extend({ a: 1 }), { a: 1 }, 'missing second argument is first argument');
+ t.deepEqual(extend(true, undefined, { a: 1 }), { a: 1 }, 'deep: missing first argument is second argument');
+ t.deepEqual(extend(true, { a: 1 }), { a: 1 }, 'deep: missing second argument is first argument');
+ t.deepEqual(extend(), {}, 'no arguments is object');
+ t.end();
+});
test('merge string with string', function (t) {
var ori = 'what u gonna say';
|
Adding test cases for missing arguments.
|
diff --git a/jquery.flot.js b/jquery.flot.js
index <HASH>..<HASH> 100644
--- a/jquery.flot.js
+++ b/jquery.flot.js
@@ -2544,13 +2544,8 @@ Licensed under the MIT license.
// fill the bar
if (fillStyleCallback) {
- c.beginPath();
- c.moveTo(left, bottom);
- c.lineTo(left, top);
- c.lineTo(right, top);
- c.lineTo(right, bottom);
c.fillStyle = fillStyleCallback(bottom, top);
- c.fill();
+ c.fillRect(left, top, right - left, bottom - top)
}
// draw outline
|
Draw bars using fillRect instead of paths.
This is up to 2x faster and appears to work around issues in Chrome's
canvas implementation that sometimes result in bars not being filled.
Resolves #<I>.
|
diff --git a/trace/agent.js b/trace/agent.js
index <HASH>..<HASH> 100644
--- a/trace/agent.js
+++ b/trace/agent.js
@@ -139,7 +139,7 @@ Agent.prototype.setupNewSpan = function setupNewSpan(options) {
parentSpan = self.getCurrentSpan();
} else {
parentSpan = options.parentSpan;
- if (options.outgoing) {
+ if (options.outgoing && !parentSpan && !options.topLevelRequest) {
self.logger.warn("TChannel tracer: parent span not specified " +
"for outgoing request!", options);
}
|
trace: allowing parentSpan warning to be ignored
|
diff --git a/src/System/SysProperties.php b/src/System/SysProperties.php
index <HASH>..<HASH> 100644
--- a/src/System/SysProperties.php
+++ b/src/System/SysProperties.php
@@ -82,4 +82,15 @@ class SysProperties {
}
return $ini;
}
+
+ /**
+ * @return int
+ * @throws FileNotFoundException
+ * @throws InvalidPropertyStructureException
+ * @throws NoPathException
+ */
+ public function size(): int {
+ $properties = $this->getProperties();
+ return \count($properties);
+ }
}
\ No newline at end of file
|
size method in SysProperties
|
diff --git a/scripts/babel-relay-plugin/src/GraphQLPrinter.js b/scripts/babel-relay-plugin/src/GraphQLPrinter.js
index <HASH>..<HASH> 100644
--- a/scripts/babel-relay-plugin/src/GraphQLPrinter.js
+++ b/scripts/babel-relay-plugin/src/GraphQLPrinter.js
@@ -10,12 +10,12 @@ var util = require('util');
* This is part of the Babel transform to convert embedded GraphQL RFC to
* JavaScript. It converts from GraphQL AST to a string of JavaScript code.
*/
-function RQLPrinter2(schema, rqlFunctionName) {
+function GraphQLPrinter(schema, rqlFunctionName) {
this.rqlFunctionName = rqlFunctionName;
this.schema = schema;
}
-RQLPrinter2.prototype.getCode = function(ast, substitutions) {
+GraphQLPrinter.prototype.getCode = function(ast, substitutions) {
var options = {
rqlFunctionName: this.rqlFunctionName,
schema: this.schema,
@@ -724,4 +724,4 @@ function getSelections(node) {
return [];
}
-module.exports = RQLPrinter2;
+module.exports = GraphQLPrinter;
|
Rename GraphQLPrinter internal functions
|
diff --git a/components/Migrate-Packages/ui/wizard.php b/components/Migrate-Packages/ui/wizard.php
index <HASH>..<HASH> 100644
--- a/components/Migrate-Packages/ui/wizard.php
+++ b/components/Migrate-Packages/ui/wizard.php
@@ -12,7 +12,7 @@
<?php echo PodsForm::field( '_wpnonce', wp_create_nonce( 'pods-component-' . $component . '-' . $method ), 'hidden' ); ?>
<?php echo PodsForm::field( 'import_export', 'export', 'hidden' ); ?>
- <h2 class="italicized"><?php _e( 'Import Pods 1.x Packages', 'pods' ); ?></h2>
+ <h2 class="italicized"><?php _e( 'Migrate: Packages', 'pods' ); ?></h2>
<img src="<?php echo PODS_URL; ?>ui/images/pods-logo-notext-rgb-transparent.png" class="pods-leaf-watermark-right" />
|
Tweak heading text for new Packages component
|
diff --git a/library/src/main/java/com/github/clans/fab/FloatingActionMenu.java b/library/src/main/java/com/github/clans/fab/FloatingActionMenu.java
index <HASH>..<HASH> 100755
--- a/library/src/main/java/com/github/clans/fab/FloatingActionMenu.java
+++ b/library/src/main/java/com/github/clans/fab/FloatingActionMenu.java
@@ -862,6 +862,19 @@ public class FloatingActionMenu extends ViewGroup {
mButtonsCount--;
}
+ public void addMenuButton(FloatingActionButton fab, int index) {
+ int size = mButtonsCount - 2;
+ if (index < 0) {
+ index = 0;
+ } else if (index > size) {
+ index = size;
+ }
+
+ addView(fab, index);
+ mButtonsCount++;
+ addLabel(fab);
+ }
+
public void removeAllMenuButtons() {
close(true);
|
Added option to add button to the menu at position. Closes #<I>.
|
diff --git a/pysle/isletool.py b/pysle/isletool.py
index <HASH>..<HASH> 100644
--- a/pysle/isletool.py
+++ b/pysle/isletool.py
@@ -202,9 +202,9 @@ def _prepRESearchStr(matchStr, wordInitial='ok', wordFinal='ok',
matchStr = matchStr.replace(charB, charA)
# Replace special characters
- replDict = {"D": u"[tdsz]", # dentals
+ replDict = {"D": u"(?:t(?!ʃ)|d(?!ʒ)|[sz])", # dentals
"F": u"[ʃʒfvszɵðh]", # fricatives
- "S": u"[pbtdkg]", # stops
+ "S": u"(?:t(?!ʃ)|d(?!ʒ)|[pbkg])", # stops
"N": u"[nmŋ]", # nasals
"R": u"[rɝɚ]", # rhotics
"V": u"(?:aʊ|ei|oʊ|ɑɪ|ɔi|[iuæɑɔəɛɪʊʌ]):?", # vowels
|
BUGFIX: Dental and Stop special keys don't match multichar sounds like tʃ
So 't' will be matched but not 'tʃ'
|
diff --git a/lib/Cake/Controller/ComponentCollection.php b/lib/Cake/Controller/ComponentCollection.php
index <HASH>..<HASH> 100644
--- a/lib/Cake/Controller/ComponentCollection.php
+++ b/lib/Cake/Controller/ComponentCollection.php
@@ -55,6 +55,16 @@ class ComponentCollection extends ObjectCollection implements CakeEventListener
}
/**
+ * Set the controller associated with the collection.
+ *
+ * @param Controller $Controller Controller to set
+ * @return void
+ */
+ public function setController(Controller $Controller) {
+ $this->_Controller = $Controller;
+ }
+
+/**
* Get the controller associated with the collection.
*
* @return Controller Controller instance
diff --git a/lib/Cake/TestSuite/ControllerTestCase.php b/lib/Cake/TestSuite/ControllerTestCase.php
index <HASH>..<HASH> 100644
--- a/lib/Cake/TestSuite/ControllerTestCase.php
+++ b/lib/Cake/TestSuite/ControllerTestCase.php
@@ -334,6 +334,7 @@ abstract class ControllerTestCase extends CakeTestCase {
$request = $this->getMock('CakeRequest');
$response = $this->getMock('CakeResponse', array('_sendHeader'));
$controllerObj->__construct($request, $response);
+ $controllerObj->Components->setController($controllerObj);
$config = ClassRegistry::config('Model');
foreach ($mocks['models'] as $model => $methods) {
|
Make sure ComponentCollection has the controller dependency.
Add setter method as changing ComponentCollection's constructor now is
not possible. This fixes issues where components that rely on
Collection->getController() in their constructor can work properly.
Fixes #<I>
|
diff --git a/spec/dummy/config/application.rb b/spec/dummy/config/application.rb
index <HASH>..<HASH> 100644
--- a/spec/dummy/config/application.rb
+++ b/spec/dummy/config/application.rb
@@ -6,6 +6,9 @@ Bundler.require(*Rails.groups)
# require the engine being tested. In a non-dummy app this would be handled by the engine's gem being in the Gemfile
# for real app and Bundler.require requiring the gem.
require 'metasploit_data_models'
+require 'metasploit_data_models/engine'
+require 'metasploit/concern/engine'
+require 'metasploit/model/engine'
module Dummy
class Application < Rails::Application
|
Add the proper engine requires to the dummy app
MSP-<I>
|
diff --git a/jsonschema/cli.py b/jsonschema/cli.py
index <HASH>..<HASH> 100644
--- a/jsonschema/cli.py
+++ b/jsonschema/cli.py
@@ -77,7 +77,7 @@ def main(args=sys.argv[1:]):
def run(arguments, stdout=sys.stdout, stderr=sys.stderr, stdin=sys.stdin):
- error_delimiter = "———|ERROR|—————————————————————————\n"
+ error_delimiter = "===[ERROR]====================================\n"
error_format = arguments["error_format"]
validator = arguments["validator"](schema=arguments["schema"])
|
[CLI] Remove incompatible character, replaced by '='
|
diff --git a/code/SubsitesVirtualPage.php b/code/SubsitesVirtualPage.php
index <HASH>..<HASH> 100644
--- a/code/SubsitesVirtualPage.php
+++ b/code/SubsitesVirtualPage.php
@@ -11,6 +11,7 @@ class SubsitesVirtualPage extends VirtualPage {
$fields = parent::getCMSFields();
$subsites = DataObject::get('Subsite');
+ if(!$subsites) $subsites = new DataObjectSet();
$subsites->push(new ArrayData(array('Title' => 'Main site', 'ID' => 0)));
$subsiteSelectionField = new DropdownField(
|
MINOR: Don't throw an error if no subsites are defined. (from r<I>)
|
diff --git a/subnuker.py b/subnuker.py
index <HASH>..<HASH> 100644
--- a/subnuker.py
+++ b/subnuker.py
@@ -12,7 +12,7 @@ Python package.
"""
__program__ = 'subnuker'
-__version__ = '0.3'
+__version__ = '0.4'
# --- BEGIN CODE --- #
|
Bump up to version <I> (so that the changes can be uploaded to PyPi)
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -53,7 +53,7 @@ setup(
"fabric>=1.8.0,<1.11.0",
"PyYAML<4.0.0",
"requests-futures>0.9.0",
- "kafka-python==1.3.2",
+ "kafka-python>=1.3.2,<1.4.0",
"requests<3.0.0",
'retrying'
],
|
Update kafka-python requirement in kafka utils
Let's not pin it down to an exact version so it is compatible with post version from our kafka-python fork
|
diff --git a/lib/weary/resource.rb b/lib/weary/resource.rb
index <HASH>..<HASH> 100644
--- a/lib/weary/resource.rb
+++ b/lib/weary/resource.rb
@@ -9,11 +9,11 @@ module Weary
def initialize(method, uri)
@method = method
- @uri = Addressable::Template.new(uri)
+ self.url uri
end
def url(uri=nil)
- @uri = Addressable::Template.new(uri) unless uri.nil?
+ @uri = Addressable::Template.new(uri.gsub(/:(\w+)/) { "{#{$1}}" }) unless uri.nil?
@uri
end
diff --git a/spec/weary/resource_spec.rb b/spec/weary/resource_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/weary/resource_spec.rb
+++ b/spec/weary/resource_spec.rb
@@ -20,6 +20,18 @@ describe Weary::Resource do
resource.url url
resource.url.pattern.should eql url
end
+
+ it "accepts variables in the url" do
+ url = "http://github.com/api/v2/json/repos/show/{user}/{repo}"
+ resource = Weary::Resource.new "GET", url
+ resource.url.variables.should include 'user'
+ end
+
+ it "accepts variables in the sinatra style" do
+ url = "http://github.com/api/v2/json/repos/show/:user/:repo"
+ resource = Weary::Resource.new "GET", url
+ resource.url.variables.should include 'user'
+ end
end
describe "#optional" do
|
Allow Sinatra-style url variables in resource paths
|
diff --git a/lib/librarian/resolver/implementation.rb b/lib/librarian/resolver/implementation.rb
index <HASH>..<HASH> 100644
--- a/lib/librarian/resolver/implementation.rb
+++ b/lib/librarian/resolver/implementation.rb
@@ -65,8 +65,7 @@ module Librarian
dependencies << dependency
scope_resolving_dependency dependency do
related_dependencies = dependencies.select{|d| d.name == dependency.name}
- debug { "Checking manifests" }
- scope do
+ scope_checking_manifests do
resolution = nil
dependency.manifests.each do |manifest|
break if resolution
@@ -110,6 +109,13 @@ module Librarian
resolution
end
+ def scope_checking_manifests
+ debug { "Checking manifests" }
+ scope do
+ yield
+ end
+ end
+
def scope
@level += 1
yield
|
Move some scope work into a helper method in the resolver impl.
|
diff --git a/ontrack-web/src/app/view/view.search.js b/ontrack-web/src/app/view/view.search.js
index <HASH>..<HASH> 100644
--- a/ontrack-web/src/app/view/view.search.js
+++ b/ontrack-web/src/app/view/view.search.js
@@ -9,7 +9,7 @@ angular.module('ot.view.search', [
controller: 'SearchCtrl'
});
})
- .controller('SearchCtrl', function ($stateParams, $scope, $http, ot) {
+ .controller('SearchCtrl', function ($location, $stateParams, $scope, $http, ot) {
// Search token
$scope.token = $stateParams.token;
@@ -23,6 +23,10 @@ angular.module('ot.view.search', [
ot.pageCall($http.post('search', {token: $scope.token})).then(function (results) {
$scope.searchDone = true;
$scope.results = results;
+ // If only one result, switches directly to the correct page
+ if (results.length == 1) {
+ $location.path(results[0].hint);
+ }
});
})
|
Search: redirect to the page in case of only one result
|
diff --git a/rpcserver.go b/rpcserver.go
index <HASH>..<HASH> 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -718,10 +718,8 @@ func (r *rpcServer) ListChannels(ctx context.Context,
// With the channel point known, retrieve the network channel
// ID from the database.
- chanID, err := graph.ChannelID(chanPoint)
- if err != nil {
- return nil, err
- }
+ var chanID uint64
+ chanID, _ = graph.ChannelID(chanPoint)
channel := &lnrpc.ActiveChannel{
RemotePubkey: nodeID,
|
rpcserver: don't error out in ListChannels if unable to retrieve chanID
|
diff --git a/kmip/__init__.py b/kmip/__init__.py
index <HASH>..<HASH> 100644
--- a/kmip/__init__.py
+++ b/kmip/__init__.py
@@ -17,6 +17,7 @@ import logging.config
import os
import re
import sys
+import warnings
# Dynamically set __version__
version_path = os.path.join(os.path.dirname(
@@ -63,3 +64,11 @@ else:
logging.basicConfig()
__all__ = ['core', 'demos', 'services']
+
+if sys.version_info[:2] == (2, 6):
+ warnings.simplefilter("always")
+ warnings.warn(
+ ("Please use a newer version of Python (2.7.9+ preferred). PyKMIP "
+ "support for Python 2.6 will be abandoned in the future."),
+ PendingDeprecationWarning)
+ warnings.simplefilter("default")
|
Adding pending deprecation warning for Python<I>
This change add a simple warning that is triggered whenever Python
<I> is used with PyKMIP. It simply advises the user to use a newer
version of Python. For now, Python <I> can still be used with
PyKMIP.
|
diff --git a/lib/adminable/resource.rb b/lib/adminable/resource.rb
index <HASH>..<HASH> 100644
--- a/lib/adminable/resource.rb
+++ b/lib/adminable/resource.rb
@@ -28,7 +28,7 @@ module Adminable
end
def ==(other)
- name == other.name
+ other.is_a?(Adminable::Resource) && name == other.name
end
end
end
|
Add check for class for resource == method
|
diff --git a/admin/langdoc.php b/admin/langdoc.php
index <HASH>..<HASH> 100755
--- a/admin/langdoc.php
+++ b/admin/langdoc.php
@@ -33,6 +33,9 @@
admin_externalpage_print_header();
+ notify('NOTICE: This interface is obsolete now and will be removed. You should use
+ improved <a href="lang.php?mode=helpfiles">lang.php</a> interface.');
+
$currentlang = current_language();
$langdir = "$CFG->dataroot/lang/$currentlang";
$enlangdir = "$CFG->dirroot/lang/en_utf8";
|
MDL-<I> Merged from stable. Print an obsolete message.
|
diff --git a/packer/rpc/muxconn.go b/packer/rpc/muxconn.go
index <HASH>..<HASH> 100644
--- a/packer/rpc/muxconn.go
+++ b/packer/rpc/muxconn.go
@@ -146,6 +146,8 @@ func (m *MuxConn) Accept(id uint32) (io.ReadWriteCloser, error) {
// Dial opens a connection to the remote end using the given stream ID.
// An Accept on the remote end will only work with if the IDs match.
func (m *MuxConn) Dial(id uint32) (io.ReadWriteCloser, error) {
+ log.Printf("[TRACE] %p: Dial on stream ID: %d", m, id)
+
m.muDial.Lock()
// If we have any streams with this ID, then it is a failure. The
|
packer/rpc: a little more logging
|
diff --git a/pkg/bgpv1/gobgp/workdiff.go b/pkg/bgpv1/gobgp/workdiff.go
index <HASH>..<HASH> 100644
--- a/pkg/bgpv1/gobgp/workdiff.go
+++ b/pkg/bgpv1/gobgp/workdiff.go
@@ -88,9 +88,9 @@ func (wd *reconcileDiff) empty() bool {
// since registerOrReconcileDiff populates the `seen` field of a diff, this method should always
// be called first when computing a reconcileDiff.
func (wd *reconcileDiff) registerOrReconcileDiff(m LocalASNMap, policy *v2alpha1api.CiliumBGPPeeringPolicy) error {
- for _, config := range policy.Spec.VirtualRouters {
+ for i, config := range policy.Spec.VirtualRouters {
if _, ok := wd.seen[config.LocalASN]; !ok {
- wd.seen[config.LocalASN] = &config
+ wd.seen[config.LocalASN] = &policy.Spec.VirtualRouters[i]
} else {
return fmt.Errorf("encountered duplicate local ASNs")
}
|
bgp-cp: fix taking address of of loop variable
this commit fixes a bug in computing a work diff when reconciliating BGP
virtual routers.
this bug would take an address of the loop variable and store this
which is not the correct reference when utilized later.
to fix this, just take the address of the slice's index.
|
diff --git a/client.go b/client.go
index <HASH>..<HASH> 100644
--- a/client.go
+++ b/client.go
@@ -324,7 +324,7 @@ func (c *Client) doRequest(req *http.Request, emptyResponse bool) (interface{},
var values []interface{}
for {
values = append(values, responsePaginated.Values...)
- if responsePaginated.Pagelen == 0 || responsePaginated.Size/responsePaginated.Pagelen <= responsePaginated.Page {
+ if len(responsePaginated.Next) == 0 {
break
}
newReq, err := http.NewRequest(req.Method, responsePaginated.Next, nil)
@@ -336,6 +336,8 @@ func (c *Client) doRequest(req *http.Request, emptyResponse bool) (interface{},
if err != nil {
return resBody, err
}
+
+ responsePaginated = &Response{}
json.NewDecoder(resp).Decode(responsePaginated)
}
responsePaginated.Values = values
|
Don't reuse response struct for multiple requests (#<I>)
A fix was added in <URL>).
The actual problem was that the `responsePaginated` variable was being reused in the loop, and the json decoder doesn't overwrite fields that aren't present in the response, so it was the `Next` field would end up with the value from the previous page, causing the same page to be requested forever.
|
diff --git a/src/Database/Rules.php b/src/Database/Rules.php
index <HASH>..<HASH> 100644
--- a/src/Database/Rules.php
+++ b/src/Database/Rules.php
@@ -54,6 +54,9 @@ class Rules
{
if (array_key_exists($k, $rules))
{
+ // (Re)set rule variable
+ $rule = null;
+
if (is_callable($rules[$k]))
{
if ($error = call_user_func_array($rules[$k], [$data]))
|
Reset rule var to prevent false positives when looping
|
diff --git a/aiortc/contrib/media.py b/aiortc/contrib/media.py
index <HASH>..<HASH> 100644
--- a/aiortc/contrib/media.py
+++ b/aiortc/contrib/media.py
@@ -12,6 +12,29 @@ from ..mediastreams import AUDIO_PTIME, MediaStreamError, MediaStreamTrack
logger = logging.getLogger('media')
+REAL_TIME_FORMATS = [
+ 'alsa',
+ 'android_camera',
+ 'avfoundation',
+ 'bktr',
+ 'decklink',
+ 'dshow',
+ 'fbdev',
+ 'gdigrab',
+ 'iec61883',
+ 'jack',
+ 'kmsgrab',
+ 'openal',
+ 'oss',
+ 'pulse',
+ 'sndio',
+ 'rtsp',
+ 'v4l2',
+ 'vfwcap',
+ 'x11grab',
+]
+
+
async def blackhole_consume(track):
while True:
try:
@@ -197,8 +220,7 @@ class MediaPlayer:
# check whether we need to throttle playback
container_format = set(self.__container.format.name.split(','))
- self._throttle_playback = not container_format.intersection([
- 'avfoundation', 'dshow', 'rtsp', 'v4l2', 'vfwcap'])
+ self._throttle_playback = not container_format.intersection(REAL_TIME_FORMATS)
@property
def audio(self):
|
[media player] list more real-time acquisition sources
|
diff --git a/go/libkb/check_tracking.go b/go/libkb/check_tracking.go
index <HASH>..<HASH> 100644
--- a/go/libkb/check_tracking.go
+++ b/go/libkb/check_tracking.go
@@ -4,9 +4,12 @@
package libkb
func CheckTracking(g *GlobalContext) error {
- // LoadUser automatically fires off UserChanged notifications when it
- // discovers new track or untrack chain links.
- arg := NewLoadUserArg(g).WithAbortIfSigchainUnchanged()
- _, err := LoadMe(arg)
+ // If we load a UPAK with the ForcePoll(true) flag, we're going to
+ // check our local UPAK against the live Merkle tree. On the case of
+ // a fresh UPAK, then no op. On the case of a stale UPAK then we trigger
+ // a LoadUser, which will send UserChanged as it refreshes.
+ m := NewMetaContextBackground(g)
+ arg := NewLoadUserArgWithMetaContext(m).WithUID(m.CurrentUID()).WithSelf(true).WithForcePoll(true)
+ _, _, err := g.GetUPAKLoader().LoadV2(arg)
return err
}
|
use UPAK loads in hourly check tracking (#<I>)
* use UPAK loads in hourly check tracking
* fix it
|
diff --git a/src/util/browser.js b/src/util/browser.js
index <HASH>..<HASH> 100644
--- a/src/util/browser.js
+++ b/src/util/browser.js
@@ -17,7 +17,7 @@ export let safari = /Apple Computer/.test(navigator.vendor)
export let mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(userAgent)
export let phantom = /PhantomJS/.test(userAgent)
-export let ios = !edge && /AppleWebKit/.test(userAgent) && (/Mobile\/\w+/.test(userAgent) || navigator.maxTouchPoints > 2)
+export let ios = safari && (/Mobile\/\w+/.test(userAgent) || navigator.maxTouchPoints > 2)
export let android = /Android/.test(userAgent)
// This is woefully incomplete. Suggestions for alternative methods welcome.
export let mobile = ios || android || /webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(userAgent)
|
Try to refine iPadOS/iOS detection
Issue #<I>
|
diff --git a/Kwc/Form/Component.php b/Kwc/Form/Component.php
index <HASH>..<HASH> 100644
--- a/Kwc/Form/Component.php
+++ b/Kwc/Form/Component.php
@@ -137,7 +137,7 @@ class Kwc_Form_Component extends Kwc_Abstract_Composite_Component
$this->_postData = $postData;
if (isset($postData[$this->getData()->componentId])) {
ignore_user_abort(true);
- $this->_errors = array_merge($this->_errors, $this->_form->validate(null, $postData));
+ $this->_errors = array_merge($this->_errors, $this->_validate($postData));
if (!$this->_errors) {
try {
$this->_form->prepareSave(null, $postData);
@@ -181,6 +181,12 @@ class Kwc_Form_Component extends Kwc_Abstract_Composite_Component
}
}
+ //can be overriden to implement custom validation logic
+ protected function _validate($postData)
+ {
+ return $this->_form->validate(null, $postData);
+ }
+
//can be overriden to *not* log specific exceptions or adapt error
protected function _handleProcessException(Exception $e)
{
|
Move logic to get error-messages from separate function
This way it's possible to generate error-messages in Kwc_Form_Component
|
diff --git a/test/eth/Cdp.spec.js b/test/eth/Cdp.spec.js
index <HASH>..<HASH> 100644
--- a/test/eth/Cdp.spec.js
+++ b/test/eth/Cdp.spec.js
@@ -225,7 +225,7 @@ const sharedTests = (openCdp, proxy = false) => {
await promiseWait(1100);
await cdpService._drip(); //drip() updates _rhi and thus all cdp fees
- nonceService._counts[proxyAccount] = transactionCount;
+ nonceService._counts[currentAccount] = transactionCount;
});
afterEach(async () => {
@@ -327,6 +327,7 @@ const sharedTests = (openCdp, proxy = false) => {
});
test('wipe debt with non-zero stability fee', async () => {
+ // if (!proxy) nonceService._counts[currentAccount] -= 1;
const mkr = cdpService.get('token').getToken(MKR);
const debt1 = await cdp.getDebtValue();
const balance1 = await mkr.balanceOf(currentAccount);
@@ -433,7 +434,7 @@ describe('non-proxy cdp', () => {
});
});
-describe.only('proxy cdp', () => {
+describe('proxy cdp', () => {
let ethToken;
beforeAll(async () => {
|
Fix side effects in non-proxy tests
|
diff --git a/lib/aruba/platforms/announcer.rb b/lib/aruba/platforms/announcer.rb
index <HASH>..<HASH> 100644
--- a/lib/aruba/platforms/announcer.rb
+++ b/lib/aruba/platforms/announcer.rb
@@ -196,37 +196,6 @@ module Aruba
nil
end
-
- # @deprecated
- def stdout(content)
- warn('The announcer now has a new api to activate channels. Please use this one: announce(:stdout, message)')
- announce :stdout, content
- end
-
- # @deprecated
- def stderr(content)
- warn('The announcer now has a new api to activate channels. Please use this one: announce(:stderr, message)')
- announce :stderr, content
- end
-
- # @deprecated
- def dir(dir)
- warn('The announcer now has a new api to activate channels. Please use this one announce(:directory, message)')
- announce :directory, dir
- end
-
- # @deprecated
- def cmd(cmd)
- warn('The announcer now has a new api to activate channels. Please use this one announce(:command, message)')
- announce :command, cmd
- end
-
- # @deprecated
- def env(name, value)
- warn('The announcer now has a new api to activate channels. Please use this one: announce(:changed_environment, key, value)')
-
- announce :changed_environment, name, value
- end
end
end
end
|
Remove deprecated method from Announcer
|
diff --git a/tests/test_transformer.py b/tests/test_transformer.py
index <HASH>..<HASH> 100644
--- a/tests/test_transformer.py
+++ b/tests/test_transformer.py
@@ -180,4 +180,4 @@ class TransformerTest(TestCase):
)
with patcher:
response = CustomProxyView.as_view(html5=True)(request, '/')
- self.assertIn('<!DOCTYPE html>', response.content)
+ self.assertIn(b'<!DOCTYPE html>', response.content)
|
Updated html5 transform test to support python3
|
diff --git a/lib/roxml/xml.rb b/lib/roxml/xml.rb
index <HASH>..<HASH> 100644
--- a/lib/roxml/xml.rb
+++ b/lib/roxml/xml.rb
@@ -200,7 +200,7 @@ module ROXML
value.each do |v|
xml.child_add(v.to_xml(name))
end
- elsif value.respond_to? :tag_refs
+ elsif value.is_a?(ROXML)
xml.child_add(value.to_xml(name))
else
node = XML::Node.new_element(name)
|
Cleaner way of differentiating between ROXML and self-defined #to_xml types
|
diff --git a/napalm_junos/junos.py b/napalm_junos/junos.py
index <HASH>..<HASH> 100644
--- a/napalm_junos/junos.py
+++ b/napalm_junos/junos.py
@@ -535,7 +535,7 @@ class JunOSDriver(NetworkDriver):
if 'router_id' not in bgp_neighbor_data[instance_name]:
# we only need to set this once
bgp_neighbor_data[instance_name]['router_id'] = \
- py23_compat.text_type(neighbor_details['local_id'])
+ py23_compat.text_type(neighbor_details.get('local_id', ''))
peer = {
key: self._parse_value(value)
for key, value in neighbor_details.items()
|
FIXES #<I>, no exception for missing local_id key
|
diff --git a/src/lib/server/index.js b/src/lib/server/index.js
index <HASH>..<HASH> 100644
--- a/src/lib/server/index.js
+++ b/src/lib/server/index.js
@@ -21,7 +21,7 @@ app.use(compression());
addProxies(app, config.proxies);
if (isProduction) {
- app.use("/assets", express.static("build"));
+ app.use("/assets", express.static("build", { maxAge: 315360000 } ));
logger.info("Server side rendering server running");
}
else {
|
update max age now that we include file hashes
|
diff --git a/src/diagrams/class/classDb.js b/src/diagrams/class/classDb.js
index <HASH>..<HASH> 100644
--- a/src/diagrams/class/classDb.js
+++ b/src/diagrams/class/classDb.js
@@ -163,7 +163,7 @@ export const cleanupLabel = function (label) {
if (label.substring(0, 1) === ':') {
return common.sanitizeText(label.substr(1).trim(), configApi.getConfig());
} else {
- return label.trim();
+ return sanitizeText(label.trim());
}
};
|
fix: one more sanitization
|
diff --git a/photutils/segmentation/deblend.py b/photutils/segmentation/deblend.py
index <HASH>..<HASH> 100644
--- a/photutils/segmentation/deblend.py
+++ b/photutils/segmentation/deblend.py
@@ -224,11 +224,8 @@ def _deblend_source(data, segment_img, npixels, nlevels=32, contrast=0.001,
raise ValueError('Invalid connectivity={0}. '
'Options are 4 or 8'.format(connectivity))
- # Work on a copy of the data to avoid modifying the input image
- data = data.copy()
segm_mask = (segment_img.data > 0)
source_values = data[segm_mask]
- data[~segm_mask] = 0
source_min = np.min(source_values)
source_max = np.max(source_values)
if source_min == source_max:
@@ -255,9 +252,10 @@ def _deblend_source(data, segment_img, npixels, nlevels=32, contrast=0.001,
# create top-down tree of local peaks
segm_tree = []
+ mask = ~segm_mask
for level in thresholds[::-1]:
segm_tmp = detect_sources(data, level, npixels=npixels,
- connectivity=connectivity)
+ connectivity=connectivity, mask=mask)
if segm_tmp.nlabels >= 2:
fluxes = []
for i in segm_tmp.labels:
|
Use the new mask keyword for detect_sources
|
diff --git a/lib/hatchet/logger.rb b/lib/hatchet/logger.rb
index <HASH>..<HASH> 100644
--- a/lib/hatchet/logger.rb
+++ b/lib/hatchet/logger.rb
@@ -5,14 +5,13 @@ module Hatchet
# Internal: Class that handles logging calls and distributes them to all its
# appenders.
#
- # Each logger has 6 methods. Those are, in decreasing order of severity:
+ # Each logger has 5 methods. Those are, in decreasing order of severity:
#
# * fatal
# * error
# * warn
# * info
# * debug
- # * trace
#
# All the methods have the same signature. You can either provide a message as
# a direct string, or as a block to the method is lazily evaluated (this is
@@ -38,7 +37,7 @@ module Hatchet
@appenders = appenders
end
- [:trace, :debug, :info, :warn, :error, :fatal].each do |level|
+ [:debug, :info, :warn, :error, :fatal].each do |level|
# Public: Logs a message at the given level.
#
@@ -76,7 +75,6 @@ module Hatchet
# * warn
# * info
# * debug
- # * trace
#
# message - The message that will be logged by an appender when it is
# configured to log at the given level or lower.
|
Removed additional mentions of a trace level
|
diff --git a/src/django_future/models.py b/src/django_future/models.py
index <HASH>..<HASH> 100644
--- a/src/django_future/models.py
+++ b/src/django_future/models.py
@@ -54,8 +54,8 @@ class ScheduledJob(models.Model):
def run(self):
# TODO: logging?
- args = self.args
- kwargs = self.kwargs
+ args = self.args or []
+ kwargs = self.kwargs or {}
if '.' in self.callable_name:
module_name, function_name = self.callable_name.rsplit('.', 1)
module = __import__(module_name, fromlist=[function_name])
@@ -82,9 +82,9 @@ class ScheduledJob(models.Model):
if content_object is None:
content_object = self.content_object
if args is None:
- args = self.args
+ args = self.args or []
if kwargs is None:
- kwargs = self.kwargs
+ kwargs = self.kwargs or {}
from django_future import schedule_job
return schedule_job(date, callable_name, content_object=content_object,
expires=expires, args=args, kwargs=kwargs)
|
Make sure args and kwargs passed to the callable are correctly typed (as list and dict).
|
diff --git a/squad/frontend/views.py b/squad/frontend/views.py
index <HASH>..<HASH> 100644
--- a/squad/frontend/views.py
+++ b/squad/frontend/views.py
@@ -1,8 +1,9 @@
+from django.http import HttpResponse
from django.shortcuts import render
def home(request):
- pass
+ return HttpResponse('hello world')
def group(request, group_slug):
|
/: provide an empty but successful response
|
diff --git a/activemodel/lib/active_model/validations/numericality.rb b/activemodel/lib/active_model/validations/numericality.rb
index <HASH>..<HASH> 100644
--- a/activemodel/lib/active_model/validations/numericality.rb
+++ b/activemodel/lib/active_model/validations/numericality.rb
@@ -26,8 +26,6 @@ module ActiveModel
raw_value = value
end
- return if options[:allow_nil] && raw_value.nil?
-
unless is_number?(raw_value)
record.errors.add(attr_name, :not_a_number, filtered_options(raw_value))
return
|
validate_each in NumericalityValidator is never called in this case.
NumericalityValidator#validate_each is never called when allow_nil is true and
the value is nil because it is already skipped in EachValidator#validate.
|
diff --git a/lib/addressable/template.rb b/lib/addressable/template.rb
index <HASH>..<HASH> 100644
--- a/lib/addressable/template.rb
+++ b/lib/addressable/template.rb
@@ -649,7 +649,7 @@ module Addressable
private
def ordered_variable_defaults
- @ordered_variable_defaults ||= (
+ @ordered_variable_defaults ||= begin
expansions, _ = parse_template_pattern(pattern)
expansions.map do |capture|
_, _, varlist = *capture.match(EXPRESSION)
@@ -657,7 +657,7 @@ module Addressable
varspec[VARSPEC, 1]
end
end.flatten
- )
+ end
end
|
This should be a begin..end block.
|
diff --git a/src/com/google/javascript/jscomp/JSDocInfoPrinter.java b/src/com/google/javascript/jscomp/JSDocInfoPrinter.java
index <HASH>..<HASH> 100644
--- a/src/com/google/javascript/jscomp/JSDocInfoPrinter.java
+++ b/src/com/google/javascript/jscomp/JSDocInfoPrinter.java
@@ -168,7 +168,7 @@ public final class JSDocInfoPrinter {
// Print suppressions in sorted order to avoid non-deterministic output.
String[] arr = suppressions.toArray(new String[0]);
Arrays.sort(arr, Ordering.<String>natural());
- parts.add("@suppress {" + Joiner.on(',').join(Arrays.asList(arr)) + "}");
+ parts.add("@suppress {" + Joiner.on(',').join(arr) + "}");
multiline = true;
}
|
Joiners can join on arrays directly, so remove the extra conversion.
-------------
Created by MOE: <URL>
|
diff --git a/core/src/main/java/org/acegisecurity/ui/switchuser/SwitchUserProcessingFilter.java b/core/src/main/java/org/acegisecurity/ui/switchuser/SwitchUserProcessingFilter.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/org/acegisecurity/ui/switchuser/SwitchUserProcessingFilter.java
+++ b/core/src/main/java/org/acegisecurity/ui/switchuser/SwitchUserProcessingFilter.java
@@ -263,8 +263,8 @@ public class SwitchUserProcessingFilter implements Filter, InitializingBean,
UserDetails originalUser = null;
Object obj = original.getPrincipal();
- if ((obj != null) && obj instanceof User) {
- originalUser = (User) obj;
+ if ((obj != null) && obj instanceof UserDetails) {
+ originalUser = (UserDetails) obj;
}
// publish event
|
when extracting the original user, fix by referencing by the interface (UserDetail) rather than the concrete class (User)
|
diff --git a/lib/grade/grade_category.php b/lib/grade/grade_category.php
index <HASH>..<HASH> 100644
--- a/lib/grade/grade_category.php
+++ b/lib/grade/grade_category.php
@@ -1098,6 +1098,10 @@ class grade_category extends grade_object {
* @return object grade_category instance for course grade
*/
function fetch_course_category($courseid) {
+ if (empty($courseid)) {
+ debugging('Missing course id!');
+ return false;
+ }
// course category has no parent
if ($course_category = grade_category::fetch(array('courseid'=>$courseid, 'parent'=>null))) {
|
add debug code for missing course id when getting course grading category; merged from MOODLE_<I>_STABLE
|
diff --git a/src/guake.py b/src/guake.py
index <HASH>..<HASH> 100644
--- a/src/guake.py
+++ b/src/guake.py
@@ -912,7 +912,6 @@ class Guake(SimpleGladeApp):
box.terminal.connect('child-exited', self.on_terminal_exited, box)
box.show()
- pagenum = self.notebook.page_num(box)
last_added = len(self.term_list)
self.term_list.append(box.terminal)
@@ -928,15 +927,17 @@ class Guake(SimpleGladeApp):
bnt.set_property('can-focus', False)
bnt.set_property('draw-indicator', False)
bnt.connect('button-press-event', self.show_tab_menu)
- bnt.connect('clicked', lambda *x:
- self.notebook.set_current_page(pagenum))
+ bnt.connect('clicked',
+ lambda *x: self.notebook.set_current_page(
+ self.notebook.page_num(box)
+ ))
bnt.show()
self.tabs.pack_start(bnt, expand=False, padding=1)
self.tab_counter += 1
self.notebook.append_page(box, None)
- self.notebook.set_current_page(last_added)
+ self.notebook.set_current_page(self.notebook.page_num(box))
self.load_config()
def delete_tab(self, pagepos, kill=True):
|
Fixing a scope problem
Caused by a "fix" made by me in a patch...
|
diff --git a/protocol/signalfx/signalfxforwarder.go b/protocol/signalfx/signalfxforwarder.go
index <HASH>..<HASH> 100644
--- a/protocol/signalfx/signalfxforwarder.go
+++ b/protocol/signalfx/signalfxforwarder.go
@@ -103,12 +103,14 @@ func NewSignalfxJSONForwarer(url string, timeout time.Duration,
defaultAuthToken string, drainingThreads uint32,
defaultSource string, sourceDimensions string, proxyVersion string) *Forwarder {
tr := &http.Transport{
+ Proxy: http.ProxyFromEnvironment,
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
MaxIdleConnsPerHost: int(drainingThreads) * 2,
ResponseHeaderTimeout: timeout,
Dial: func(network, addr string) (net.Conn, error) {
return net.DialTimeout(network, addr, timeout)
},
+ TLSHandshakeTimeout: timeout,
}
ret := &Forwarder{
url: url,
|
Support HTTP_PROXY env variable for proxy use with metricproxy
|
diff --git a/cobra/core/Model.py b/cobra/core/Model.py
index <HASH>..<HASH> 100644
--- a/cobra/core/Model.py
+++ b/cobra/core/Model.py
@@ -207,7 +207,9 @@ class Model(Object):
except Exception: # pragma: no cover
new._solver = copy(self.solver) # pragma: no cover
- new.solution = deepcopy(self.solution)
+ # No use in copying it, also circular dependencies
+ new._timestamp_last_optimization = None
+ new.solution = LazySolution(self)
return new
def add_metabolites(self, metabolite_list):
|
feat: do not deepcopy solution object in model.copy() (HT @cdiener)
|
diff --git a/jks/jks.py b/jks/jks.py
index <HASH>..<HASH> 100644
--- a/jks/jks.py
+++ b/jks/jks.py
@@ -44,7 +44,7 @@ try:
except ImportError:
from io import BytesIO # python3
-__version_info__ = (17, 0, 1, 'dev')
+__version_info__ = (17, 1, 0, '')
__version__ = ".".join(str(x) for x in __version_info__ if str(x))
MAGIC_NUMBER_JKS = b4.pack(0xFEEDFEED)
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,7 @@ from setuptools import setup, find_packages
setup(
name='pyjks',
- version='17.0.1dev',
+ version='17.1.0',
author="Kurt Rose, Jeroen De Ridder",
author_email="kurt@kurtrose.com",
description='Pure-Python Java Keystore (JKS) library',
|
bumping version for <I> release
|
diff --git a/block.go b/block.go
index <HASH>..<HASH> 100644
--- a/block.go
+++ b/block.go
@@ -171,11 +171,13 @@ func (b *block) write(revision uint64, w io.Writer) error {
if err := writeString(w, columnType); err != nil {
return err
}
- if err := b.offsetBuffers[i].writeTo(w); err != nil {
- return err
- }
- if err := b.buffers[i].writeTo(w); err != nil {
- return err
+ if len(b.buffers) != 0 {
+ if err := b.offsetBuffers[i].writeTo(w); err != nil {
+ return err
+ }
+ if err := b.buffers[i].writeTo(w); err != nil {
+ return err
+ }
}
}
return nil
|
fix: index out of renge when close tx without data
|
diff --git a/lib/activeuuid/uuid.rb b/lib/activeuuid/uuid.rb
index <HASH>..<HASH> 100644
--- a/lib/activeuuid/uuid.rb
+++ b/lib/activeuuid/uuid.rb
@@ -71,7 +71,7 @@ module ActiveUUID
def uuids(*attributes)
attributes.each do |attribute|
- serialize "#{attribute}_id".intern, ActiveUUID::UUIDSerializer.new
+ serialize attribute.intern, ActiveUUID::UUIDSerializer.new
#class_eval <<-eos
# # def #{@association_name}
# # @_#{@association_name} ||= self.class.associations[:#{@association_name}].new_proxy(self)
|
API Breaking Change. #uuids directive must now be explicit. this allows us to have uuid attributes that don't end in _id
|
diff --git a/lib/beaker-hostgenerator/data/vmpooler.rb b/lib/beaker-hostgenerator/data/vmpooler.rb
index <HASH>..<HASH> 100644
--- a/lib/beaker-hostgenerator/data/vmpooler.rb
+++ b/lib/beaker-hostgenerator/data/vmpooler.rb
@@ -2,7 +2,7 @@ module BeakerHostGenerator
module Data
module Vmpooler
- OSINFO_BGHv0 = {
+ OSINFO = {
'arista4-32' => {
'platform' => 'eos-4-i386',
'template' => 'arista-4-i386'
@@ -506,9 +506,9 @@ module BeakerHostGenerator
def get_osinfo(bgh_version=0)
case bgh_version
when '0'
- osinfo = OSINFO_BGHv0
+ osinfo = OSINFO
when '1'
- osinfo = OSINFO_BGHv0
+ osinfo = OSINFO
osinfo.deep_merge! OSINFO_BGHv1
else
raise "Invalid beaker-hostgenerator version: #{bgh_version}"
|
(QENG-<I>) Actually, don't change the original datastructure name.
|
diff --git a/plugins/spf.js b/plugins/spf.js
index <HASH>..<HASH> 100644
--- a/plugins/spf.js
+++ b/plugins/spf.js
@@ -114,9 +114,10 @@ exports.hook_helo = exports.hook_ehlo = function (next, connection, helo) {
exports.hook_mail = function (next, connection, params) {
var plugin = this;
- // For inbound message from a private IP, skip MAIL FROM check
- if (!connection.relaying && connection.remote.is_private) {
- return next();
+ // For messages from private IP space...
+ if (connection.remote.is_private) {
+ if (!connection.relaying) return next();
+ if (connection.relaying && plugin.cfg.relay.context !== 'myself') return next();
}
var txn = connection.transaction;
|
Skip SPF check for outbound mail when context is not 'myself' (#<I>)
Fixes #<I>
|
diff --git a/lib/Doctrine/ORM/Tools/SchemaValidator.php b/lib/Doctrine/ORM/Tools/SchemaValidator.php
index <HASH>..<HASH> 100644
--- a/lib/Doctrine/ORM/Tools/SchemaValidator.php
+++ b/lib/Doctrine/ORM/Tools/SchemaValidator.php
@@ -117,7 +117,8 @@ class SchemaValidator
"field " . $assoc->targetEntityName . "#" . $assoc->inversedBy . " which does not exist.";
}
- if ($targetMetadata->associationMappings[$assoc->mappedBy]->mappedBy == null) {
+ if (isset($targetMetadata->associationMappings[$assoc->mappedBy]) &&
+ $targetMetadata->associationMappings[$assoc->mappedBy]->mappedBy == null) {
$ce[] = "The field " . $class->name . "#" . $fieldName . " is on the inverse side of a ".
"bi-directional relationship, but the specified mappedBy association on the target-entity ".
$assoc->targetEntityName . "#" . $assoc->mappedBy . " does not contain the required ".
|
DDC-<I> - Fixed a notice occuring in certain scenarios of the new Validate Schema Tool
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.