diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/Swat/exceptions/SwatException.php b/Swat/exceptions/SwatException.php
index <HASH>..<HASH> 100644
--- a/Swat/exceptions/SwatException.php
+++ b/Swat/exceptions/SwatException.php
@@ -283,12 +283,12 @@ class SwatException extends Exception
{
ob_start();
- printf("%s Exception: %s\n\nCode: %s\n\nMessage:\n\t%s\n\n".
+ printf("%s Exception: %s\n\nMessage: %s\n\nCode:\n\t%s\n\n".
"Created in file '%s' on line %s.\n\n",
$this->wasHandled() ? 'Caught' : 'Uncaught',
$this->class,
- $this->getCode(),
$this->getMessage(),
+ $this->getCode(),
$this->getFile(),
$this->getLine());
|
Display message first and code second.
svn commit r<I>
|
diff --git a/testing/test_runner.py b/testing/test_runner.py
index <HASH>..<HASH> 100644
--- a/testing/test_runner.py
+++ b/testing/test_runner.py
@@ -468,10 +468,7 @@ reporttypes = [reports.BaseReport, reports.TestReport, reports.CollectReport]
"reporttype", reporttypes, ids=[x.__name__ for x in reporttypes]
)
def test_report_extra_parameters(reporttype):
- if hasattr(inspect, "signature"):
- args = list(inspect.signature(reporttype.__init__).parameters.keys())[1:]
- else:
- args = inspect.getargspec(reporttype.__init__)[0][1:]
+ args = list(inspect.signature(reporttype.__init__).parameters.keys())[1:]
basekw = dict.fromkeys(args, [])
report = reporttype(newthing=1, **basekw)
assert report.newthing == 1
|
delete inspect.getargspect() as is deprecated since Python <I>
|
diff --git a/android_asset_resizer/resizer.py b/android_asset_resizer/resizer.py
index <HASH>..<HASH> 100755
--- a/android_asset_resizer/resizer.py
+++ b/android_asset_resizer/resizer.py
@@ -40,7 +40,7 @@ class AssetResizer():
try:
path = os.path.join(self.out, 'res/drawable-%s' % d)
- os.makedirs(path, 0755)
+ os.makedirs(path, 0o755)
except OSError:
pass
|
Fix another octal definition.
|
diff --git a/course/format/weeks/lib.php b/course/format/weeks/lib.php
index <HASH>..<HASH> 100644
--- a/course/format/weeks/lib.php
+++ b/course/format/weeks/lib.php
@@ -25,6 +25,7 @@
defined('MOODLE_INTERNAL') || die();
require_once($CFG->dirroot. '/course/format/lib.php');
+require_once($CFG->dirroot. '/course/lib.php');
/**
* Main class for the Weeks course format
@@ -363,10 +364,12 @@ class format_weeks extends format_base {
* @return stdClass property start for startdate, property end for enddate
*/
public function get_section_dates($section, $startdate = false) {
+ global $USER;
if ($startdate === false) {
$course = $this->get_course();
- $startdate = $course->startdate;
+ $userdates = course_get_course_dates_for_user_id($course, $USER->id);
+ $startdate = $userdates['start'];
}
if (is_object($section)) {
|
MDL-<I> course: make course format weeks show relative dates
|
diff --git a/spec/server_spec.rb b/spec/server_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/server_spec.rb
+++ b/spec/server_spec.rb
@@ -72,6 +72,24 @@ module Jimson
'id' => 1
}
end
+
+ it "handles bignums" do
+ req = {
+ 'jsonrpc' => '2.0',
+ 'method' => 'subtract',
+ 'params' => [24, 20],
+ 'id' => 123456789_123456789_123456789
+ }
+ post_json(req)
+
+ last_response.should be_ok
+ resp = MultiJson.decode(last_response.body)
+ resp.should == {
+ 'jsonrpc' => '2.0',
+ 'result' => 4,
+ 'id' => 123456789_123456789_123456789
+ }
+ end
end
end
|
Add a test for bignums handling.
|
diff --git a/lib/Cake/Error/exceptions.php b/lib/Cake/Error/exceptions.php
index <HASH>..<HASH> 100644
--- a/lib/Cake/Error/exceptions.php
+++ b/lib/Cake/Error/exceptions.php
@@ -63,7 +63,7 @@ class CakeBaseException extends RuntimeException {
*
* @package Cake.Error
*/
-if (!class_exists('HttpException')) {
+if (!class_exists('HttpException', false)) {
class HttpException extends CakeBaseException {
}
}
|
Prevent autoload when checking for the existence of HttpException
The class_exists check has been added in <URL>
|
diff --git a/packages/ember-handlebars/tests/helpers/outlet_test.js b/packages/ember-handlebars/tests/helpers/outlet_test.js
index <HASH>..<HASH> 100644
--- a/packages/ember-handlebars/tests/helpers/outlet_test.js
+++ b/packages/ember-handlebars/tests/helpers/outlet_test.js
@@ -40,6 +40,24 @@ test("outlet should allow controllers to fill in slots", function() {
equal(view.$().text(), 'HIBYE');
});
+test("outlet should allow controllers to fill in slots in prerender state", function() {
+ var controller = Ember.Object.create({
+ view: Ember.View.create({
+ template: compile("<p>BYE</p>")
+ })
+ });
+
+ var template = "<h1>HI</h1>{{outlet}}";
+ view = Ember.View.create({
+ controller: controller,
+ template: Ember.Handlebars.compile(template)
+ });
+
+ appendView(view);
+
+ equal(view.$().text(), 'HIBYE');
+});
+
test("outlet should support an optional name", function() {
var controller = Ember.Object.create();
|
add another test for the previous commit but for an outlet setup in the prerender state
|
diff --git a/src/tiledMapLoader.js b/src/tiledMapLoader.js
index <HASH>..<HASH> 100644
--- a/src/tiledMapLoader.js
+++ b/src/tiledMapLoader.js
@@ -4,7 +4,7 @@ var path = require('path'),
module.exports = function() {
return function(resource, next) {
- if (!resource.data || !resource.isXml || !resource.data.children[0].getElementsByTagName('tileset')) {
+ if (!resource.data || resource.type != Resource.TYPE.XML || !resource.data.children[0].getElementsByTagName('tileset')) {
return next();
}
@@ -12,7 +12,8 @@ module.exports = function() {
var loadOptions = {
crossOrigin: resource.crossOrigin,
- loadType: PIXI.loaders.Resource.LOAD_TYPE.IMAGE
+ loadType: PIXI.loaders.Resource.LOAD_TYPE.IMAGE,
+ parentResource: resource
};
var that = this;
|
added parentResource to loadOptions
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ from setuptools import setup,find_packages
setup(
name='synapse',
- version='0.0.8', # sync with synapse.version!
+ version='0.0.9', # sync with synapse.version!
description='Synapse Distributed Computing Framework',
author='Invisigoth Kenshoto',
author_email='invisigoth.kenshoto@gmail.com',
diff --git a/synapse/__init__.py b/synapse/__init__.py
index <HASH>..<HASH> 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -10,7 +10,7 @@ if msgpack.version < (0,4,2):
if tornado.version_info < (3,2):
raise Exception('synapse requires tornado >= 3.2')
-version = (0,0,8)
+version = (0,0,9)
verstring = '.'.join([ str(x) for x in version ])
import synapse.lib.modules as s_modules
|
update versions to <I> in prep for <I> tag
|
diff --git a/widgetsnbextension/src/extension.js b/widgetsnbextension/src/extension.js
index <HASH>..<HASH> 100644
--- a/widgetsnbextension/src/extension.js
+++ b/widgetsnbextension/src/extension.js
@@ -102,9 +102,9 @@ function register_events(Jupyter, events, outputarea) {
*/
function render(output, data, node) {
// data is a model id
- var manager = Jupyter.notebook.kernel.widget_manager;
- if (!manager) {
- node.textContent = "Missing widget manager";
+ var manager = Jupyter.notebook && Jupyter.notebook.kernel && Jupyter.notebook.kernel.widget_manager;
+ if (manager === undefined) {
+ node.textContent = "Error rendering Jupyter widget: missing widget manager";
return;
}
@@ -120,7 +120,7 @@ function register_events(Jupyter, events, outputarea) {
PhosphorWidget.Widget.attach(view.pWidget, node);
});
} else {
- node.textContent = "Widget not found: "+JSON.stringify(data);
+ node.textContent = "Error rendering Jupyter widget. Widget not found: "+JSON.stringify(data);
}
}
|
Add a bit more error checking when rendering widgets in the classic notebook.
Works around #<I>
|
diff --git a/lib/progress.rb b/lib/progress.rb
index <HASH>..<HASH> 100644
--- a/lib/progress.rb
+++ b/lib/progress.rb
@@ -220,13 +220,12 @@ class Progress
message_cl << " - #{note}"
end
- unless lines?
- previous_length = @previous_length || 0
- @previous_length = message_cl.length
- message << "#{' ' * [previous_length - message_cl.length, 0].max}\r"
+ if lines?
+ io.puts(message)
+ else
+ io << message << "\e[K\r"
end
- lines? ? io.puts(message) : io.print(message)
set_title(message_cl)
end
end
|
using control character to clear line to end
|
diff --git a/jbpm-runtime-manager/src/test/java/org/jbpm/runtime/manager/impl/SimpleRuntimeEnvironmentTest.java b/jbpm-runtime-manager/src/test/java/org/jbpm/runtime/manager/impl/SimpleRuntimeEnvironmentTest.java
index <HASH>..<HASH> 100644
--- a/jbpm-runtime-manager/src/test/java/org/jbpm/runtime/manager/impl/SimpleRuntimeEnvironmentTest.java
+++ b/jbpm-runtime-manager/src/test/java/org/jbpm/runtime/manager/impl/SimpleRuntimeEnvironmentTest.java
@@ -80,4 +80,17 @@ public class SimpleRuntimeEnvironmentTest extends SimpleRuntimeEnvironment {
assertEquals( "Incorrect file type", DecisionTableInputType.XLS, ((DecisionTableConfiguration) replacedConfig).getInputType());
assertEquals( "Worksheet name not preserved", worksheetName, ((DecisionTableConfiguration) replacedConfig).getWorksheetName());
}
+
+ @Test
+ public void addAssetXLSDtableWithOwnConfigTest() {
+ Resource resource = ResourceFactory.newClassPathResource("/data/resource.xls", getClass());
+ DecisionTableConfigurationImpl config = new DecisionTableConfigurationImpl();
+ config.setInputType(DecisionTableInputType.XLS);
+ String worksheetName = "test-worksheet-name";
+ config.setWorksheetName(worksheetName);
+ resource.setConfiguration(config);
+
+ addAsset(resource, ResourceType.DTABLE);
+ verify(this.kbuilder).add(any(Resource.class), any(ResourceType.class));
+ }
}
|
[BZ-<I>] add test case with XLS dtable with own config
* forgotten commit that is already on <I>.x
|
diff --git a/openquake/risk/job/general.py b/openquake/risk/job/general.py
index <HASH>..<HASH> 100644
--- a/openquake/risk/job/general.py
+++ b/openquake/risk/job/general.py
@@ -57,7 +57,9 @@ def preload(mixin):
def write_output(mixin):
- """ Write the output of a block to kvs. """
+ """
+ Write the output of a block to db/xml.
+ """
for block_id in mixin.blocks_keys:
#pylint: disable=W0212
mixin._write_output_for_block(mixin.job_id, block_id)
|
risk/job/general.py: more correct docstring in write_output()
Former-commit-id: <I>c6d<I>f<I>be0a<I>fabbeb8efa<I>ef
|
diff --git a/includes/class-freemius.php b/includes/class-freemius.php
index <HASH>..<HASH> 100755
--- a/includes/class-freemius.php
+++ b/includes/class-freemius.php
@@ -8897,7 +8897,7 @@
if ( $this->is_submenu_item_visible( 'support' ) ) {
$this->add_submenu_link_item(
$this->apply_filters( 'support_forum_submenu', $this->get_text( 'support-forum' ) ),
- $this->apply_filters( 'support_forum_url', 'https://wordpress.org/support/plugin/' . $this->_slug ),
+ $this->apply_filters( 'support_forum_url', 'https://wordpress.org/support/' . $this->_module_type . '/' . $this->_slug ),
'wp-support-forum',
null,
50
|
[themes] [bug-fix] Fixed the wp.org support forum URL for themes.
|
diff --git a/elasticsearch-api/api-spec-testing/wipe_cluster.rb b/elasticsearch-api/api-spec-testing/wipe_cluster.rb
index <HASH>..<HASH> 100644
--- a/elasticsearch-api/api-spec-testing/wipe_cluster.rb
+++ b/elasticsearch-api/api-spec-testing/wipe_cluster.rb
@@ -187,7 +187,7 @@ module Elasticsearch
break if repositories.empty?
repositories.each_key do |repository|
- if repositories[repository]['type'] == 'fs'
+ if ['fs', 'source'].include? repositories[repository]['type']
response = client.snapshot.get(repository: repository, snapshot: '_all', ignore_unavailable: true)
response['snapshots'].each do |snapshot|
if snapshot['state'] != 'SUCCESS'
|
[API] Test Runner: adds source type snapshot to delete_snapshots on wipe cluster
|
diff --git a/version.php b/version.php
index <HASH>..<HASH> 100644
--- a/version.php
+++ b/version.php
@@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
-$version = 2010101300; // YYYYMMDD = date of the last version bump
+$version = 2010101400; // YYYYMMDD = date of the last version bump
// XX = daily increments
$release = '2.0 RC1 (Build: 20101014)'; // Human-friendly version name
|
MDL-<I> version bump needed for js cache resetting
|
diff --git a/spyder/widgets/findinfiles.py b/spyder/widgets/findinfiles.py
index <HASH>..<HASH> 100644
--- a/spyder/widgets/findinfiles.py
+++ b/spyder/widgets/findinfiles.py
@@ -263,13 +263,13 @@ class FindOptions(QWidget):
self.more_options.setChecked(more_options)
self.ok_button = create_toolbutton(self, text=_("Search"),
- icon=ima.icon('DialogApplyButton'),
+ icon=ima.icon('find'),
triggered=lambda: self.find.emit(),
tip=_("Start search"),
text_beside_icon=True)
self.ok_button.clicked.connect(self.update_combos)
self.stop_button = create_toolbutton(self, text=_("Stop"),
- icon=ima.icon('stop'),
+ icon=ima.icon('editclear'),
triggered=lambda:
self.stop.emit(),
tip=_("Stop search"),
@@ -504,7 +504,6 @@ class FileMatchItem(QTreeWidgetItem):
QTreeWidgetItem.__init__(self, parent, [title], QTreeWidgetItem.Type)
self.setToolTip(0, filename)
- self.setIcon(0, get_filetype_icon(filename))
def __lt__(self, x):
return self.filename < x.filename
|
Brand new buttons to search and stop functions
|
diff --git a/src/FormComponents/Uploader.js b/src/FormComponents/Uploader.js
index <HASH>..<HASH> 100644
--- a/src/FormComponents/Uploader.js
+++ b/src/FormComponents/Uploader.js
@@ -84,6 +84,7 @@ export default props => {
...files.map(file => {
return {
originFileObj: file,
+ originalFileObj: file,
id: file.id,
lastModified: file.lastModified,
lastModifiedDate: file.lastModifiedDate,
|
adding a field originalFileObj as alternative to originFileObj for clarity
|
diff --git a/src/controllers/admin/AdminAngelController.php b/src/controllers/admin/AdminAngelController.php
index <HASH>..<HASH> 100644
--- a/src/controllers/admin/AdminAngelController.php
+++ b/src/controllers/admin/AdminAngelController.php
@@ -52,7 +52,7 @@ class AdminAngelController extends AngelController {
* @param string $name - The string to sluggify.
* @return string $slug - The sluggified string.
*/
- private function sluggify($name)
+ protected function sluggify($name)
{
$slug = strtolower($name);
$slug = strip_tags($slug);
diff --git a/src/models/Menu.php b/src/models/Menu.php
index <HASH>..<HASH> 100644
--- a/src/models/Menu.php
+++ b/src/models/Menu.php
@@ -52,7 +52,7 @@ class Menu extends Eloquent {
});
}
- private function modelsToFetch($menuItems, $fetchModels = array(), $goDeeper = true)
+ protected function modelsToFetch($menuItems, $fetchModels = array(), $goDeeper = true)
{
foreach ($menuItems as $menuItem) {
if (!isset($fetchModels[$menuItem->fmodel])) {
|
private -> protected (extendable)
|
diff --git a/variable.go b/variable.go
index <HASH>..<HASH> 100644
--- a/variable.go
+++ b/variable.go
@@ -92,6 +92,11 @@ func (vr *variableResolver) resolve(ctx *ExecutionContext) (*Value, error) {
}
if !is_func {
+ // Check whether this is an interface
+ if current.Kind() == reflect.Interface {
+ current = reflect.ValueOf(current.Interface())
+ }
+
// If current a pointer, resolve it
if current.Kind() == reflect.Ptr {
current = current.Elem()
|
interface-support added for Context variables.
|
diff --git a/lib/OpenLayers/Tile/Image/IFrame.js b/lib/OpenLayers/Tile/Image/IFrame.js
index <HASH>..<HASH> 100644
--- a/lib/OpenLayers/Tile/Image/IFrame.js
+++ b/lib/OpenLayers/Tile/Image/IFrame.js
@@ -196,6 +196,19 @@ OpenLayers.Tile.Image.IFrame = {
OpenLayers.Tile.Image.prototype.setImgSrc.apply(this, arguments);
}
},
+
+ /**
+ * Method: onImageLoad
+ * Handler for the image onload event
+ */
+ onImageLoad: function() {
+ //TODO de-uglify opacity handling
+ OpenLayers.Tile.Image.prototype.onImageLoad.apply(this, arguments);
+ if (this.useIFrame === true) {
+ this.imgDiv.style.opacity = 1;
+ this.frame.style.opacity = this.layer.opacity;
+ }
+ },
/**
* Method: createBackBuffer
|
Overriding onImageLoad to set the opacity on the correct element.
|
diff --git a/law/target/remote.py b/law/target/remote.py
index <HASH>..<HASH> 100644
--- a/law/target/remote.py
+++ b/law/target/remote.py
@@ -116,7 +116,7 @@ class GFALInterface(object):
# expand variables in base and bases
self.base = map(os.path.expandvars, self.base)
- self.bases = {k: map(os.path.expandvars, b) for k, b in six.iteritems(bases)}
+ self.bases = {k: map(os.path.expandvars, b) for k, b in six.iteritems(self.bases)}
# prepare gfal options
self.gfal_options = gfal_options or {}
|
Fix bases in GFALInterface.
|
diff --git a/zinnia/settings.py b/zinnia/settings.py
index <HASH>..<HASH> 100644
--- a/zinnia/settings.py
+++ b/zinnia/settings.py
@@ -83,7 +83,7 @@ COMPARISON_FIELDS = getattr(settings, 'ZINNIA_COMPARISON_FIELDS',
'excerpt', 'image_caption'])
SPAM_CHECKER_BACKENDS = getattr(settings, 'ZINNIA_SPAM_CHECKER_BACKENDS',
- ())
+ [])
URL_SHORTENER_BACKEND = getattr(settings, 'ZINNIA_URL_SHORTENER_BACKEND',
'zinnia.url_shortener.backends.default')
|
SPAM_CHECKER_BACKENDS is now a list instead of a tuple for consistency
|
diff --git a/titan-test/src/main/java/com/thinkaurelius/titan/graphdb/TitanOperationCountingTest.java b/titan-test/src/main/java/com/thinkaurelius/titan/graphdb/TitanOperationCountingTest.java
index <HASH>..<HASH> 100644
--- a/titan-test/src/main/java/com/thinkaurelius/titan/graphdb/TitanOperationCountingTest.java
+++ b/titan-test/src/main/java/com/thinkaurelius/titan/graphdb/TitanOperationCountingTest.java
@@ -616,7 +616,7 @@ public abstract class TitanOperationCountingTest extends TitanGraphBaseTest {
System.out.println(round(timecoldglobal) + "\t" + round(timewarmglobal) + "\t" + round(timehotglobal));
assertTrue(timecoldglobal + " vs " + timewarmglobal, timecoldglobal>timewarmglobal*2);
- assertTrue(timewarmglobal + " vs " + timehotglobal, timewarmglobal>timehotglobal);
+ //assertTrue(timewarmglobal + " vs " + timehotglobal, timewarmglobal>timehotglobal); Sometimes, this is not true
}
private double testAllVertices(long vid, int numV) {
|
Removed assertion that is time dependent.
|
diff --git a/ga4gh/datarepo.py b/ga4gh/datarepo.py
index <HASH>..<HASH> 100644
--- a/ga4gh/datarepo.py
+++ b/ga4gh/datarepo.py
@@ -926,7 +926,14 @@ class SqlDataRepository(AbstractDataRepository):
"""
sql = "DELETE FROM ReferenceSet WHERE id=?"
cursor = self._dbConnection.cursor()
- cursor.execute(sql, (referenceSet.getId(),))
+ try:
+ cursor.execute(sql, (referenceSet.getId(),))
+ except sqlite3.IntegrityError:
+ msg = ("Unable to delete reference set. "
+ "There are objects currently in the registry which are "
+ "aligned against it. Remove these objects before removing "
+ "the reference set.")
+ raise exceptions.RepoManagerException(msg)
def _readReadGroupSetTable(self, cursor):
cursor.row_factory = sqlite3.Row
|
Emit error when attempting to delete in use refset
Issue #<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
@@ -2155,7 +2155,7 @@ abstract class ".$this->getClassname()." extends ".$parentClass." ";
}
$script .= "
- if (\$deep) { // also de-associate any related objects?";
+ if (\$deep) { // also de-associate any related objects?\n";
foreach ($table->getForeignKeys() as $fk) {
$varName = $this->getFKVarName($fk);
@@ -2166,10 +2166,10 @@ abstract class ".$this->getClassname()." extends ".$parentClass." ";
foreach ($table->getReferrers() as $refFK) {
if ($refFK->isLocalPrimaryKey()) {
$script .= "
- \$this->".$this->getPKRefFKVarName($refFK)." = null;";
+ \$this->".$this->getPKRefFKVarName($refFK)." = null;\n";
} else {
$script .= "
- \$this->".$this->getRefFKCollVarName($refFK)." = null;";
+ \$this->".$this->getRefFKCollVarName($refFK)." = null;\n";
}
}
|
[<I>][<I>] Line break regressions from whitespace cleanup
|
diff --git a/src/main/resources/META-INF/resources/primefaces/autocomplete/autocomplete.js b/src/main/resources/META-INF/resources/primefaces/autocomplete/autocomplete.js
index <HASH>..<HASH> 100644
--- a/src/main/resources/META-INF/resources/primefaces/autocomplete/autocomplete.js
+++ b/src/main/resources/META-INF/resources/primefaces/autocomplete/autocomplete.js
@@ -569,7 +569,7 @@ PrimeFaces.widget.AutoComplete = PrimeFaces.widget.BaseWidget.extend({
if(this.panel.children().is('ul') && query.length > 0) {
this.items.filter(':not(.ui-autocomplete-moretext)').each(function() {
var item = $(this),
- text = item.html(),
+ text = item.text(),
re = new RegExp(PrimeFaces.escapeRegExp(query), 'gi'),
highlighedText = text.replace(re, '<span class="ui-autocomplete-query">$&</span>');
|
Fix #<I>: Autocomplete fixed & in search results.
|
diff --git a/src/test/java/com/relayrides/pushy/apns/ApnsClientTest.java b/src/test/java/com/relayrides/pushy/apns/ApnsClientTest.java
index <HASH>..<HASH> 100644
--- a/src/test/java/com/relayrides/pushy/apns/ApnsClientTest.java
+++ b/src/test/java/com/relayrides/pushy/apns/ApnsClientTest.java
@@ -68,7 +68,7 @@ public class ApnsClientTest {
private ApnsClient<SimpleApnsPushNotification> client;
@Rule
- public Timeout globalTimeout = new Timeout(10000);
+ public Timeout globalTimeout = new Timeout(30000);
@BeforeClass
public static void setUpBeforeClass() throws Exception {
|
Extended the test timeout to <I> seconds.
`testSendManyNotifications` was right on the edge and would fail intermittently depending on system load.
|
diff --git a/p2p/host/relay/autorelay.go b/p2p/host/relay/autorelay.go
index <HASH>..<HASH> 100644
--- a/p2p/host/relay/autorelay.go
+++ b/p2p/host/relay/autorelay.go
@@ -136,7 +136,9 @@ again:
ar.mx.Unlock()
// this dance is necessary to cover the Private->Public->Private transition
// where we were already connected to enough relays while private and dropped
- // the addrs while public
+ // the addrs while public.
+ // Note tht we don't need the lock for reading addrs, as the only writer is
+ // the current goroutine.
if ar.addrs == nil {
ar.updateAddrs()
}
|
add comment about eliding the lock on addrs read
|
diff --git a/drivers/ris.php b/drivers/ris.php
index <HASH>..<HASH> 100644
--- a/drivers/ris.php
+++ b/drivers/ris.php
@@ -117,7 +117,7 @@ class RefLib_ris {
$ref = array('type' => strtolower($match[1]));
$rawref = array();
- preg_match_all('!^([A-Z]{2}) - (.*)$!m', $match[2], $rawrefextracted, PREG_SET_ORDER);
+ preg_match_all('!^([A-Z0-9]{2}) - (.*)$!m', $match[2], $rawrefextracted, PREG_SET_ORDER);
foreach ($rawrefextracted as $rawrefbit) {
// key/val mappings
if (isset($this->_mapHash[$rawrefbit[1]])) {
|
Corrected extraction regex
The regex didn’t pull tags with numbers (e.g., `T1`, the title).
|
diff --git a/lib/node_modules/@stdlib/repl/presentation/lib/main.js b/lib/node_modules/@stdlib/repl/presentation/lib/main.js
index <HASH>..<HASH> 100644
--- a/lib/node_modules/@stdlib/repl/presentation/lib/main.js
+++ b/lib/node_modules/@stdlib/repl/presentation/lib/main.js
@@ -1120,13 +1120,17 @@ setNonEnumerableReadOnly( Presentation.prototype, 'show', function show() {
* - `\u001b`: ESC, the escape character
* - `[2K`: clear the entire line
* - `[1G`: move the cursor to the beginning of the line
+ * - `[1F`: move the cursor to the beginning of the previous line
*
* [1]: https://en.wikipedia.org/wiki/ANSI_escape_code
*/
+ str = '\u001b[2K\u001b[1G' + str + this._opts.newline;
if ( this._opts.autoClear ) {
this._repl.clear();
+ } else {
+ str += this._opts.newline + this._opts.newline + '\u001b[2A';
}
- this._repl._ostream.write( '\u001b[2K\u001b[1G'+str+this._opts.newline );
+ this._repl._ostream.write( str );
this._repl._displayPrompt( false );
}
return this;
|
Fix presentation alignment when not automatically clearing screen
|
diff --git a/tornado/curl_httpclient.py b/tornado/curl_httpclient.py
index <HASH>..<HASH> 100644
--- a/tornado/curl_httpclient.py
+++ b/tornado/curl_httpclient.py
@@ -268,7 +268,7 @@ class CurlAsyncHTTPClient(AsyncHTTPClient):
info["callback"](HTTPResponse(
request=info["request"], code=code, headers=info["headers"],
buffer=buffer, effective_url=effective_url, error=error,
- reason=info['headers'].get("reason", None),
+ reason=info['headers'].get("x-http-reason", None),
request_time=time.time() - info["curl_start_time"],
time_info=time_info))
except Exception:
@@ -473,9 +473,9 @@ def _curl_header_callback(headers, header_line):
headers.clear()
try:
(__, __, reason) = httputil.parse_response_start_line(header_line)
- header_line = "Reason: %s" % reason
+ header_line = "X-HTTP-Reason: %s" % reason
except AssertionError:
- pass
+ return
if not header_line:
return
headers.parse_line(header_line)
|
Fixes based on code review.
Don't fall through if regex doesn't match.
Use 'X-HTTP-Reason' instead of 'Reason'.
|
diff --git a/java/org.cohorte.herald.core/src/main/java/org/cohorte/herald/core/utils/MessageUtils.java b/java/org.cohorte.herald.core/src/main/java/org/cohorte/herald/core/utils/MessageUtils.java
index <HASH>..<HASH> 100644
--- a/java/org.cohorte.herald.core/src/main/java/org/cohorte/herald/core/utils/MessageUtils.java
+++ b/java/org.cohorte.herald.core/src/main/java/org/cohorte/herald/core/utils/MessageUtils.java
@@ -61,7 +61,8 @@ public class MessageUtils {
return json.toString();
}
- public static MessageReceived fromJSON(String json) throws UnmarshallException {
+ @SuppressWarnings("unchecked")
+ public static MessageReceived fromJSON(String json) throws UnmarshallException {
try {
JSONObject wParsedMsg = new JSONObject(json);
{
|
adding supresswarning annotation for unchecked code
|
diff --git a/src/main/java/org/metacsp/sensing/Sensor.java b/src/main/java/org/metacsp/sensing/Sensor.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/metacsp/sensing/Sensor.java
+++ b/src/main/java/org/metacsp/sensing/Sensor.java
@@ -112,8 +112,14 @@ public class Sensor implements Serializable {
return ret;
}
- public void postSensorValue(String sensorValue, long time) {
+ public int postSensorValue(String sensorValue, long time) {
animator.postSensorValueToDispatch(this, time, sensorValue);
+ return getHashCode(this.getName(), sensorValue, time);
+ }
+
+ public static int getHashCode(String sensorName, String sensorValue, long time) {
+ String ret = sensorName + sensorValue + (""+time);
+ return ret.hashCode();
}
public void registerSensorTrace(String sensorTraceFile) {
|
Added hashcode method for posted sensor values in class Sensor
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@ _doc_requires = [
'sphinx-better-theme'
]
-if sys.version_info[:2] <= (3, 4):
+if sys.version_info[:2] < (3, 4):
# only depend on enum34 and singledispatch if Python is older than 3.4
_requires += ['singledispatch']
_requires += ['enum34']
|
only older not equals
we do not want to depend on these if python is version <I>
we only want to depend on these if python is older than <I>
delete the equals.
|
diff --git a/tests/iDimensionz/SendGridWebApiV3/Api/ApiUnitTestAbstract.php b/tests/iDimensionz/SendGridWebApiV3/Api/ApiUnitTestAbstract.php
index <HASH>..<HASH> 100644
--- a/tests/iDimensionz/SendGridWebApiV3/Api/ApiUnitTestAbstract.php
+++ b/tests/iDimensionz/SendGridWebApiV3/Api/ApiUnitTestAbstract.php
@@ -28,6 +28,9 @@
namespace Tests\iDimensionz\SendGridWebApiV3\Api;
+/**
+ * @codeCoverageIgnore
+ */
class ApiUnitTestAbstract extends \PHPUnit_Framework_TestCase
{
protected $sendGridRequest;
|
Ignore ApiUnitTestAbstract from code coverage analysis
|
diff --git a/hdf5storage/Marshallers.py b/hdf5storage/Marshallers.py
index <HASH>..<HASH> 100644
--- a/hdf5storage/Marshallers.py
+++ b/hdf5storage/Marshallers.py
@@ -529,6 +529,7 @@ class NumpyScalarArrayMarshaller(TypeMarshaller):
np.float16, np.float32, np.float64,
np.complex64, np.complex128,
np.bytes_, np.unicode_, np.object_]
+ self._numpy_types = list(self.types)
# Using Python 3 type strings.
self.python_type_strings = ['numpy.ndarray', 'numpy.matrix',
'numpy.chararray',
@@ -1128,7 +1129,7 @@ class NumpyScalarArrayMarshaller(TypeMarshaller):
# don't all have the exact same dtype and shape, then
# this field will just be an object field.
if v.size == 0 or type(v.flat[0]) \
- not in self.type_to_typestring:
+ not in self._numpy_types:
dt_whole.append((k_name, 'object'))
continue
|
Fixed small bug in NumpyScalarArrayMarshallers where a list that is modified by inheriting classes was used to check if something was a handled numpy type.
|
diff --git a/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php b/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php
index <HASH>..<HASH> 100644
--- a/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php
+++ b/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php
@@ -277,7 +277,7 @@ class DoctrineExtension extends Extension
);
$ormEmDef = new Definition('%doctrine.orm.entity_manager_class%', $ormEmArgs);
$ormEmDef->setFactoryMethod('create');
- $ormEmDef->addTag('doctrine.orm.entity_manager');
+ $ormEmDef->addTag('doctrine.orm.entity_manager');
$container->setDefinition(sprintf('doctrine.orm.%s_entity_manager', $entityManager['name']), $ormEmDef);
if ($entityManager['name'] == $defaultEntityManager) {
|
[DoctrineBundle] Tabs to spaces
|
diff --git a/src/Service/ProducerManager.php b/src/Service/ProducerManager.php
index <HASH>..<HASH> 100644
--- a/src/Service/ProducerManager.php
+++ b/src/Service/ProducerManager.php
@@ -48,7 +48,8 @@ class ProducerManager
Loop::defer(function () use ($producer) {
if ($producer instanceof RepeatProducerInterface) {
yield $this->beanstalk->use($producer->getTube());
- Loop::repeat($producer->getInterval(), function () use ($producer) {
+ Loop::repeat($producer->getInterval(), function ($watcherId) use ($producer) {
+ Loop::disable($watcherId);
$jobs = $producer->produce();
foreach ($jobs as $job) {
try {
@@ -69,6 +70,7 @@ class ProducerManager
$producer->onProduceFail($job, $e);
}
}
+ Loop::enable($watcherId);
});
} else {
throw new \RuntimeException(sprintf('Unknown producer type "%s".', get_class($producer)));
|
Avoid repeat producers to be called before previous is finished
|
diff --git a/packages/ember-template-compiler/lib/system/compile-options.js b/packages/ember-template-compiler/lib/system/compile-options.js
index <HASH>..<HASH> 100644
--- a/packages/ember-template-compiler/lib/system/compile-options.js
+++ b/packages/ember-template-compiler/lib/system/compile-options.js
@@ -10,8 +10,6 @@ export default function compileOptions(_options) {
if (options.moduleName) {
let meta = options.meta;
meta.moduleName = options.moduleName;
-
- delete options.moduleName;
}
if (!options.plugins) {
|
[Bugfix Beta] Don't delete moduleName from options
|
diff --git a/src/MediaCollections/FileAdder.php b/src/MediaCollections/FileAdder.php
index <HASH>..<HASH> 100644
--- a/src/MediaCollections/FileAdder.php
+++ b/src/MediaCollections/FileAdder.php
@@ -123,9 +123,9 @@ class FileAdder
throw UnknownType::create();
}
- public function preservingOriginal(): self
+ public function preservingOriginal(bool $preserveOriginal = true): self
{
- $this->preserveOriginal = true;
+ $this->preserveOriginal = $preserveOriginal;
return $this;
}
|
Update FileAdder.php (#<I>)
With this little one you avoid having to make:
if($preserveOriginal){
return $this
->addMedia($file)
->usingName($name)
->preservingOriginal()
->toMediaCollection($collection_name);
}
else{
return $this
->addMedia($file)
->usingName($name)
->toMediaCollection($collection_name);
}
|
diff --git a/code/MemberProfilePage.php b/code/MemberProfilePage.php
index <HASH>..<HASH> 100644
--- a/code/MemberProfilePage.php
+++ b/code/MemberProfilePage.php
@@ -788,7 +788,7 @@ class MemberProfilePage_Controller extends Page_Controller {
if ($groups) foreach ($groups as $group) {
foreach ($group->Members() as $_member) {
- if ($member->Email) $emails[] = $_member->Email;
+ if ($_member->Email) $emails[] = $_member->Email;
}
}
|
Fix a typo in approval member email
|
diff --git a/tests/Rct567/DomQuery/Tests/DomQueryTest.php b/tests/Rct567/DomQuery/Tests/DomQueryTest.php
index <HASH>..<HASH> 100644
--- a/tests/Rct567/DomQuery/Tests/DomQueryTest.php
+++ b/tests/Rct567/DomQuery/Tests/DomQueryTest.php
@@ -307,6 +307,18 @@ class DomQueryTest extends \PHPUnit\Framework\TestCase
}
/*
+ * Test to array and array as constructor argument
+ */
+ public function testConstructorWithNodesArray()
+ {
+ $nodes_array = DomQuery::create('<div>X</div><p>Nope</p>')->toArray();
+ $this->assertContainsOnlyInstancesOf(\DOMNode::class, $nodes_array);
+ $this->assertCount(2, $nodes_array);
+ $dom = new DomQuery($nodes_array);
+ $this->assertEquals('<div>X</div><p>Nope</p>', (string) $dom);
+ }
+
+ /*
* Test constructor exception
*/
public function testConstructorException()
|
add test for to and from array of nodes
|
diff --git a/dvc/command/data_sync.py b/dvc/command/data_sync.py
index <HASH>..<HASH> 100644
--- a/dvc/command/data_sync.py
+++ b/dvc/command/data_sync.py
@@ -52,9 +52,6 @@ class CmdDataStatus(CmdBase):
with DvcLock(self.is_locker, self.git):
status = self.cloud.status(self.parsed_args.targets, self.parsed_args.jobs)
- if len(list(status)) != len(self.parsed_args.targets):
- return 1
-
self._show(status)
return 0
|
status: don't return 1 if len(statuses) != len(targets)
Number of targets from command line doesn't have to match
number of actual files that we've processed, as it may as
well be a directory.
Fixes #<I>
|
diff --git a/bin/browsertimeWebPageReplay.js b/bin/browsertimeWebPageReplay.js
index <HASH>..<HASH> 100755
--- a/bin/browsertimeWebPageReplay.js
+++ b/bin/browsertimeWebPageReplay.js
@@ -76,7 +76,7 @@ async function runBrowsertime() {
const btOptions = merge({}, parsed.argv.browsertime, defaultConfig);
browsertime.logging.configure(parsed.argv);
- if (btOptions.mobile) {
+ if (parsed.argv.mobile) {
btOptions.viewPort = '360x640';
if (btOptions.browser === 'chrome') {
const emulation = get(
|
Using WebPagReplay and --mobile didn't set mobile settings correctly (#<I>)
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -36,6 +36,14 @@ function makeOnDragOver (elem, ondragover) {
return function (e) {
e.stopPropagation()
e.preventDefault()
+ if (e.dataTransfer.items) {
+ // Only add "drag" class when `items` contains a file
+ var items = toArray(e.dataTransfer.items).filter(function (item) {
+ return item.kind === 'file'
+ })
+ if (items.length === 0) return
+ }
+
if (elem instanceof window.Element) elem.classList.add('drag')
e.dataTransfer.dropEffect = 'copy'
if (ondragover) ondragover(e)
|
dragover: Only add "drag" class when `items` contains a file
|
diff --git a/lib/commander/runner.rb b/lib/commander/runner.rb
index <HASH>..<HASH> 100644
--- a/lib/commander/runner.rb
+++ b/lib/commander/runner.rb
@@ -328,7 +328,6 @@ module Commander
# again for the command.
def remove_global_options(options, args)
- # TODO: refactor with flipflop, please TJ ! have time to refactor me !
options.each do |option|
switches = option[:switches].dup
next if switches.empty?
@@ -341,6 +340,7 @@ module Commander
past_switch, arg_removed = false, false
args.delete_if do |arg|
+ break if arg == '--'
if switches.any? { |s| s[0, arg.length] == arg }
arg_removed = !switch_has_arg
past_switch = true
diff --git a/spec/runner_spec.rb b/spec/runner_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/runner_spec.rb
+++ b/spec/runner_spec.rb
@@ -643,4 +643,18 @@ describe Commander do
end.run!
end
end
+
+ describe 'with double dash' do
+ it 'should interpret the remainder as arguments' do
+ new_command_runner 'foo', '--', '-x' do
+ command('foo') do |c|
+ c.option '-x', 'Switch'
+ c.when_called do |args, options|
+ expect(args).to eq(%w(-x))
+ expect(options.x).to be_nil
+ end
+ end
+ end.run!
+ end
+ end
end
|
Fix global option code to preserve double dash
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -60,9 +60,9 @@ setup(
classifiers=[
'Development Status :: 4 - Beta',
'Programming Language :: Python :: 3',
- 'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
+ 'Programming Language :: Python :: 3.8',
'Natural Language :: English'
],
keywords='tkinter gui widgets'
|
Updating setup.py with python version.
|
diff --git a/lib/aruba/api.rb b/lib/aruba/api.rb
index <HASH>..<HASH> 100644
--- a/lib/aruba/api.rb
+++ b/lib/aruba/api.rb
@@ -298,7 +298,7 @@ module Aruba
end
end
- DEFAULT_TIMEOUT_SECONDS = 5
+ DEFAULT_TIMEOUT_SECONDS = 8
def exit_timeout
@aruba_timeout_seconds || DEFAULT_TIMEOUT_SECONDS
|
jruby is really slower than I expected, so increasing to 8 seconds
|
diff --git a/stdeb/util.py b/stdeb/util.py
index <HASH>..<HASH> 100644
--- a/stdeb/util.py
+++ b/stdeb/util.py
@@ -550,7 +550,9 @@ class DebianInfo:
build_deps.extend( [
'python-all-dev',
'debhelper (>= 7)',
- 'python-support (>= 0.5.3)',
+ 'python-support (>= 1.0.3)', # Namespace package support was added
+ # sometime between 0.7.5ubuntu1 and
+ # 1.0.3ubuntu1.
] )
build_deps.extend( parse_vals(cfg,module_name,'Build-Depends') )
|
increase version of python-support required to handle namespace packages
|
diff --git a/lib/fog/core/scp.rb b/lib/fog/core/scp.rb
index <HASH>..<HASH> 100644
--- a/lib/fog/core/scp.rb
+++ b/lib/fog/core/scp.rb
@@ -66,11 +66,11 @@ module Fog
@options = { :paranoid => false }.merge(options)
end
- def upload(local_path, remote_path, upload_options = {})
+ def upload(local_path, remote_path, upload_options = {}, &block)
begin
Net::SCP.start(@address, @username, @options) do |scp|
scp.upload!(local_path, remote_path, upload_options) do |ch, name, sent, total|
- # TODO: handle progress display?
+ block.call(ch, name, sent, total) if block
end
end
rescue Exception => error
@@ -82,7 +82,7 @@ module Fog
begin
Net::SCP.start(@address, @username, @options) do |scp|
scp.download!(remote_path, local_path, download_options) do |ch, name, sent, total|
- # TODO: handle progress display?
+ block.call(ch, name, sent, total) if block
end
end
rescue Exception => error
|
Use passed blocks to handle scp callbacks.
|
diff --git a/lib/id3tag/frames/v2/frame_fabricator.rb b/lib/id3tag/frames/v2/frame_fabricator.rb
index <HASH>..<HASH> 100644
--- a/lib/id3tag/frames/v2/frame_fabricator.rb
+++ b/lib/id3tag/frames/v2/frame_fabricator.rb
@@ -20,7 +20,7 @@ module ID3Tag
case @id
when /^(TCON|TCO)$/
GenreFrame
- when /^TXX$/
+ when /^TXX/
UserTextFrame
when /^T/
TextFrame
|
Bugfix: <I> user text frames are properly recognised
|
diff --git a/src/org/opencms/cmis/CmsCmisResourceHelper.java b/src/org/opencms/cmis/CmsCmisResourceHelper.java
index <HASH>..<HASH> 100644
--- a/src/org/opencms/cmis/CmsCmisResourceHelper.java
+++ b/src/org/opencms/cmis/CmsCmisResourceHelper.java
@@ -472,6 +472,9 @@ public class CmsCmisResourceHelper implements I_CmsCmisObjectHelper {
objectInfo.setId(id);
String name = resource.getName();
+ if ("".equals(name)) {
+ name = "/";
+ }
addPropertyString(tm, result, typeId, filter, PropertyIds.NAME, name);
objectInfo.setName(name);
|
Changed name for root folder in CMIS repository code.
|
diff --git a/src/Pazuzu156/Gravatar/Laravel/GravatarServiceProvider.php b/src/Pazuzu156/Gravatar/Laravel/GravatarServiceProvider.php
index <HASH>..<HASH> 100644
--- a/src/Pazuzu156/Gravatar/Laravel/GravatarServiceProvider.php
+++ b/src/Pazuzu156/Gravatar/Laravel/GravatarServiceProvider.php
@@ -25,7 +25,7 @@ class GravatarServiceProvider extends ServiceProvider
*/
public function register()
{
- $this->app->singleton('gravatar', function($app) {
+ $this->app->singleton('gravatar', function ($app) {
return new Gravatar(
config('gravatar.defaults.size'),
config('gravatar.secure')
|
Updated to support Laravel <I>
|
diff --git a/salt/modules/aptpkg.py b/salt/modules/aptpkg.py
index <HASH>..<HASH> 100644
--- a/salt/modules/aptpkg.py
+++ b/salt/modules/aptpkg.py
@@ -1802,6 +1802,10 @@ def mod_repo(repo, saltenv='base', **kwargs):
elif 'key_url' in kwargs:
key_url = kwargs['key_url']
fn_ = __salt__['cp.cache_file'](key_url, saltenv)
+ if not fn_:
+ raise CommandExecutionError(
+ 'Error: file not found: {0}'.format(key_url)
+ )
cmd = 'apt-key add {0}'.format(_cmd_quote(fn_))
out = __salt__['cmd.run_stdout'](cmd, **kwargs)
if not out.upper().startswith('OK'):
|
aptpkg.mod_repo: Raise when key_url doesn't exist
_cmd_quote would raise with unexplicit error if _fn = False
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -35,9 +35,9 @@ CLASSIFIERS = [
'Programming Language :: Python :: 2.7'
]
-SUMMARY = "Digital Ocean API v2 with SSH integration"
+DESCRIPTION = "Digital Ocean API v2 with SSH integration"
-DESCRIPTION = """
+LONG_DESCRIPTION = """
********************************
poseidon: tame the digital ocean
********************************
@@ -95,6 +95,7 @@ Deploy a new Flask app from github
ssh.pip_r('requirements.txt')
ssh.nohup('python app.py') # DNS takes a while to propagate
print ssh.ps()
+
"""
setup(
@@ -107,6 +108,7 @@ setup(
keywords=['digitalocean', 'digital ocean', 'digital', 'ocean', 'api', 'v2',
'web programming', 'cloud', 'digitalocean api v2'],
description=DESCRIPTION,
+ long_description=LONG_DESCRIPTION,
classifiers=CLASSIFIERS,
download_url=DOWNLOAD_URL,
package_data={'': ['requirements.txt']},
|
CLN: fix long description and description in setup
|
diff --git a/lib/instana/backend/host_agent_activation_observer.rb b/lib/instana/backend/host_agent_activation_observer.rb
index <HASH>..<HASH> 100644
--- a/lib/instana/backend/host_agent_activation_observer.rb
+++ b/lib/instana/backend/host_agent_activation_observer.rb
@@ -12,7 +12,7 @@ module Instana
# @param [RequestClient] client used to make requests to the backend
# @param [Concurrent::Atom] discovery object used to store discovery response in
- def initialize(client, discovery, wait_time: 1, logger: ::Instana.logger, max_wait_tries: 60, proc_table: Sys::ProcTable, socket_proc: default_socket_proc) # rubocop:disable Metrics/ParameterLists
+ def initialize(client, discovery, wait_time: 30, logger: ::Instana.logger, max_wait_tries: 60, proc_table: Sys::ProcTable, socket_proc: default_socket_proc) # rubocop:disable Metrics/ParameterLists
@client = client
@discovery = discovery
@wait_time = wait_time
|
Wait <I> seconds between announce attempts
|
diff --git a/lib/pbxProject.js b/lib/pbxProject.js
index <HASH>..<HASH> 100644
--- a/lib/pbxProject.js
+++ b/lib/pbxProject.js
@@ -1447,6 +1447,7 @@ function pbxCopyFilesBuildPhaseObj(obj, folderType, subfolderPath, phaseName){
command_line_tool: 'wrapper',
dynamic_library: 'products_directory',
framework: 'shared_frameworks',
+ frameworks: 'frameworks',
static_library: 'products_directory',
unit_test_bundle: 'wrapper',
watch_app: 'wrapper',
|
pbxProject: pbxCopyFilesBuildPhaseObj missing 'frameworks'
Previously there was no way to access SUBFOLDERSPEC_BY_DESTINATION.frameworks
|
diff --git a/app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb b/app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb
index <HASH>..<HASH> 100644
--- a/app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb
+++ b/app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb
@@ -12,6 +12,11 @@ module Katello
before_action :validate_content_action, :only => [:install_content, :update_content, :remove_content]
+ resource_description do
+ api_version 'v2'
+ api_base_url "/api"
+ end
+
PARAM_ACTIONS = {
:install_content => {
:package => :install_packages,
|
Fixes #<I> - Remove katello api base url for... (#<I>)
for host bulk actions
|
diff --git a/go/vt/vttablet/tabletserver/state_manager_test.go b/go/vt/vttablet/tabletserver/state_manager_test.go
index <HASH>..<HASH> 100644
--- a/go/vt/vttablet/tabletserver/state_manager_test.go
+++ b/go/vt/vttablet/tabletserver/state_manager_test.go
@@ -270,6 +270,16 @@ func TestStateManagerTransitionFailRetry(t *testing.T) {
require.Error(t, err)
assert.True(t, stateChanged)
+ // Calling retryTransition while retrying should be a no-op.
+ sm.retryTransition("")
+
+ // Steal the lock and wait long enough for the retry
+ // to fail, and then release it. The retry will have
+ // to keep retrying.
+ sm.transitioning.Acquire()
+ time.Sleep(30 * time.Millisecond)
+ sm.transitioning.Release()
+
for {
sm.mu.Lock()
retrying := sm.retrying
@@ -310,6 +320,9 @@ func TestStateManagerCheckMySQL(t *testing.T) {
order.Set(0)
sm.CheckMySQL()
+ // Rechecking immediately should be a no-op:
+ sm.CheckMySQL()
+
// Wait for closeAll to get under way.
for {
if order.Get() >= 1 {
|
vttablet: address review comments
|
diff --git a/raiden/network/transport/matrix/utils.py b/raiden/network/transport/matrix/utils.py
index <HASH>..<HASH> 100644
--- a/raiden/network/transport/matrix/utils.py
+++ b/raiden/network/transport/matrix/utils.py
@@ -122,11 +122,11 @@ class UserAddressManager:
self._reset_state()
@property
- def known_addresses(self) -> List[Address]:
+ def known_addresses(self) -> Set[Address]:
""" Return all addresses we keep track of """
# This must return a copy of the current keys, because the container
# may be modified while these values are used. Issue: #5240
- return list(self._address_to_userids)
+ return set(self._address_to_userids)
def is_address_known(self, address: Address) -> bool:
""" Is the given ``address`` reachability being monitored? """
|
PR review
`set` is a better type than `list` for the dictionary keys since these
are unique.
|
diff --git a/src/java/org/apache/cassandra/tools/NodeCmd.java b/src/java/org/apache/cassandra/tools/NodeCmd.java
index <HASH>..<HASH> 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -209,11 +209,15 @@ public class NodeCmd
*/
public void printInfo(PrintStream outs)
{
+ boolean gossipInitialized = probe.isInitialized();
outs.println(probe.getToken());
- outs.printf("%-17s: %s%n", "Gossip active", probe.isInitialized());
+ outs.printf("%-17s: %s%n", "Gossip active", gossipInitialized);
outs.printf("%-17s: %s%n", "Load", probe.getLoadString());
- outs.printf("%-17s: %s%n", "Generation No", probe.getCurrentGenerationNumber());
-
+ if (gossipInitialized)
+ outs.printf("%-17s: %s%n", "Generation No", probe.getCurrentGenerationNumber());
+ else
+ outs.printf("%-17s: %s%n", "Generation No", 0);
+
// Uptime
long secondsUp = probe.getUptime() / 1000;
outs.printf("%-17s: %d%n", "Uptime (seconds)", secondsUp);
|
Fix NPE in nodetool when gossip isn't initialized.
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-<I>
git-svn-id: <URL>
|
diff --git a/lib/rib/core/strip_backtrace.rb b/lib/rib/core/strip_backtrace.rb
index <HASH>..<HASH> 100644
--- a/lib/rib/core/strip_backtrace.rb
+++ b/lib/rib/core/strip_backtrace.rb
@@ -18,10 +18,9 @@ module Rib::StripBacktrace
["#{err.class}: #{err.message}", format_backtrace(err.backtrace)]
end
-
-
module_function
def format_backtrace backtrace
+ return super if StripBacktrace.disabled?
strip_home_backtrace(
strip_cwd_backtrace(
strip_rib_backtrace(super(backtrace))))
|
don't strip backstrace if disabled
|
diff --git a/app/src/Middleware/PageConfig.php b/app/src/Middleware/PageConfig.php
index <HASH>..<HASH> 100644
--- a/app/src/Middleware/PageConfig.php
+++ b/app/src/Middleware/PageConfig.php
@@ -11,13 +11,16 @@ class PageConfig extends Middleware
{
$pageName = $request->getAttribute('route')->getName();
- $pageConfig = ConfigGroups::where('page_name', '=', $pageName)->with('config')->first();
+ $pageConfig = ConfigGroups::where('page_name', '=', $pageName)->with('config')->get();
if ($pageConfig) {
$cfg = array();
- foreach ($pageConfig->config as $value) {
- $cfg[$value->name] = $value->value;
+ foreach ($pageConfig as $pc) {
+ foreach ($pc->config as $value) {
+ $cfg[$value->name] = $value->value;
+ }
}
+
$this->view->getEnvironment()->addGlobal('page_config', $cfg);
return $next($request, $response);
}
|
fixed page configs to support multiple groups
|
diff --git a/analytics-core/src/main/java/com/segment/analytics/IntegrationManager.java b/analytics-core/src/main/java/com/segment/analytics/IntegrationManager.java
index <HASH>..<HASH> 100644
--- a/analytics-core/src/main/java/com/segment/analytics/IntegrationManager.java
+++ b/analytics-core/src/main/java/com/segment/analytics/IntegrationManager.java
@@ -372,6 +372,9 @@ class IntegrationManager implements Application.ActivityLifecycleCallbacks {
/** Runs the given operation on all bundled integrations. */
void run(IntegrationOperation operation) {
+ if (logLevel.log()) {
+ debug("Running %s on %s integrations.", operation, integrations.size());
+ }
for (int i = 0; i < integrations.size(); i++) {
AbstractIntegration integration = integrations.get(i);
long startTime = System.nanoTime();
|
Log how many integrations an operation is run on
|
diff --git a/openfisca_survey_manager/surveys.py b/openfisca_survey_manager/surveys.py
index <HASH>..<HASH> 100644
--- a/openfisca_survey_manager/surveys.py
+++ b/openfisca_survey_manager/surveys.py
@@ -37,8 +37,11 @@ from ConfigParser import SafeConfigParser
import logging
from pandas import HDFStore
from pandas.lib import infer_dtype
-import pandas.rpy.common as com
-import rpy2.rpy_classic as rpy
+try:
+ import pandas.rpy.common as com
+ import rpy2.rpy_classic as rpy
+except:
+ pass
import yaml
|
Introduce a try for rpy2
|
diff --git a/lib/bumper_pusher/version.rb b/lib/bumper_pusher/version.rb
index <HASH>..<HASH> 100644
--- a/lib/bumper_pusher/version.rb
+++ b/lib/bumper_pusher/version.rb
@@ -1,3 +1,3 @@
module BumperPusher
- VERSION = "0.1.19"
+ VERSION = "0.2.0"
end
|
Update gemspec to version <I>
|
diff --git a/tests/system/Files/FileTest.php b/tests/system/Files/FileTest.php
index <HASH>..<HASH> 100644
--- a/tests/system/Files/FileTest.php
+++ b/tests/system/Files/FileTest.php
@@ -32,7 +32,7 @@ class FileTest extends \CIUnitTestCase {
*/
public function testThrowsExceptionIfNotAFile()
{
- $file = new File(BASEPATH.'Commoner.php');
+ $file = new File(BASEPATH.'Commoner.php',true);
}
}
|
Fixed the file test with exception file not found. (allowing it to verify if the file exist)
|
diff --git a/admin/blocks.php b/admin/blocks.php
index <HASH>..<HASH> 100644
--- a/admin/blocks.php
+++ b/admin/blocks.php
@@ -63,9 +63,6 @@
print_error('blockdoesnotexist', 'error');
}
- if (!block_is_compatible($block->name)) {
- $strblockname = $block->name;
- }
else {
$blockobject = block_instance($block->name);
$strblockname = $blockobject->get_title();
@@ -128,11 +125,6 @@
$incompatible = array();
foreach ($blocks as $block) {
- if (!block_is_compatible($block->name)) {
- notify('Block '. $block->name .' is not compatible with the current version of Moodle and needs to be updated by a programmer.');
- $incompatible[] = $block;
- continue;
- }
if (($blockobject = block_instance($block->name)) === false) {
// Failed to load
continue;
|
upgrade refactoring: MDL-<I> remove references to block_is_compatible, since Petr deleted that function.
|
diff --git a/docs-site/src/components/Example/index.js b/docs-site/src/components/Example/index.js
index <HASH>..<HASH> 100644
--- a/docs-site/src/components/Example/index.js
+++ b/docs-site/src/components/Example/index.js
@@ -37,6 +37,7 @@ export default class CodeExampleComponent extends React.Component {
<LiveProvider
code={component.trim()}
scope={{
+ // NB any globals added here should also be referenced in ../../examples/.eslintrc
PropTypes,
useState,
DatePicker,
|
Leave a waymarker for the next intrepid coder
|
diff --git a/src/Artisaninweb/SoapWrapper/SoapWrapper.php b/src/Artisaninweb/SoapWrapper/SoapWrapper.php
index <HASH>..<HASH> 100644
--- a/src/Artisaninweb/SoapWrapper/SoapWrapper.php
+++ b/src/Artisaninweb/SoapWrapper/SoapWrapper.php
@@ -108,6 +108,8 @@ class SoapWrapper
if (is_null($service->getClient())) {
$client = new Client($service->getWsdl(), $service->getOptions());
+
+ $service->client($client);
} else {
$client = $service->getClient();
}
|
Fixed issue #<I> properly
Fixed issue #<I> properly
|
diff --git a/src/Test/MockDatasource.php b/src/Test/MockDatasource.php
index <HASH>..<HASH> 100644
--- a/src/Test/MockDatasource.php
+++ b/src/Test/MockDatasource.php
@@ -68,7 +68,15 @@ class MockDatasource implements \CFX\JsonApi\DatasourceInterface
public function convert(\CFX\JsonApi\ResourceInterface $src, $convertTo)
{
$this->callStack[] = "convert([resource], '$convertTo')";
- return $src;
+ if (!($classname = array_shift($this->creationStack))) {
+ throw new \RuntimeException(
+ "Since this is a mock datasource and not a real one, you need to actually add the class to create to ".
+ "the creation stack using the `addClassToCreate` method. This class should be the class you want to convert ".
+ "the resource to."
+ );
+ }
+ $converted = $classname::fromResource($src, $this);
+ return $converted;
}
public function save(\CFX\JsonApi\ResourceInterface $r)
|
Added improved testing facilities to MockDatasource
|
diff --git a/asammdf/blocks/mdf_v4.py b/asammdf/blocks/mdf_v4.py
index <HASH>..<HASH> 100644
--- a/asammdf/blocks/mdf_v4.py
+++ b/asammdf/blocks/mdf_v4.py
@@ -883,13 +883,14 @@ class MDF4(object):
attachment, at_name = self.extract_attachment(
index=attachment_addr
)
- if (
- not at_name.name.lower().endswith(("dbc", "arxml"))
- or not attachment
- ):
+ if not at_name.name.lower().endswith(("dbc", "arxml")):
message = f'Expected .dbc or .arxml file as CAN channel attachment but got "{at_name}"'
logger.warning(message)
grp.CAN_database = False
+ elif not attachment:
+ message = f'Attachment "{at_name}" not found'
+ logger.warning(message)
+ grp.CAN_database = False
else:
import_type = (
"dbc"
|
show better error message if the external attachment is not found
|
diff --git a/tests/ParserTest.php b/tests/ParserTest.php
index <HASH>..<HASH> 100755
--- a/tests/ParserTest.php
+++ b/tests/ParserTest.php
@@ -1165,6 +1165,22 @@ class ParserTest extends \PHPUnit_Framework_TestCase
),
),
+ // Test nicks with ~
+ array(
+ ":Angel~ PRIVMSG Wiz~ :Hello are you receiving this message ?\r\n",
+ array(
+ 'prefix' => ':Angel~',
+ 'nick' => 'Angel~',
+ 'command' => 'PRIVMSG',
+ 'params' => array(
+ 'receivers' => 'Wiz~',
+ 'text' => 'Hello are you receiving this message ?',
+ 'all' => 'Wiz~ :Hello are you receiving this message ?',
+ ),
+ 'targets' => array('Wiz~'),
+ ),
+ ),
+
array(
"PRIVMSG Angel :yes I'm receiving it !receiving it !'u>(768u+1n) .br\r\n",
array(
|
Adding test to check nicks with ~ on PRIVMSG
|
diff --git a/stomp/transport.py b/stomp/transport.py
index <HASH>..<HASH> 100644
--- a/stomp/transport.py
+++ b/stomp/transport.py
@@ -242,9 +242,10 @@ class BaseTransport(stomp.listener.Publisher):
for listener in self.listeners.values():
if not listener:
continue
- if not hasattr(listener, 'on_send'):
+ try:
+ listener.on_send(frame)
+ except AttributeError:
continue
- listener.on_send(frame)
lines = utils.convert_frame_to_lines(frame)
|
Just invoke listener.on_send, don't bother checking existence
|
diff --git a/src/LdapClient.php b/src/LdapClient.php
index <HASH>..<HASH> 100644
--- a/src/LdapClient.php
+++ b/src/LdapClient.php
@@ -192,7 +192,7 @@ class LdapClient
*
* @since 1.0
*/
- public function setDN($username, $nosub = 0)
+ public function setDn($username, $nosub = 0)
{
if ($this->users_dn == '' || $nosub)
{
@@ -215,7 +215,7 @@ class LdapClient
*
* @since 1.0
*/
- public function getDN()
+ public function getDn()
{
return $this->dn;
}
@@ -257,8 +257,8 @@ class LdapClient
$password = $this->password;
}
- $this->setDN($username, $nosub);
- $bindResult = @ldap_bind($this->resource, $this->getDN(), $password);
+ $this->setDn($username, $nosub);
+ $bindResult = @ldap_bind($this->resource, $this->getDn(), $password);
return $bindResult;
}
@@ -570,7 +570,7 @@ class LdapClient
* @author Jay Burrell, Systems & Networks, Mississippi State University
* @since 1.0
*/
- public static function LDAPNetAddr($networkaddress)
+ public static function LdapNetAddr($networkaddress)
{
$addr = "";
$addrtype = (int) substr($networkaddress, 0, 1);
|
[codestyle] Fixed first letter casing in method names
|
diff --git a/mod/forum/post.php b/mod/forum/post.php
index <HASH>..<HASH> 100644
--- a/mod/forum/post.php
+++ b/mod/forum/post.php
@@ -339,11 +339,13 @@
}
- echo "<center>";
if (!empty($parent)) {
forum_print_post($parent, $course->id, $ownpost=false, $reply=false, $link=false);
+ forum_print_posts_threaded($parent->id, $course, 0, false, false);
+ echo "<center>";
echo "<H2>".get_string("yourreply", "forum").":</H2>";
} else {
+ echo "<center>";
echo "<H2>".get_string("yournewtopic", "forum")."</H2>";
}
if (!empty($post->error)) {
|
This has been annoying me for ages, and the fix is so simple.
When replying to a post that already has replies - the replies
are listed in threaded form.
|
diff --git a/lib/stax/cfer.rb b/lib/stax/cfer.rb
index <HASH>..<HASH> 100644
--- a/lib/stax/cfer.rb
+++ b/lib/stax/cfer.rb
@@ -10,9 +10,8 @@ module Stax
{}
end
- ## location of cfer template file
- def cfer_template
- File.join('cf', "#{class_name}.rb")
+ def cfn_parameters
+ cfer_parameters
end
## override with S3 bucket for upload of large templates as needed
@@ -43,10 +42,15 @@ module Stax
# Cfer.converge!(stack_name, opts.merge(args))
# end
+ ## location of template file
+ def cfn_template_path
+ File.join('cf', "#{class_name}.rb")
+ end
+
## generate JSON for stack without sending to cloudformation
def cfer_generate
- opts = {parameters: stringify_keys(cfer_parameters)}
- Cfer.generate!(cfer_template, opts)
+ opts = {parameters: stringify_keys(cfn_parameters)}
+ Cfer.generate!(cfn_template_path, opts)
end
## generate method does puts, so steal stdout into a string
|
start renaming template methods in a more generic fashion
|
diff --git a/extension/data/lib/data.js b/extension/data/lib/data.js
index <HASH>..<HASH> 100644
--- a/extension/data/lib/data.js
+++ b/extension/data/lib/data.js
@@ -43,7 +43,7 @@ var Data = function (reporter, definition) {
});
});
- reporter.beforeRenderListeners.insert(0, definition.name, this, Data.prototype.handleBeforeRender);
+ reporter.beforeRenderListeners.insert({ after: "templates"}, definition.name, this, Data.prototype.handleBeforeRender);
};
Data.prototype.handleBeforeRender = function (request, response) {
|
scripts can call reporter.render
|
diff --git a/aeron-driver/src/main/java/io/aeron/driver/IpcPublication.java b/aeron-driver/src/main/java/io/aeron/driver/IpcPublication.java
index <HASH>..<HASH> 100644
--- a/aeron-driver/src/main/java/io/aeron/driver/IpcPublication.java
+++ b/aeron-driver/src/main/java/io/aeron/driver/IpcPublication.java
@@ -320,6 +320,7 @@ public final class IpcPublication implements DriverManagedResource, Subscribable
{
tripLimit = consumerPosition;
publisherLimit.setOrdered(consumerPosition);
+ cleanBufferTo(consumerPosition);
}
return workCount;
diff --git a/aeron-driver/src/main/java/io/aeron/driver/NetworkPublication.java b/aeron-driver/src/main/java/io/aeron/driver/NetworkPublication.java
index <HASH>..<HASH> 100644
--- a/aeron-driver/src/main/java/io/aeron/driver/NetworkPublication.java
+++ b/aeron-driver/src/main/java/io/aeron/driver/NetworkPublication.java
@@ -525,6 +525,7 @@ public class NetworkPublication
else if (publisherLimit.get() > senderPosition)
{
publisherLimit.setOrdered(senderPosition);
+ cleanBufferTo(senderPosition - termBufferLength);
workCount = 1;
}
|
[Java] Ensure cleaning is up to date when consumers drop out and back in again on publications.
|
diff --git a/src/DataStore/src/Middleware/Handler/DownloadCsvHandler.php b/src/DataStore/src/Middleware/Handler/DownloadCsvHandler.php
index <HASH>..<HASH> 100644
--- a/src/DataStore/src/Middleware/Handler/DownloadCsvHandler.php
+++ b/src/DataStore/src/Middleware/Handler/DownloadCsvHandler.php
@@ -21,7 +21,7 @@ class DownloadCsvHandler extends AbstractHandler
const DELIMITER = ',';
const ENCLOSURE = '"';
const ESCAPE_CHAR = '\\';
- const LIMIT = 5000;
+ const LIMIT = 8000;
/**
* @inheritDoc
@@ -54,7 +54,7 @@ class DownloadCsvHandler extends AbstractHandler
$rqlQuery = $request->getAttribute('rqlQueryObject');
// create csv file
- $file = fopen('php://memory', 'w');
+ $file = fopen('php://temp', 'w');
$offset = 0;
|
Update DownloadCsvHandler for export large files
|
diff --git a/aws/resource_aws_emr_cluster.go b/aws/resource_aws_emr_cluster.go
index <HASH>..<HASH> 100644
--- a/aws/resource_aws_emr_cluster.go
+++ b/aws/resource_aws_emr_cluster.go
@@ -496,7 +496,11 @@ func resourceAwsEMRClusterRead(d *schema.ResourceData, meta interface{}) error {
}
d.Set("name", cluster.Name)
- d.Set("scale_down_behavior", cluster.ScaleDownBehavior)
+
+ if d.Get("scale_down_behavior").(string) != "" {
+ d.Set("scale_down_behavior", cluster.ScaleDownBehavior)
+ }
+
d.Set("service_role", cluster.ServiceRole)
d.Set("security_configuration", cluster.SecurityConfiguration)
d.Set("autoscaling_role", cluster.AutoScalingRole)
|
If user has not defined scale_down_behavior, use current value. This means the AWS default for the release_label will be used, unless the user wants to override this
|
diff --git a/py/selenium/webdriver/safari/options.py b/py/selenium/webdriver/safari/options.py
index <HASH>..<HASH> 100644
--- a/py/selenium/webdriver/safari/options.py
+++ b/py/selenium/webdriver/safari/options.py
@@ -14,11 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-from typing import Union
-import warnings
-from selenium.common.exceptions import InvalidArgumentException
from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
-from selenium.webdriver.common.proxy import Proxy
from selenium.webdriver.common.options import ArgOptions
@@ -33,24 +29,23 @@ class Log(object):
class Options(ArgOptions):
- KEY = "webkit:safariOptions"
+ KEY = "safari.options"
def __init__(self):
super(Options, self).__init__()
self._binary_location = None
self._preferences: dict = {}
- self._proxy = None
self.log = Log()
@property
- def binary_location(self):
+ def binary_location(self) -> str:
"""
:Returns: The location of the browser binary otherwise an empty string
"""
return self._binary_location
@binary_location.setter
- def binary_location(self, value):
+ def binary_location(self, value: str):
"""
Allows you to set the browser binary to launch
|
[py] Fix flake8 issues in safari options
|
diff --git a/lib/api-client/resources/deployment.js b/lib/api-client/resources/deployment.js
index <HASH>..<HASH> 100644
--- a/lib/api-client/resources/deployment.js
+++ b/lib/api-client/resources/deployment.js
@@ -153,4 +153,23 @@ Deployment.getResourceData = function(deploymentId, resourceId, done) {
});
};
+/**
+ * Redeploy a deployment
+
+ * @param {Object} options
+ * @param {String} options.id
+ * @param {Array} [options.resourceIds]
+ * @param {Array} [options.resourceNames]
+ * @param {Function} done
+ */
+Deployment.redeploy = function(options, done) {
+ var id = options.id;
+ delete options.id;
+
+ return this.http.post(this.path + '/' + id + '/redeploy', {
+ data: options,
+ done: done || function() {}
+ });
+}
+
module.exports = Deployment;
|
feat(redeploy): I can redeploy an existing deployment
related to CAM-<I>
|
diff --git a/packages/graphql-language-service-types/scripts/build-js.js b/packages/graphql-language-service-types/scripts/build-js.js
index <HASH>..<HASH> 100644
--- a/packages/graphql-language-service-types/scripts/build-js.js
+++ b/packages/graphql-language-service-types/scripts/build-js.js
@@ -9,7 +9,6 @@
'use strict';
import {join} from 'path';
-import {cp, exec} from './util';
+import {exec} from './util';
exec('babel', 'src', '--out-dir', 'dist');
-cp('package.json', join('dist', 'package.json'));
|
Remove unnecessary bundling of package.json inside dist dir
|
diff --git a/tests/model_selection/test_incremental.py b/tests/model_selection/test_incremental.py
index <HASH>..<HASH> 100644
--- a/tests/model_selection/test_incremental.py
+++ b/tests/model_selection/test_incremental.py
@@ -223,12 +223,15 @@ def test_search_basic(c, s, a, b):
"param_alpha",
"param_l1_ratio",
}.issubset(set(search.cv_results_.keys()))
+
assert all(isinstance(v, np.ndarray) for v in search.cv_results_.values())
- assert (
- search.cv_results_["test_score"][search.best_index_]
- >= search.cv_results_["test_score"]
- ).all()
- assert search.cv_results_["rank_test_score"][search.best_index_] == 1
+ assert all(search.cv_results_["test_score"] >= 0)
+ assert all(search.cv_results_["rank_test_score"] >= 1)
+ assert all(search.cv_results_["partial_fit_calls"] >= 1)
+ assert len(np.unique(search.cv_results_["model_id"])) == len(
+ search.cv_results_["model_id"]
+ )
+
X_, = yield c.compute([X])
proba = search.predict_proba(X_)
|
Replace cv_results asserts with sanity checks
|
diff --git a/modin/pandas/__init__.py b/modin/pandas/__init__.py
index <HASH>..<HASH> 100644
--- a/modin/pandas/__init__.py
+++ b/modin/pandas/__init__.py
@@ -159,7 +159,7 @@ def initialize_ray():
num_cpus=int(num_cpus),
include_webui=False,
ignore_reinit_error=True,
- redis_address=redis_address,
+ address=redis_address,
redis_password=redis_password,
logging_level=100,
)
@@ -193,7 +193,7 @@ def initialize_ray():
ignore_reinit_error=True,
plasma_directory=plasma_directory,
object_store_memory=object_store_memory,
- redis_address=redis_address,
+ address=redis_address,
redis_password=redis_password,
logging_level=100,
memory=object_store_memory,
diff --git a/stress_tests/test_kaggle_ipynb.py b/stress_tests/test_kaggle_ipynb.py
index <HASH>..<HASH> 100644
--- a/stress_tests/test_kaggle_ipynb.py
+++ b/stress_tests/test_kaggle_ipynb.py
@@ -6,7 +6,7 @@ import numpy as np
import pytest
# import ray
-# ray.init(redis_address="localhost:6379")
+# ray.init(address="localhost:6379")
import modin.pandas as pd
|
change redis_address -> address
|
diff --git a/rdomanager_oscplugin/__init__.py b/rdomanager_oscplugin/__init__.py
index <HASH>..<HASH> 100644
--- a/rdomanager_oscplugin/__init__.py
+++ b/rdomanager_oscplugin/__init__.py
@@ -15,4 +15,4 @@
import pbr.version
-__version__ = pbr.version.VersionInfo('rdomanager_oscplugin').version_string()
+__version__ = pbr.version.VersionInfo('python-rdomanager-oscplugin').version_string()
|
Fix pbr info
The VersionInfo string was wrong. It needed to be the name of the
package, not the name of the module.
Change-Id: If<I>a8fffc6ddd<I>ea<I>b<I>b5
|
diff --git a/src/Command/Debug/ThemeCommand.php b/src/Command/Debug/ThemeCommand.php
index <HASH>..<HASH> 100644
--- a/src/Command/Debug/ThemeCommand.php
+++ b/src/Command/Debug/ThemeCommand.php
@@ -78,8 +78,10 @@ class ThemeCommand extends Command
foreach ($themes as $themeId => $theme) {
$status = $this->getThemeStatus($theme);
$tableRows[] = [
- $themeId, $theme->info['name'],
- $status, $theme->info['version'],
+ $themeId,
+ $theme->info['name'],
+ $status,
+ (isset($theme->info['version'])) ? $theme->info['version'] : '',
];
}
|
Fix issue <I> (#<I>)
|
diff --git a/go/chat/sourceofflinable.go b/go/chat/sourceofflinable.go
index <HASH>..<HASH> 100644
--- a/go/chat/sourceofflinable.go
+++ b/go/chat/sourceofflinable.go
@@ -80,11 +80,23 @@ func (s *sourceOfflinable) IsOffline(ctx context.Context) bool {
defer s.Unlock()
s.Debug(ctx, "IsOffline: waited and got %v", s.offline)
return s.offline
+ case <-ctx.Done():
+ s.Lock()
+ defer s.Unlock()
+ s.Debug(ctx, "IsOffline: aborted: %s state: %v", ctx.Err(), s.offline)
+ return s.offline
case <-time.After(4 * time.Second):
s.Lock()
defer s.Unlock()
+ select {
+ case <-ctx.Done():
+ s.Debug(ctx, "IsOffline: timed out, but context canceled so not setting delayed: state: %v",
+ s.offline)
+ return s.offline
+ default:
+ }
s.delayed = true
- s.Debug(ctx, "IsOffline: timed out")
+ s.Debug(ctx, "IsOffline: timed out, setting delay wait: state: %v", s.offline)
return s.offline
}
}
|
dont set the delay check if the request has been aborted CORE-<I> (#<I>)
* dont set the delay check if the request has been aborted
* wording
* check at top level too
|
diff --git a/lib/poolparty/cloud.rb b/lib/poolparty/cloud.rb
index <HASH>..<HASH> 100644
--- a/lib/poolparty/cloud.rb
+++ b/lib/poolparty/cloud.rb
@@ -277,11 +277,11 @@ No autoscalers defined
# Run command/s on all nodes in the cloud.
# Returns a hash of instance_id=>result pairs
def cmd(commands, opts={})
- opts[:key_by]= :instance_id unless opts[:key_by]
+ key_by = opts.delete(:key_by) || :instance_id
results = {}
threads = nodes.collect do |n|
- puts "result for #{n.instance_id} ==> #{n.ssh(commands, opts)}"
- Thread.new{ results[ n.send(opts[:key_by]) ] = n.ssh(commands, opts) }
+ puts "result for #{n.instance_id} ==> n.ssh(#{commands.inspect}, #{opts.inspect})"
+ Thread.new{ results[ n.send(key_by) ] = n.ssh(commands, opts) }
end
threads.each{ |aThread| aThread.join }
results
|
Fix Cloud#cmd to avoid injection of the text "key_by instance_id" into the generated ssh command
|
diff --git a/molgenis-core-ui/src/main/resources/js/molgenis.js b/molgenis-core-ui/src/main/resources/js/molgenis.js
index <HASH>..<HASH> 100644
--- a/molgenis-core-ui/src/main/resources/js/molgenis.js
+++ b/molgenis-core-ui/src/main/resources/js/molgenis.js
@@ -1043,6 +1043,7 @@ $(function() {
// focus first input on modal display
$(document).on('click', '.plugin-settings-btn', function() {
+ React.unmountComponentAtNode($('#plugin-settings-container')[0]); // fix https://github.com/molgenis/molgenis/issues/3587
React.render(molgenis.ui.Form({
entity: molgenis.getPluginSettingsId(),
entityInstance: molgenis.getPluginId(),
|
Fix #<I> Settings panel can't be reopened after cancel/close
|
diff --git a/trie4j/src/org/trie4j/patricia/PatriciaTrie.java b/trie4j/src/org/trie4j/patricia/PatriciaTrie.java
index <HASH>..<HASH> 100644
--- a/trie4j/src/org/trie4j/patricia/PatriciaTrie.java
+++ b/trie4j/src/org/trie4j/patricia/PatriciaTrie.java
@@ -29,6 +29,13 @@ import org.trie4j.util.Pair;
public class PatriciaTrie
extends AbstractTrie
implements Serializable, Trie{
+ public PatriciaTrie(){
+ }
+
+ public PatriciaTrie(String... words){
+ for(String s : words) insert(s);
+ }
+
@Override
public int size() {
return size;
|
add Constructor that receives String[].
|
diff --git a/lib/commands/commands.rb b/lib/commands/commands.rb
index <HASH>..<HASH> 100644
--- a/lib/commands/commands.rb
+++ b/lib/commands/commands.rb
@@ -37,7 +37,6 @@ command :open do |arg|
helper.open "http://github.com/#{arg}"
end
-
desc "Info about this project."
command :info do
puts "== Info for #{helper.project}"
@@ -162,7 +161,7 @@ end
desc "Generate the text for a pull request."
usage "github pull-request [user] [branch]"
-command 'pull-request' do |user, branch|
+command :'pull-request' do |user, branch|
if helper.project
die "Specify a user for the pull request" if user.nil?
user, branch = user.split('/', 2) if branch.nil?
@@ -227,7 +226,7 @@ end
desc "Create a new GitHub repository from the current local repository"
flags :private => 'Create private repository'
-command 'create-from-local' do
+command :'create-from-local' do
cwd = sh "pwd"
repo = File.basename(cwd)
is_repo = !git("status").match(/fatal/)
|
All command names are symbols so they look pretty in editors
|
diff --git a/holoviews/core/settings.py b/holoviews/core/settings.py
index <HASH>..<HASH> 100644
--- a/holoviews/core/settings.py
+++ b/holoviews/core/settings.py
@@ -207,14 +207,19 @@ class SettingsTree(AttrTree):
def __setattr__(self, identifier, val):
new_groups = {}
if isinstance(val, dict):
- group_items = val.items()
+ group_items = val
elif isinstance(val, Settings) and val.group is None:
raise AttributeError("Settings object needs to have a group name specified.")
elif isinstance(val, Settings):
- group_items = [(val.group, val)]
+ group_items = {val.group: val}
- for group_name, settings in group_items:
- new_groups[group_name] = self._inherited_settings(group_name, settings)
+ current_node = self[identifier] if identifier in self.children else self
+ for group_name in current_node.groups:
+ settings = group_items.get(group_name, False)
+ if settings:
+ new_groups[group_name] = self._inherited_settings(group_name, settings)
+ else:
+ new_groups[group_name] = current_node.groups[group_name]
if new_groups:
new_node = SettingsTree(None, identifier=identifier, parent=self, groups=new_groups)
|
Fixed settings inheritance on SettingsTree
|
diff --git a/lib/delfos/patching/method_override.rb b/lib/delfos/patching/method_override.rb
index <HASH>..<HASH> 100644
--- a/lib/delfos/patching/method_override.rb
+++ b/lib/delfos/patching/method_override.rb
@@ -107,27 +107,11 @@ module Delfos
end
def record_method!
- return true if bail?
+ return true if ::Delfos::MethodLogging.exclude?(original_method)
MethodCache.append(klass: klass, method: original_method)
yield
end
-
- def bail?
- method_has_been_added? || private_method? || exclude?
- end
-
- def method_has_been_added?
- MethodCache.find(klass: klass, class_method: class_method, method_name: name)
- end
-
- def private_method?
- private_methods.include?(name.to_sym)
- end
-
- def exclude?
- ::Delfos::MethodLogging.exclude?(original_method)
- end
end
end
end
|
stop checking again if method has been recorded, and allow private methods
|
diff --git a/tests/event-gateway/processes.js b/tests/event-gateway/processes.js
index <HASH>..<HASH> 100644
--- a/tests/event-gateway/processes.js
+++ b/tests/event-gateway/processes.js
@@ -10,7 +10,7 @@ const rimraf = require('rimraf')
// eslint-disable-next-line no-undef
jasmine.DEFAULT_TIMEOUT_INTERVAL = 4000
-const eventGatewayPath = path.join(__dirname, 'darwin_amd64', 'event-gateway')
+const eventGatewayPath = path.join(__dirname, `${process.platform}_amd64`, 'event-gateway')
const processStore = {}
module.exports = {
|
support linux for the test-suite
|
diff --git a/lib/async.js b/lib/async.js
index <HASH>..<HASH> 100644
--- a/lib/async.js
+++ b/lib/async.js
@@ -683,14 +683,14 @@
};
// AMD / RequireJS
- if (typeof define !== 'undefined' && define.amd) {
- define('async', [], function () {
+ if (typeof root.define !== 'undefined' && root.define.amd) {
+ root.define('async', [], function () {
return async;
});
}
// Node.js
- else if (typeof module !== 'undefined' && module.exports) {
- module.exports = async;
+ else if (typeof root.module !== 'undefined' && root.module.exports) {
+ root.module.exports = async;
}
// included directly via <script> tag
else {
|
because globals suck :(
I had a bit of a trouble today when I tried to run async in an env where the root wasn't the window.
|
diff --git a/calendar-bundle/contao/ModuleEventlist.php b/calendar-bundle/contao/ModuleEventlist.php
index <HASH>..<HASH> 100644
--- a/calendar-bundle/contao/ModuleEventlist.php
+++ b/calendar-bundle/contao/ModuleEventlist.php
@@ -89,7 +89,9 @@ class ModuleEventlist extends Events
*/
protected function compile()
{
- // Jump to current period
+ $blnClearInput = false;
+
+ // Jump to the current period
if (!isset($_GET['year']) && !isset($_GET['month']) && !isset($_GET['day']))
{
switch ($this->cal_format)
@@ -106,6 +108,8 @@ class ModuleEventlist extends Events
$this->Input->setGet('day', date('Ymd'));
break;
}
+
+ $blnClearInput = true;
}
$blnDynamicFormat = in_array($this->cal_format, array('cal_day', 'cal_month', 'cal_year'));
@@ -300,6 +304,14 @@ class ModuleEventlist extends Events
}
$this->Template->events = $strEvents;
+
+ // Clear the $_GET array (see #2445)
+ if ($blnClearInput)
+ {
+ $this->Input->setGet('year', null);
+ $this->Input->setGet('month', null);
+ $this->Input->setGet('day', null);
+ }
}
}
|
[Calendar] Clear the $_GET array after rendering the event list module (#<I>)
|
diff --git a/app/models/renalware/zip_archive.rb b/app/models/renalware/zip_archive.rb
index <HASH>..<HASH> 100644
--- a/app/models/renalware/zip_archive.rb
+++ b/app/models/renalware/zip_archive.rb
@@ -9,7 +9,9 @@ module Renalware
end
def unzip
- Dir.mktmpdir(nil, Rails.root.join("tmp").to_s) do |dir|
+ # Create a tmp dir and ensure PG has access to it.
+ Dir.mktmpdir do |dir|
+ `chmod a+rX #{dir}`
files = unzip_to_tmp_dir_and_return_pathames_array(dir)
yield(files)
end
|
Zip fles to /tmp and ensure PG has access
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.