diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/lib/active_job/arguments.rb b/lib/active_job/arguments.rb
index <HASH>..<HASH> 100644
--- a/lib/active_job/arguments.rb
+++ b/lib/active_job/arguments.rb
@@ -1,4 +1,5 @@
require 'active_model/global_locator'
+require 'active_model/global_identification'
module ActiveJob
class Arguments
|
Require global_identification in serialisations
|
diff --git a/indra/statements.py b/indra/statements.py
index <HASH>..<HASH> 100644
--- a/indra/statements.py
+++ b/indra/statements.py
@@ -1048,6 +1048,17 @@ class Evidence(object):
text_refs : dict
A dictionary of various reference ids to the source text, e.g.
DOI, PMID, URL, etc.
+
+ Additional Attributes
+ ---------------------
+ source_hash : int
+ A hash calculated from the evidence text, source api, and pmid and/or
+ source_id if available. This is generated automatcially when the object
+ is instantiated.
+ stmt_tag : int
+ This is a hash calculated by a Statement to which this evidence refers,
+ and is set by said Statement. It is useful for tracing ownership of
+ an Evidence object.
"""
def __init__(self, source_api=None, source_id=None, pmid=None, text=None,
annotations=None, epistemics=None, context=None,
@@ -1079,6 +1090,10 @@ class Evidence(object):
state['context'] = None
if 'text_refs' not in state:
state['text_refs'] = {}
+ if 'stmt_tag' not in state:
+ state['stmt_tag'] = None
+ if 'source_hash' not in state:
+ state['source_hash'] = None
self.__dict__ = state
def get_source_hash(self, refresh=False):
|
Add some documentation and fix set-state.
|
diff --git a/closure/goog/net/xhrmanager.js b/closure/goog/net/xhrmanager.js
index <HASH>..<HASH> 100644
--- a/closure/goog/net/xhrmanager.js
+++ b/closure/goog/net/xhrmanager.js
@@ -139,7 +139,7 @@ goog.net.XhrManager.prototype.setTimeoutInterval = function(ms) {
/**
- * Returns the number of reuqests either in flight, or waiting to be sent.
+ * Returns the number of requests either in flight, or waiting to be sent.
* @return {number} The number of requests in flight or pending send.
*/
goog.net.XhrManager.prototype.getOutstandingCount = function() {
|
Fix spelling errors for reuqest. Mostly makes searching comments better, but there are some bonafide bugs here!
R=pallosp
DELTA=1 (0 added, 0 deleted, 1 changed)
Revision created by MOE tool push_codebase.
MOE_MIGRATION=<I>
git-svn-id: <URL>
|
diff --git a/tests/Queue/QueueWorkerTest.php b/tests/Queue/QueueWorkerTest.php
index <HASH>..<HASH> 100755
--- a/tests/Queue/QueueWorkerTest.php
+++ b/tests/Queue/QueueWorkerTest.php
@@ -243,7 +243,6 @@ class QueueWorkerTest extends TestCase
$this->assertNull($job->failedWith);
}
-
public function test_job_based_failed_delay()
{
$job = new WorkerFakeJob(function ($job) {
@@ -259,7 +258,6 @@ class QueueWorkerTest extends TestCase
$this->assertEquals(10, $job->releaseAfter);
}
-
/**
* Helpers...
*/
|
Apply fixes from StyleCI (#<I>)
|
diff --git a/library/src/main/java/com/github/devnied/emvnfccard/parser/EmvTemplate.java b/library/src/main/java/com/github/devnied/emvnfccard/parser/EmvTemplate.java
index <HASH>..<HASH> 100644
--- a/library/src/main/java/com/github/devnied/emvnfccard/parser/EmvTemplate.java
+++ b/library/src/main/java/com/github/devnied/emvnfccard/parser/EmvTemplate.java
@@ -311,6 +311,7 @@ public class EmvTemplate {
if (config == null) {
config = Config();
}
+ parsers = new ArrayList<IParser>();
if (!config.removeDefaultParsers) {
addDefaultParsers();
}
@@ -321,7 +322,6 @@ public class EmvTemplate {
* Add default parser implementation
*/
private void addDefaultParsers() {
- parsers = new ArrayList<IParser>();
parsers.add(new GeldKarteParser(this));
parsers.add(new EmvParser(this));
}
|
Ensure list of parsers not null when the defaults are not added
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
setuptools.setup(
name = 'openhomedevice',
- version = '0.6.2',
+ version = '0.6.3',
author = 'Barry John Williams',
author_email = 'barry@bjw.me.uk',
description='Provides an API for requesting information from an Openhome device',
|
Bumped version number to <I>
|
diff --git a/cli/cumulusci.py b/cli/cumulusci.py
index <HASH>..<HASH> 100644
--- a/cli/cumulusci.py
+++ b/cli/cumulusci.py
@@ -85,10 +85,16 @@ def build_router(config):
if branch.startswith('feature/'):
click.echo('-- Building with feature branch flow')
+ config.sf_username = os.environ.get('SF_USERNAME_FEATURE')
+ config.sf_password = os.environ.get('SF_PASSWORD_FEATURE')
+ config.sf_serverurl = os.environ.get('SF_SERVERURL_FEATURE', config.sf_serverurl)
unmanaged_deploy.main(args=['--run-tests','True'])
elif branch == 'master':
click.echo('-- Building with master branch flow')
+ config.sf_username = os.environ.get('SF_USERNAME_PACKAGING')
+ config.sf_password = os.environ.get('SF_PASSWORD_PACKAGING')
+ config.sf_serverurl = os.environ.get('SF_SERVERURL_PACKAGING', config.sf_serverurl)
package_deploy(args=['--run-tests','True'])
@click.group()
|
Switch build target orgs in build_router based on environment variable
suffixes
|
diff --git a/src/Illuminate/Database/Query/Builder.php b/src/Illuminate/Database/Query/Builder.php
index <HASH>..<HASH> 100755
--- a/src/Illuminate/Database/Query/Builder.php
+++ b/src/Illuminate/Database/Query/Builder.php
@@ -655,9 +655,9 @@ class Builder
return $this->whereNested($column, $boolean);
}
- // If the column is a Closure instance and there an operator set, we will
- // assume the developer wants to run a subquery and then compare the
- // results of the subquery with the value that was provided.
+ // If the column is a Closure instance and there is an operator set, we
+ // will assume the developer wants to run a subquery and then compare
+ // the results of that subquery with the value that was provided.
if ($column instanceof Closure && ! is_null($operator)) {
[$sub, $bindings] = $this->createSub($column);
|
Tweak comment in query builder where method
|
diff --git a/packages/reactstrap-validation-select/AvSelect.js b/packages/reactstrap-validation-select/AvSelect.js
index <HASH>..<HASH> 100644
--- a/packages/reactstrap-validation-select/AvSelect.js
+++ b/packages/reactstrap-validation-select/AvSelect.js
@@ -196,10 +196,7 @@ class AvSelect extends AvBaseInput {
let shouldAutofillField = false;
if (typeof this.props.autofill === 'object') {
- shouldAutofillField = Object.prototype.hasOwnProperty.call(
- this.props.autofill,
- fieldName
- );
+ shouldAutofillField = this.props.autofill[fieldName];
} else {
shouldAutofillField = Object.prototype.hasOwnProperty.call(
rawValue,
|
fix(reactstrap-validation-select): check autofill key is truthy
|
diff --git a/src/LooplineSystems/CloseIoApiWrapper/Api/LeadApi.php b/src/LooplineSystems/CloseIoApiWrapper/Api/LeadApi.php
index <HASH>..<HASH> 100644
--- a/src/LooplineSystems/CloseIoApiWrapper/Api/LeadApi.php
+++ b/src/LooplineSystems/CloseIoApiWrapper/Api/LeadApi.php
@@ -27,8 +27,8 @@ class LeadApi extends AbstractApi
$this->urls = [
'get-leads' => '/lead/',
'add-lead' => '/lead/',
- 'get-lead' => '/lead/[:id]',
- 'update-lead' => 'lead/[:id]'
+ 'get-lead' => '/lead/[:id]/',
+ 'update-lead' => '/lead/[:id]/',
];
}
|
Fixes typo in lead urls
|
diff --git a/src/Console/Command/Task/PluginTask.php b/src/Console/Command/Task/PluginTask.php
index <HASH>..<HASH> 100644
--- a/src/Console/Command/Task/PluginTask.php
+++ b/src/Console/Command/Task/PluginTask.php
@@ -213,6 +213,14 @@ class PluginTask extends BakeTask {
$this->createFile($file, $out);
}
+/**
+ * Modifies App's coposer.json to include the plugin and tries to call
+ * composer dump-autoload to refresh the autoloader cache
+ *
+ * @param string $plugin Name of plugin
+ * @param string $path The path to save the phpunit.xml file to.
+ * @return boolean True if composer could be modified correctly
+ */
protected function _modifyAutoloader($plugin, $path) {
$path = dirname($path);
@@ -239,7 +247,8 @@ class PluginTask extends BakeTask {
}
try {
- $command = 'php ' . escapeshellarg($composer) . ' dump-autoload ';
+ $command = 'cd ' . escapeshellarg($path) . '; ';
+ $command .= 'php ' . escapeshellarg($composer) . ' dump-autoload ';
$this->Project->callComposer($command);
} catch (\RuntimeException $e) {
$error = $e->getMessage();
|
Fixing an error when calling composer and adding doc block
|
diff --git a/lib/gemsmith/gem/specification.rb b/lib/gemsmith/gem/specification.rb
index <HASH>..<HASH> 100644
--- a/lib/gemsmith/gem/specification.rb
+++ b/lib/gemsmith/gem/specification.rb
@@ -44,11 +44,11 @@ module Gemsmith
end
def allowed_push_key
- spec.metadata.fetch("allowed_push_key") { "rubygems_api_key" }
+ spec.metadata.fetch "allowed_push_key", "rubygems_api_key"
end
def allowed_push_host
- spec.metadata.fetch("allowed_push_host") { self.class.default_gem_host }
+ spec.metadata.fetch "allowed_push_host", self.class.default_gem_host
end
def package_file_name
|
Fixed Style/RedundantFetchBlock issue with gem specification
Use of the block was unnecessary.
|
diff --git a/plaso/parsers/winreg_plugins/interface.py b/plaso/parsers/winreg_plugins/interface.py
index <HASH>..<HASH> 100644
--- a/plaso/parsers/winreg_plugins/interface.py
+++ b/plaso/parsers/winreg_plugins/interface.py
@@ -143,7 +143,7 @@ class WindowsRegistryKeyPathPrefixFilter(BaseWindowsRegistryKeyFilter):
Returns:
bool: True if the keys match.
"""
- return registry_key.path.startsswith(self._key_path_prefix)
+ return registry_key.path.startswith(self._key_path_prefix)
class WindowsRegistryKeyPathSuffixFilter(BaseWindowsRegistryKeyFilter):
|
Fix simple typo in winreg_plugins interface (#<I>)
|
diff --git a/ezp/Persistence/Tests/InMemoryEngine/BackendDataTest.php b/ezp/Persistence/Tests/InMemoryEngine/BackendDataTest.php
index <HASH>..<HASH> 100644
--- a/ezp/Persistence/Tests/InMemoryEngine/BackendDataTest.php
+++ b/ezp/Persistence/Tests/InMemoryEngine/BackendDataTest.php
@@ -336,6 +336,34 @@ class BackendDataTest extends PHPUnit_Framework_TestCase
}
/**
+ * Test counting content without results
+ *
+ * @dataProvider providerForFindEmpty
+ * @covers ezp\Persistence\Tests\InMemoryEngine\Backend::count
+ */
+ public function testCountEmpty( $searchData )
+ {
+ $this->assertEquals(
+ 0,
+ $this->backend->count( "Content", $searchData )
+ );
+ }
+
+ /**
+ * Test counting content with results
+ *
+ * @dataProvider providerForFind
+ * @covers ezp\Persistence\Tests\InMemoryEngine\Backend::count
+ */
+ public function testCount( $searchData, $result )
+ {
+ $this->assertEquals(
+ count( $result ),
+ $this->backend->count( "Content", $searchData )
+ );
+ }
+
+ /**
* Test loading content without results
*
* @dataProvider providerForLoadEmpty
|
Added: additional InMemoryEngine\Backend tests
|
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index <HASH>..<HASH> 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -57,6 +57,7 @@ abstract class Kernel implements KernelInterface, TerminableInterface
protected $name;
protected $startTime;
protected $classes;
+ protected $errorReportingLevel;
const VERSION = '2.1.0-DEV';
@@ -91,7 +92,7 @@ abstract class Kernel implements KernelInterface, TerminableInterface
error_reporting(-1);
DebugUniversalClassLoader::enable();
- ErrorHandler::register();
+ ErrorHandler::register($this->errorReportingLevel);
if ('cli' !== php_sapi_name()) {
ExceptionHandler::register();
}
|
Allow people to set the error level, this is especially important when dealing with misbehaving libraries as part of legacy integrations.
Usage would be to extend the Kernel, and set the errorReportingLevel prior to calling parent::__construct(). Not ideal, but this doesn't break BC and allows the user to defer the decision as late as possible. This can/should be handled better in <I>.x
|
diff --git a/src/Illuminate/Cache/TaggedCache.php b/src/Illuminate/Cache/TaggedCache.php
index <HASH>..<HASH> 100644
--- a/src/Illuminate/Cache/TaggedCache.php
+++ b/src/Illuminate/Cache/TaggedCache.php
@@ -2,7 +2,7 @@
use Closure;
-class TaggedCache {
+class TaggedCache implements StoreInterface {
/**
* The cache store implementation.
@@ -187,4 +187,14 @@ class TaggedCache {
{
return $this->tags->getNamespace().':'.$key;
}
+
+ /**
+ * Get the cache key prefix.
+ *
+ * @return string
+ */
+ public function getPrefix()
+ {
+ return $this->store->getPrefix();
+ }
}
|
Make TaggedCache implement StoreInterface
This way, a tagged cache can be passed to a class that expects a StoreInterface, and doesn't have to know that it is dealing with a tagged cache.
Tag-related operations can be handled outside the class.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -48,4 +48,8 @@ setup(
'rshell=rshell.command_line:main'
],
},
+ extras_require={
+ ':sys_platform == "win32"': [
+ 'pyreadline']
+ }
)
|
Address #<I>: Add pyreadline dependency for Windows platform
|
diff --git a/src/howler.core.js b/src/howler.core.js
index <HASH>..<HASH> 100644
--- a/src/howler.core.js
+++ b/src/howler.core.js
@@ -1604,7 +1604,7 @@
}
// If the sound hasn't loaded, add it to the load queue to seek when capable.
- if (self._state !== 'loaded' || self._playLock) {
+ if (typeof seek === 'number' && (self._state !== 'loaded' || self._playLock)) {
self._queue.push({
event: 'seek',
action: function() {
|
Don't add seek without value to queue when loading
Fixes #<I>
|
diff --git a/bettercache/views.py b/bettercache/views.py
index <HASH>..<HASH> 100644
--- a/bettercache/views.py
+++ b/bettercache/views.py
@@ -1,3 +1,5 @@
+import urllib2, time
+
from django.http import HttpResponse
from bettercache.utils import CachingMixin
from bettercache.tasks import GeneratePage
@@ -18,10 +20,12 @@ class BetterView(CachingMixin):
if response is None:
response = self.proxy(request)
- return HttpResponse('OH YEAH')
+ return response #HttpResponse('OH YEAH')
def proxy(self, request):
- return None
+ response = urllib2.urlopen('http://www.test.clarkhoward.com',str(time.time))
+ hr = HttpResponse(response.read())
+ return hr
#TODO: properly implement a class based view
|
[CMSPERF-<I>] slightly better it now proxies
|
diff --git a/lib/cl/version.rb b/lib/cl/version.rb
index <HASH>..<HASH> 100644
--- a/lib/cl/version.rb
+++ b/lib/cl/version.rb
@@ -1,3 +1,3 @@
class Cl
- VERSION = '0.1.15'
+ VERSION = '0.1.16'
end
|
Bump cl to <I>
|
diff --git a/helpers/map-deep-merge.js b/helpers/map-deep-merge.js
index <HASH>..<HASH> 100644
--- a/helpers/map-deep-merge.js
+++ b/helpers/map-deep-merge.js
@@ -172,7 +172,8 @@ function typeFromList( list ){
return list && list._define && list._define.definitions["#"] && list._define.definitions["#"].Type;
}
function idFromType( Type ){
- return Type && Type.algebra && Type.algebra.clauses && Type.algebra.clauses.id && function(o){
+ return Type && Type.connection && Type.connection.id ||
+ Type && Type.algebra && Type.algebra.clauses && Type.algebra.clauses.id && function(o){
var idProp = Object.keys(Type.algebra.clauses.id)[0];
return o[idProp];
} || function(o){
|
smart-merge: read id usign connection.id
|
diff --git a/msg/scratch_msgs.js b/msg/scratch_msgs.js
index <HASH>..<HASH> 100644
--- a/msg/scratch_msgs.js
+++ b/msg/scratch_msgs.js
@@ -9,7 +9,7 @@ goog.require('Blockly.ScratchMsgs');
Blockly.ScratchMsgs.locales["ab"] =
{
- "CONTROL_FOREVER": "инагӡалатәуп",
+ "CONTROL_FOREVER": "инагӡалатәуп еснагь",
"CONTROL_REPEAT": "инагӡалатәуп %1 - нтә",
"CONTROL_IF": "%1 акәзар",
"CONTROL_ELSE": "акәымзар",
|
[skip ci] Update translations from transifex
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@ tests_require = [
'pydocstyle>=2.0.0',
'pytest-cov>=1.8.0',
'pytest-pep8>=1.0.6',
- 'pytest>=2.8.0',
+ 'pytest>=4.0.0,<5.0.0',
'mock>=1.3.0',
]
|
setup: pin pytest version
(closes #<I>)
|
diff --git a/openquake/commonlib/readinput.py b/openquake/commonlib/readinput.py
index <HASH>..<HASH> 100644
--- a/openquake/commonlib/readinput.py
+++ b/openquake/commonlib/readinput.py
@@ -1034,14 +1034,18 @@ def get_checksum32(oqparam):
"""
Build an unsigned 32 bit integer from the input files of the calculation
"""
+ # NB: using adler32 & 0xffffffff is the documented way to get a checksum
+ # which is the same between Python 2 and Python 3
checksum = 0
for key in sorted(oqparam.inputs):
fname = oqparam.inputs[key]
if key == 'source': # list of fnames and/or strings
for f in fname:
- checksum = zlib.adler32(open(f, 'rb').read(), checksum)
+ data = open(f, 'rb').read()
+ checksum = zlib.adler32(data, checksum) & 0xffffffff
elif os.path.exists(fname):
- checksum = zlib.adler32(open(fname, 'rb').read(), checksum)
+ data = open(fname, 'rb').read()
+ checksum = zlib.adler32(data, checksum) & 0xffffffff
else:
raise ValueError('%s is not a file' % fname)
return checksum
|
Fixed a Python 2<->3 issue
|
diff --git a/osrframework/__init__.py b/osrframework/__init__.py
index <HASH>..<HASH> 100644
--- a/osrframework/__init__.py
+++ b/osrframework/__init__.py
@@ -23,4 +23,4 @@ import osrframework.utils.logger
# Calling the logger when being imported
osrframework.utils.logger.setupLogger(loggerName="osrframework")
-__version__="0.15.0rc4"
+__version__="0.15.0rc5"
|
Set release version to <I>rc5
|
diff --git a/lib/client.js b/lib/client.js
index <HASH>..<HASH> 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -95,6 +95,8 @@ extend(Raven.prototype, {
},
install: function install(opts, cb) {
+ if (this.installed) return this;
+
if (typeof opts === 'function') {
cb = opts;
}
@@ -110,6 +112,8 @@ extend(Raven.prototype, {
}
}
+ this.installed = true;
+
return this;
},
@@ -386,6 +390,8 @@ extend(Raven.prototype, {
},
captureBreadcrumb: function (breadcrumb) {
+ if (!this.installed) return;
+
breadcrumb = extend({
timestamp: +new Date / 1000
}, breadcrumb);
|
Add installed flag to avoid capturing console breadcrumbs prematurely
|
diff --git a/core/class-kirki-init.php b/core/class-kirki-init.php
index <HASH>..<HASH> 100644
--- a/core/class-kirki-init.php
+++ b/core/class-kirki-init.php
@@ -285,7 +285,7 @@ class Kirki_Init {
* @return bool
*/
public static function is_plugin() {
- _doing_it_wrong( __METHOD__, esc_attr__( 'We detected you\'re using Kirki_Init::is_plugin(). Please use Kirki_Util::is_plugin() instead.', 'kirki' ), '3.0.10' );
+ /* _doing_it_wrong( __METHOD__, esc_attr__( 'We detected you\'re using Kirki_Init::is_plugin(). Please use Kirki_Util::is_plugin() instead.', 'kirki' ), '3.0.10' ); */
// Return result using the Kirki_Util class.
return Kirki_Util::is_plugin();
}
|
Don't add this message for now, we'll see how it goes.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -80,7 +80,7 @@ setup(
'boto',
'kazoo',
#'marisa-trie',
- #'jellyfish', ## required in .rpm
+ 'jellyfish',
'nilsimsa>=0.2',
'pytest', ## required in .rpm
'pycassa',
diff --git a/src/kba/pipeline/_run_lingpipe.py b/src/kba/pipeline/_run_lingpipe.py
index <HASH>..<HASH> 100644
--- a/src/kba/pipeline/_run_lingpipe.py
+++ b/src/kba/pipeline/_run_lingpipe.py
@@ -15,7 +15,7 @@ atomic move to put the final product into position.
import streamcorpus
from streamcorpus import Chunk, Label, Tagging
-import lingpipe
+#import lingpipe
import os
import re
|
fixing pylint fatal errors by including jellyfish in setup.py and commenting
out the non-existant "lingpipe" package
|
diff --git a/lib/stax/mixin/dms.rb b/lib/stax/mixin/dms.rb
index <HASH>..<HASH> 100644
--- a/lib/stax/mixin/dms.rb
+++ b/lib/stax/mixin/dms.rb
@@ -73,8 +73,8 @@ module Stax
print_table Aws::Dms.tasks(filters: [{name: 'replication-task-arn', values: dms_task_arns}]).map { |t|
[
t.replication_task_identifier, color(t.status, COLORS), t.migration_type,
- "#{t.replication_task_stats.full_load_progress_percent}%", "#{(t.replication_task_stats.elapsed_time_millis/1000).to_i}s",
- "#{t.replication_task_stats.tables_loaded} loaded", "#{t.replication_task_stats.tables_errored} errors",
+ "#{t.replication_task_stats&.full_load_progress_percent}%", "#{(t.replication_task_stats&.elapsed_time_millis/1000).to_i}s",
+ "#{t.replication_task_stats&.tables_loaded} loaded", "#{t.replication_task_stats&.tables_errored} errors",
]
}
end
|
handle nil stats for new tasks not run yet
|
diff --git a/pyghmi/ipmi/oem/lenovo/imm.py b/pyghmi/ipmi/oem/lenovo/imm.py
index <HASH>..<HASH> 100644
--- a/pyghmi/ipmi/oem/lenovo/imm.py
+++ b/pyghmi/ipmi/oem/lenovo/imm.py
@@ -795,10 +795,16 @@ class XCCClient(IMMClient):
rt = self.wc.grab_json_response('/api/providers/rp_vm_remote_connect',
json.dumps(rq))
if 'return' not in rt or rt['return'] != 0:
+ if rt['return'] in (657, 659, 656):
+ raise pygexc.InvalidParameterValue(
+ 'Given location was unreachable by the XCC')
raise Exception('Unhandled return: ' + repr(rt))
rt = self.wc.grab_json_response('/api/providers/rp_vm_remote_mountall',
'{}')
if 'return' not in rt or rt['return'] != 0:
+ if rt['return'] in (657, 659, 656):
+ raise pygexc.InvalidParameterValue(
+ 'Given location was unreachable by the XCC')
raise Exception('Unhandled return: ' + repr(rt))
if not self.webkeepalive:
self._keepalivesession = self._wc
|
Provide better error message for common scenarios
There are a few error codes that pretty much mean the same thing.
Provide a better text message to match that error code.
Change-Id: Ic<I>b8dff3f<I>ddd<I>c7b<I>eb8dab<I>
|
diff --git a/library/src/com/nineoldandroids/view/ViewPropertyAnimator.java b/library/src/com/nineoldandroids/view/ViewPropertyAnimator.java
index <HASH>..<HASH> 100644
--- a/library/src/com/nineoldandroids/view/ViewPropertyAnimator.java
+++ b/library/src/com/nineoldandroids/view/ViewPropertyAnimator.java
@@ -298,9 +298,28 @@ public class ViewPropertyAnimator {
}
@Override
- public void setListener(AnimatorListener listener) {
- // TODO Not sure what to do here. We can dispatch callbacks fine but we can't pass
- // back the native animation instance... perhaps just null?
+ public void setListener(final AnimatorListener listener) {
+ mNative.setListener(new android.animation.Animator.AnimatorListener() {
+ @Override
+ public void onAnimationStart(android.animation.Animator animation) {
+ listener.onAnimationStart(null);
+ }
+
+ @Override
+ public void onAnimationRepeat(android.animation.Animator animation) {
+ listener.onAnimationRepeat(null);
+ }
+
+ @Override
+ public void onAnimationEnd(android.animation.Animator animation) {
+ listener.onAnimationEnd(null);
+ }
+
+ @Override
+ public void onAnimationCancel(android.animation.Animator animation) {
+ listener.onAnimationCancel(null);
+ }
+ });
}
@Override
|
Forward listener events with a null animation for now.
|
diff --git a/Eloquent/Relations/MorphMany.php b/Eloquent/Relations/MorphMany.php
index <HASH>..<HASH> 100755
--- a/Eloquent/Relations/MorphMany.php
+++ b/Eloquent/Relations/MorphMany.php
@@ -46,4 +46,15 @@ class MorphMany extends MorphOneOrMany
{
return $this->matchMany($models, $results, $relation);
}
+
+ /**
+ * Create a new instance of the related model. Allow mass-assignment.
+ *
+ * @param array $attributes
+ * @return \Illuminate\Database\Eloquent\Model
+ */
+ public function forceCreate(array $attributes = []) {
+ $attributes[$this->getMorphType()] = $this->morphClass;
+ parent::forceCreate($attributes);
+ }
}
|
Fixed bug on forceCreate on a MorphMay relationship not including morph type
|
diff --git a/src/Handlers/AbstractTreeHandler.php b/src/Handlers/AbstractTreeHandler.php
index <HASH>..<HASH> 100644
--- a/src/Handlers/AbstractTreeHandler.php
+++ b/src/Handlers/AbstractTreeHandler.php
@@ -358,15 +358,15 @@ class AbstractTreeHandler implements Handler
protected function getParser()
{
- $refParser = new \ReflectionClass(\PhpParser\Parser::class);
+ $refParser = new \ReflectionClass(\PhpParser\Parser::class);
- if (!$refParser->isInterface()) {
- /**
+ if (! $refParser->isInterface()) {
+ /*
* If we are running nikic/php-parser 1.*
*/
return new \PhpParser\Parser(new Lexer());
} else {
- /**
+ /*
* If we are running nikic/php-parser 2.*
*/
return (new \PhpParser\ParserFactory)->create(\PhpParser\ParserFactory::PREFER_PHP7);
|
Applied fixes from StyleCI (#8)
[ci skip] [skip ci]
|
diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/hudson/model/Run.java
+++ b/core/src/main/java/hudson/model/Run.java
@@ -261,6 +261,7 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
this.project = job;
this.timestamp = timestamp;
this.state = State.NOT_STARTED;
+ getRootDir().mkdirs();
}
/**
@@ -828,9 +829,7 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
* Files related to this {@link Run} should be stored below this directory.
*/
public File getRootDir() {
- File f = new File(project.getBuildDir(),getId());
- f.mkdirs();
- return f;
+ return new File(project.getBuildDir(),getId());
}
/**
|
mkdirs() is expensive on Windows, so don't do it on every getRootDir()
|
diff --git a/CHANGELOG b/CHANGELOG
index <HASH>..<HASH> 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+v1.1.1
+ - return singleton from app instantiation
v1.0.1
- Add caching to FB token retrieval, add specs
v1.0.0
diff --git a/lib/fb/feed.rb b/lib/fb/feed.rb
index <HASH>..<HASH> 100644
--- a/lib/fb/feed.rb
+++ b/lib/fb/feed.rb
@@ -11,6 +11,7 @@ module FB
@app_id = app_id
@app_secret = app_secret
@facebook_oauth = ::Koala::Facebook::OAuth.new(@app_id, @app_secret)
+ self
end
def get_feed(name, options={})
diff --git a/lib/fb/feed/version.rb b/lib/fb/feed/version.rb
index <HASH>..<HASH> 100644
--- a/lib/fb/feed/version.rb
+++ b/lib/fb/feed/version.rb
@@ -1,5 +1,5 @@
module FB
class Feed
- VERSION = '1.0.1'.freeze
+ VERSION = '1.1.1'.freeze
end
end
|
Return self from FB api instantiation
|
diff --git a/Gemfile.lock b/Gemfile.lock
index <HASH>..<HASH> 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
- with_events (0.1.0)
+ with_events (0.1.1)
activesupport (~> 4.2.7)
require_all (~> 1.4.0)
sidekiq (~> 3.5.3)
diff --git a/lib/with_events/version.rb b/lib/with_events/version.rb
index <HASH>..<HASH> 100644
--- a/lib/with_events/version.rb
+++ b/lib/with_events/version.rb
@@ -1,5 +1,5 @@
# frozen_string_literal: true
module WithEvents
- VERSION = '0.1.0'
+ VERSION = '0.1.1'
end
diff --git a/spec/with_events/version_spec.rb b/spec/with_events/version_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/with_events/version_spec.rb
+++ b/spec/with_events/version_spec.rb
@@ -1,5 +1,5 @@
RSpec.describe WithEvents::VERSION do
it 'Should be 0.1.0' do
- expect(WithEvents::VERSION).to eq('0.1.0')
+ expect(WithEvents::VERSION).to eq('0.1.1')
end
end
|
chore(version): Update gem version
|
diff --git a/admin/code/CMSProfileController.php b/admin/code/CMSProfileController.php
index <HASH>..<HASH> 100644
--- a/admin/code/CMSProfileController.php
+++ b/admin/code/CMSProfileController.php
@@ -23,6 +23,7 @@ class CMSProfileController extends LeftAndMain {
$form = parent::getEditForm($id, $fields);
if($form instanceof SS_HTTPResponse) return $form;
+ $form->Fields()->removeByName('LastVisited');
$form->Fields()->push(new HiddenField('ID', null, Member::currentUserID()));
$form->Actions()->push(
FormAction::create('save',_t('CMSMain.SAVE', 'Save'))
|
Removed "Last visited" from admin/myprofile (fixes #<I>)
It doesn't make any sense in this context
|
diff --git a/gyp_learnuv.py b/gyp_learnuv.py
index <HASH>..<HASH> 100755
--- a/gyp_learnuv.py
+++ b/gyp_learnuv.py
@@ -43,7 +43,7 @@ def host_arch():
def compiler_version():
proc = subprocess.Popen(CC.split() + ['--version'], stdout=subprocess.PIPE)
is_clang = 'clang' in proc.communicate()[0].split('\n')[0]
- proc = subprocess.Popen(CC.split() + ['-dumpversion'], stdout=subprocess.PIPE)
+ proc = subprocess.Popen(CC.split() + ['-dumpfullversion','-dumpversion'], stdout=subprocess.PIPE)
version = proc.communicate()[0].split('.')
version = map(int, version[:2])
version = tuple(version)
|
fix for version info in recent gcc
|
diff --git a/dipper/sources/KEGG.py b/dipper/sources/KEGG.py
index <HASH>..<HASH> 100644
--- a/dipper/sources/KEGG.py
+++ b/dipper/sources/KEGG.py
@@ -499,7 +499,7 @@ class KEGG(Source):
#print(kegg_disease_id+'_'+omim_disease_id)
gu.addClassToGraph(g, kegg_disease_id, None)
gu.addClassToGraph(g, omim_disease_id, None)
- gu.addEquivalentClass(g, kegg_disease_id, omim_disease_id)
+ gu.addXref(g, kegg_disease_id, omim_disease_id)
logger.info("Done with KEGG disease to OMIM disease mappings.")
return
|
KEGG.py: Switched KEGG disease to OMIM disease relation to XREF.
|
diff --git a/src/terra/Command/App/AppAdd.php b/src/terra/Command/App/AppAdd.php
index <HASH>..<HASH> 100644
--- a/src/terra/Command/App/AppAdd.php
+++ b/src/terra/Command/App/AppAdd.php
@@ -103,7 +103,7 @@ class AppAdd extends Command
// Offer to enable the environment (only if interactive.)
- if ($input->isInteractive()) {
+ if (!$input->isInteractive()) {
return;
}
|
Wrong logic when checking if we should quit the command!
|
diff --git a/cherrypy/test/test_core.py b/cherrypy/test/test_core.py
index <HASH>..<HASH> 100644
--- a/cherrypy/test/test_core.py
+++ b/cherrypy/test/test_core.py
@@ -372,7 +372,7 @@ class CoreRequestHandlingTest(helper.CPWebCase):
ignore.append(TypeError)
try:
self.getPage("/params/?notathing=meeting")
- self.assertInBody("TypeError: index() got an unexpected keyword argument 'notathing'")
+ self.assertInBody("index() got an unexpected keyword argument 'notathing'")
finally:
ignore.pop()
|
Fix for test which broke in [<I>].
|
diff --git a/client/me/help/controller.js b/client/me/help/controller.js
index <HASH>..<HASH> 100644
--- a/client/me/help/controller.js
+++ b/client/me/help/controller.js
@@ -15,10 +15,10 @@ import HelpComponent from './main';
import CoursesComponent from './help-courses';
import ContactComponent from './help-contact';
import { CONTACT, SUPPORT_ROOT } from 'calypso/lib/url/support';
-import userUtils from 'calypso/lib/user/utils';
+import { isUserLoggedIn } from 'calypso/state/current-user/selectors';
export function loggedOut( context, next ) {
- if ( userUtils.isLoggedIn() ) {
+ if ( isUserLoggedIn( context.store.getState() ) ) {
return next();
}
|
Help: Use Redux to check if user is logged in (#<I>)
|
diff --git a/playground/samples/customObject.js b/playground/samples/customObject.js
index <HASH>..<HASH> 100644
--- a/playground/samples/customObject.js
+++ b/playground/samples/customObject.js
@@ -6,7 +6,11 @@ function ObjectFieldTemplate({ TitleField, properties, title, description }) {
<TitleField title={title} />
<div className="row">
{properties.map(prop => (
- <div className="col-lg-2 col-md-4 col-sm-6 col-xs-12">{prop}</div>
+ <div
+ className="col-lg-2 col-md-4 col-sm-6 col-xs-12"
+ key={prop.content.key}>
+ {prop.content}
+ </div>
))}
</div>
{description}
|
Fix customObject sample (#<I>)
The sample for customObject.js had few defects. React <I> throws an
no-keys-defined warning as well as 'child-can-not-be-objects'
exception. The code has been changed to fix these issues.
* Fixed customObject sample to fix "Objects are not valid as a React child" error for react <I> and to avoid "<URL>
|
diff --git a/sparse/client_test.go b/sparse/client_test.go
index <HASH>..<HASH> 100644
--- a/sparse/client_test.go
+++ b/sparse/client_test.go
@@ -135,6 +135,31 @@ func TestSyncFile9(t *testing.T) {
testSyncFile(t, layoutLocal, layoutRemote)
}
+func TestSyncDiff1(t *testing.T) {
+ layoutLocal := []FileInterval{
+ {SparseData, Interval{0, 100 * Blocks}},
+ }
+ layoutRemote := []FileInterval{
+ {SparseData, Interval{0, 30 * Blocks}},
+ {SparseData, Interval{30 * Blocks, 34 * Blocks}},
+ {SparseData, Interval{34 * Blocks, 100 * Blocks}},
+
+ }
+ testSyncFile(t, layoutLocal, layoutRemote)
+}
+
+func TestSyncDiff2(t *testing.T) {
+ layoutLocal := []FileInterval{
+ {SparseData, Interval{0, 30 * Blocks}},
+ {SparseData, Interval{30 * Blocks, 34 * Blocks}},
+ {SparseData, Interval{34 * Blocks, 100 * Blocks}},
+ }
+ layoutRemote := []FileInterval{
+ {SparseData, Interval{0, 100 * Blocks}},
+ }
+ testSyncFile(t, layoutLocal, layoutRemote)
+}
+
func TestSyncHash1(t *testing.T) {
var hash1, hash2 []byte
{
|
ssync: added diff around block batch alignment
|
diff --git a/bundle/src/main/java/org/ops4j/pax/web/service/internal/HttpServiceStarted.java b/bundle/src/main/java/org/ops4j/pax/web/service/internal/HttpServiceStarted.java
index <HASH>..<HASH> 100644
--- a/bundle/src/main/java/org/ops4j/pax/web/service/internal/HttpServiceStarted.java
+++ b/bundle/src/main/java/org/ops4j/pax/web/service/internal/HttpServiceStarted.java
@@ -462,6 +462,9 @@ class HttpServiceStarted
null, // no initParams
httpContext
);
+ if(contextModel == null){
+ contextModel = m_serviceModel.getContextModel( httpContext );
+ }
contextModel.setJspServlet( jspServlet );
}
catch( ServletException ignore )
|
RE PAXWEB-<I> Prevent the creation of multiple ContextModel objects
|
diff --git a/contao/config/config.php b/contao/config/config.php
index <HASH>..<HASH> 100644
--- a/contao/config/config.php
+++ b/contao/config/config.php
@@ -17,3 +17,5 @@
$GLOBALS['TL_EVENTS'][\ContaoCommunityAlliance\Contao\EventDispatcher\Event\CreateEventDispatcherEvent::NAME][] =
'MetaModels\DcGeneral\Events\Table\Attribute\Translated\Select\PropertyAttribute::registerEvents';
+
+$GLOBALS['TL_EVENT_SUBSCRIBERS'][] = 'MetaModels\Attribute\TranslatedSelect\AttributeTypeFactory';
|
Add a missing event.
Add the missing event for register the AttributeTypeFactory.
|
diff --git a/core/ledger/ledgerstorage/store_test.go b/core/ledger/ledgerstorage/store_test.go
index <HASH>..<HASH> 100644
--- a/core/ledger/ledgerstorage/store_test.go
+++ b/core/ledger/ledgerstorage/store_test.go
@@ -158,6 +158,7 @@ func TestStoreWithExistingBlockchain(t *testing.T) {
provider := NewProvider(storeDir, conf, metricsProvider)
defer provider.Close()
store, err := provider.Open(testLedgerid)
+ assert.NoError(t, err)
store.Init(btlPolicyForSampleData())
defer store.Shutdown()
|
[FAB-<I>] staticcheck - core/ledger/ledgerstorage
|
diff --git a/spyderlib/plugins/ipythonconsole.py b/spyderlib/plugins/ipythonconsole.py
index <HASH>..<HASH> 100644
--- a/spyderlib/plugins/ipythonconsole.py
+++ b/spyderlib/plugins/ipythonconsole.py
@@ -608,9 +608,12 @@ class IPythonClient(QWidget, SaveHistoryMixin):
#---- Qt methods ----------------------------------------------------------
def closeEvent(self, event):
- """Reimplement Qt method to stop sending the custom_restart_kernel_died
- signal"""
- self.ipywidget.custom_restart = False
+ """
+ Reimplement Qt method to stop sending the custom_restart_kernel_died
+ signal
+ """
+ kc = self.ipywidget.kernel_client
+ kc.hb_channel.pause()
class IPythonConsole(SpyderPluginWidget):
|
IPython console: Pause the heartbeat channel when a console is closed
- Without this change we get an infinite stream of warnings printed in the
internal console mentioning a "kernel died" issue.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ setup(
packages=find_packages('.'),
install_requires = [
'prompt_toolkit==0.57',
- 'pyte>=0.4.10',
+ 'pyte>=0.5.1',
'six>=1.9.0',
'docopt>=0.6.2',
],
|
Require at least Pyte <I>.
|
diff --git a/packages/generator-bolt/generators/component/index.js b/packages/generator-bolt/generators/component/index.js
index <HASH>..<HASH> 100644
--- a/packages/generator-bolt/generators/component/index.js
+++ b/packages/generator-bolt/generators/component/index.js
@@ -258,5 +258,17 @@ module.exports = class extends Generator {
addBoltPackage(this.props.packageName);
shelljs.exec('yarn');
+
+ shelljs.exec(
+ `npx prettier ${this.folders.patternLabFolder}/${
+ this.props.name.kebabCase
+ }/**/*.{js,scss,json} --write`,
+ );
+
+ shelljs.exec(
+ `npx prettier ${this.folders.src}/bolt-${
+ this.props.name.kebabCase
+ }/**/*.{js,scss,json} --write`,
+ );
}
};
|
fix: update to automatically run generated files through Prettier automatically to prevent any linting issues
|
diff --git a/core/src/main/java/org/infinispan/newstatetransfer/StateConsumerImpl.java b/core/src/main/java/org/infinispan/newstatetransfer/StateConsumerImpl.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/org/infinispan/newstatetransfer/StateConsumerImpl.java
+++ b/core/src/main/java/org/infinispan/newstatetransfer/StateConsumerImpl.java
@@ -158,8 +158,12 @@ public class StateConsumerImpl implements StateConsumer {
this.rCh = rCh;
this.wCh = wCh;
- if (configuration.clustering().stateTransfer().fetchInMemoryState()) {
- addedSegments = this.wCh.getSegmentsForOwner(rpcManager.getAddress());
+ if (this.wCh.getMembers().size() != 1) {
+ // There is at least one other member to pull the data from
+ // TODO If this is the initial CH update, we could have multiple joiners but noone to pull the data from
+ if (configuration.clustering().stateTransfer().fetchInMemoryState()) {
+ addedSegments = this.wCh.getSegmentsForOwner(rpcManager.getAddress());
+ }
}
} else {
Set<Integer> oldSegments = this.rCh.getMembers().contains(rpcManager.getAddress()) ? this.rCh.getSegmentsForOwner(rpcManager.getAddress()) : new HashSet<Integer>();
|
ISPN-<I> Don't pull anything if this is the first node to join the cache
|
diff --git a/inject-java/src/main/java/io/micronaut/annotation/processing/BeanDefinitionInjectProcessor.java b/inject-java/src/main/java/io/micronaut/annotation/processing/BeanDefinitionInjectProcessor.java
index <HASH>..<HASH> 100644
--- a/inject-java/src/main/java/io/micronaut/annotation/processing/BeanDefinitionInjectProcessor.java
+++ b/inject-java/src/main/java/io/micronaut/annotation/processing/BeanDefinitionInjectProcessor.java
@@ -1269,14 +1269,14 @@ public class BeanDefinitionInjectProcessor extends AbstractInjectAnnotationProce
}
private ExecutableElementParamInfo populateParameterData(ExecutableElement element) {
+ if (element == null) {
+ return new ExecutableElementParamInfo(false, null);
+ }
AnnotationMetadata elementMetadata = annotationUtils.getAnnotationMetadata(element);
ExecutableElementParamInfo params = new ExecutableElementParamInfo(
modelUtils.isPrivate(element),
elementMetadata
);
- if (element == null) {
- return params;
- }
element.getParameters().forEach(paramElement -> {
String argName = paramElement.getSimpleName().toString();
|
Fix NPE when no constructor is found
|
diff --git a/core/src/test/java/io/undertow/server/handlers/ForwardedHandlerTestCase.java b/core/src/test/java/io/undertow/server/handlers/ForwardedHandlerTestCase.java
index <HASH>..<HASH> 100644
--- a/core/src/test/java/io/undertow/server/handlers/ForwardedHandlerTestCase.java
+++ b/core/src/test/java/io/undertow/server/handlers/ForwardedHandlerTestCase.java
@@ -4,6 +4,7 @@ import io.undertow.server.HttpHandler;
import io.undertow.server.HttpServerExchange;
import io.undertow.testutils.DefaultServer;
import io.undertow.testutils.HttpClientUtils;
+import io.undertow.testutils.ProxyIgnore;
import io.undertow.testutils.TestHttpClient;
import io.undertow.util.Headers;
import io.undertow.util.StatusCodes;
@@ -28,6 +29,7 @@ import static io.undertow.server.handlers.ForwardedHandler.parseHeader;
* @author Stuart Douglas
*/
@RunWith(DefaultServer.class)
+@ProxyIgnore
public class ForwardedHandlerTestCase {
@BeforeClass
|
Ignore test when running with a proxy
|
diff --git a/tq/custom.go b/tq/custom.go
index <HASH>..<HASH> 100644
--- a/tq/custom.go
+++ b/tq/custom.go
@@ -86,7 +86,7 @@ func NewCustomAdapterDownloadRequest(oid string, size int64, action *Action) *cu
}
type customAdapterTerminateRequest struct {
- MessageType string `json:"type"`
+ Event string `json:"event"`
}
func NewCustomAdapterTerminateRequest() *customAdapterTerminateRequest {
|
Fix terminate request from custom transfer, should be “event” not “type”
|
diff --git a/lib/spring/client/status.rb b/lib/spring/client/status.rb
index <HASH>..<HASH> 100644
--- a/lib/spring/client/status.rb
+++ b/lib/spring/client/status.rb
@@ -21,7 +21,7 @@ module Spring
end
def application_pids
- candidates = `ps -o ppid= -o pid=`.lines
+ candidates = `ps -a -o ppid= -o pid=`.lines
candidates.select { |l| l =~ /^#{env.pid} / }
.map { |l| l.split(" ").last }
end
|
Status command list application in all terminals
Fixes #<I>
|
diff --git a/src/physics/quadtree.js b/src/physics/quadtree.js
index <HASH>..<HASH> 100644
--- a/src/physics/quadtree.js
+++ b/src/physics/quadtree.js
@@ -253,7 +253,7 @@
QT_ARRAY_PUSH(this.nodes[i]);
}
// empty the array
- this.nodes.length = 0;
+ this.nodes = [];
// resize the root bounds if required
if (typeof bounds !== "undefined") {
|
[#<I>] small update for code consistency
|
diff --git a/src/Bundle.js b/src/Bundle.js
index <HASH>..<HASH> 100644
--- a/src/Bundle.js
+++ b/src/Bundle.js
@@ -223,7 +223,18 @@ export default class Bundle {
}
const exportDeclaration = otherModule.exports[ importDeclaration.name ];
- return trace( otherModule, exportDeclaration.localName );
+ if ( exportDeclaration ) return trace( otherModule, exportDeclaration.localName );
+
+ for ( let i = 0; i < otherModule.exportDelegates.length; i += 1 ) {
+ const delegate = otherModule.exportDelegates[i];
+ const delegateExportDeclaration = delegate.module.exports[ importDeclaration.name ];
+
+ if ( delegateExportDeclaration ) {
+ return trace( delegate.module, delegateExportDeclaration.localName );
+ }
+ }
+
+ throw new Error( 'Could not trace binding' );
}
function getSafeName ( name ) {
|
handle export * (all function tests now passing)
|
diff --git a/pkg_resources.py b/pkg_resources.py
index <HASH>..<HASH> 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1568,7 +1568,6 @@ class ZipManifests(dict):
for name in zfile.namelist()
)
return dict(items)
-zip_manifests = ZipManifests()
class ContextualZipFile(zipfile.ZipFile):
@@ -1595,6 +1594,7 @@ class ZipProvider(EggProvider):
"""Resource support for zips and eggs"""
eagers = None
+ _zip_manifests = ZipManifests()
def __init__(self, module):
EggProvider.__init__(self, module)
@@ -1620,7 +1620,7 @@ class ZipProvider(EggProvider):
@property
def zipinfo(self):
- return zip_manifests.load(self.loader.archive)
+ return self._zip_manifests.load(self.loader.archive)
def get_resource_filename(self, manager, resource_name):
if not self.egg_name:
|
Create zip_manifests as a class attribute rather than a global
--HG--
extra : amend_source : <I>d<I>c<I>dca<I>e<I>f<I>c<I>ee
|
diff --git a/lib/digital_opera.rb b/lib/digital_opera.rb
index <HASH>..<HASH> 100644
--- a/lib/digital_opera.rb
+++ b/lib/digital_opera.rb
@@ -5,7 +5,10 @@ require "digital_opera/banker"
require "digital_opera/presenter/base"
require "digital_opera/document"
require "digital_opera/form_object"
-require "digital_opera/services/s3"
+
+if defined?(AWS)
+ require "digital_opera/services/s3"
+end
module DigitalOpera
end
\ No newline at end of file
diff --git a/lib/digital_opera/services/s3.rb b/lib/digital_opera/services/s3.rb
index <HASH>..<HASH> 100644
--- a/lib/digital_opera/services/s3.rb
+++ b/lib/digital_opera/services/s3.rb
@@ -1,4 +1,5 @@
require 'aws'
+
## Service for handling interactions with S3
##
module DigitalOpera
|
made the S3 service conditional on AWS actually being installed.
|
diff --git a/alot/command.py b/alot/command.py
index <HASH>..<HASH> 100644
--- a/alot/command.py
+++ b/alot/command.py
@@ -101,7 +101,7 @@ class SearchCommand(Command):
def apply(self, ui):
if self.query:
- if self.query == '*':
+ if self.query == '*' and ui.current_buffer:
s = 'really search for all threads? This takes a while..'
if not ui.choice(s) == 'yes':
return
|
fix: issue with initial searches for *
for the searchstring '*' an orly? prompt is
hardcoded as these tend to take long. Prompts
don't work if the ui is not properly set up.
|
diff --git a/mockgen/tests/vendor_dep/doc.go b/mockgen/tests/vendor_dep/doc.go
index <HASH>..<HASH> 100644
--- a/mockgen/tests/vendor_dep/doc.go
+++ b/mockgen/tests/vendor_dep/doc.go
@@ -1,3 +1,4 @@
package vendor_dep
//go:generate mockgen -package vendor_dep -destination mock.go github.com/golang/mock/mockgen/tests/vendor_dep VendorsDep
+//go:generate mockgen -destination source_mock_package/mock.go -source=vendor_dep.go
|
Add a (failing) test case for using source mode to mock something that depends on a vendored package.
|
diff --git a/spoon-runner/src/main/java/com/squareup/spoon/SpoonDeviceRunner.java b/spoon-runner/src/main/java/com/squareup/spoon/SpoonDeviceRunner.java
index <HASH>..<HASH> 100644
--- a/spoon-runner/src/main/java/com/squareup/spoon/SpoonDeviceRunner.java
+++ b/spoon-runner/src/main/java/com/squareup/spoon/SpoonDeviceRunner.java
@@ -37,6 +37,7 @@ import static com.squareup.spoon.SpoonUtils.obtainRealDevice;
public final class SpoonDeviceRunner {
private static final String FILE_EXECUTION = "execution.json";
private static final String FILE_RESULT = "result.json";
+ private static final int ADB_TIMEOUT = 60 * 1000;
static final String TEMP_DIR = "work";
static final String JUNIT_DIR = "junit-reports";
@@ -176,6 +177,7 @@ public final class SpoonDeviceRunner {
try {
logDebug(debug, "About to actually run tests for [%s]", serial);
RemoteAndroidTestRunner runner = new RemoteAndroidTestRunner(testPackage, testRunner, device);
+ runner.setMaxtimeToOutputResponse(ADB_TIMEOUT);
if (!Strings.isNullOrEmpty(className)) {
if (Strings.isNullOrEmpty(methodName)) {
runner.setClassName(className);
|
Add ADB shell timeout of <I> seconds.
Closes #<I>.
|
diff --git a/pipe.go b/pipe.go
index <HASH>..<HASH> 100644
--- a/pipe.go
+++ b/pipe.go
@@ -338,12 +338,14 @@ func NumberLines() Filter {
}
}
-// Cut emits just the bytes indexed [startOffset..endOffset] of each input item.
-func Cut(startOffset, endOffset int) Filter {
+// Slice emits just the bytes indexed [startOffset..endOffset) of each
+// input item. Note that unlike the "cut" utility, offsets are numbered
+// starting at zero, and the end offset is not included in the output.
+func Slice(startOffset, endOffset int) Filter {
return func(arg Arg) {
for s := range arg.In {
if len(s) > endOffset {
- s = s[:endOffset+1]
+ s = s[:endOffset]
}
if len(s) < startOffset {
s = ""
diff --git a/pipe_test.go b/pipe_test.go
index <HASH>..<HASH> 100644
--- a/pipe_test.go
+++ b/pipe_test.go
@@ -426,7 +426,7 @@ func ExampleNumberLines() {
func ExampleCut() {
pipe.Run(
pipe.Echo("hello", "world."),
- pipe.Cut(2, 4),
+ pipe.Slice(2, 5),
pipe.WriteLines(os.Stdout),
)
// Output:
|
renamed Cut to Slice and made it behave more like Go than the shell cut command
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -230,7 +230,7 @@ and dependencies of wheels
'''
setup(name="symengine",
- version="0.2.1.dev",
+ version="0.3.0.rc0",
description="Python library providing wrappers to SymEngine",
setup_requires=['cython>=0.19.1'],
long_description=long_description,
diff --git a/symengine/__init__.py b/symengine/__init__.py
index <HASH>..<HASH> 100644
--- a/symengine/__init__.py
+++ b/symengine/__init__.py
@@ -33,7 +33,7 @@ if have_numpy:
return f
-__version__ = "0.2.1.dev"
+__version__ = "0.3.0.rc0"
def test():
|
Update to <I>.rc0
|
diff --git a/controls.js b/controls.js
index <HASH>..<HASH> 100644
--- a/controls.js
+++ b/controls.js
@@ -184,18 +184,26 @@ playerControls.updateTimeAndSeekRange = function(event) {
var currentTime = document.getElementById('currentTime');
var seekBar = document.getElementById('seekBar');
+ var showHour = video.duration >= 3600;
var displayTime = video.currentTime;
var prefix = '';
if (playerControls.isLive_) {
// The amount of time we are behind the live edge.
displayTime = Math.max(0, Math.floor(event.end - video.currentTime));
if (displayTime) prefix = '-';
+ showHour = (event.end - event.start) >= 3600;
}
- var m = Math.floor(displayTime / 60);
+ var h = Math.floor(displayTime / 3600);
+ var m = Math.floor((displayTime / 60) % 60);
var s = Math.floor(displayTime % 60);
if (s < 10) s = '0' + s;
- currentTime.innerText = prefix + m + ':' + s;
+ var text = m + ':' + s;
+ if (showHour) {
+ if (m < 10) text = '0' + text;
+ text = h + ':' + text;
+ }
+ currentTime.innerText = prefix + text;
if (playerControls.isLive_) {
seekBar.min = event.start;
|
Add support for hours in the currentTime UI.
Change-Id: Ib2c<I>c8ce4b0d9d<I>be<I>a8bd5f<I>cfde<I>a
|
diff --git a/bugwarrior/config.py b/bugwarrior/config.py
index <HASH>..<HASH> 100644
--- a/bugwarrior/config.py
+++ b/bugwarrior/config.py
@@ -82,6 +82,11 @@ def get_service_password(service, username, oracle=None, interactive=False):
oracle, interactive=True)
if password:
keyring.set_password(service, username, password)
+ elif not interactive and password is None:
+ log.error(
+ 'Unable to retrieve password from keyring. '
+ 'Re-run in interactive mode to set a password'
+ )
elif interactive and oracle == "@oracle:ask_password":
prompt = "%s password: " % service
password = getpass.getpass(prompt)
|
Add a log message to help debug keyring password errors
Helps with reports like #<I>
|
diff --git a/bids/grabbids/bids_layout.py b/bids/grabbids/bids_layout.py
index <HASH>..<HASH> 100644
--- a/bids/grabbids/bids_layout.py
+++ b/bids/grabbids/bids_layout.py
@@ -31,7 +31,7 @@ class BIDSLayout(Layout):
for ext in extensions or []:
with open(pathjoin(root, 'config', '%s.json' % ext)) as fobj:
ext_config = json.load(fobj)
- config['entities'].update(ext_config['entities'])
+ config['entities'].extend(ext_config['entities'])
super(BIDSLayout, self).__init__(path, config,
dynamic_getters=True, **kwargs)
diff --git a/bids/grabbids/tests/test_grabbids.py b/bids/grabbids/tests/test_grabbids.py
index <HASH>..<HASH> 100644
--- a/bids/grabbids/tests/test_grabbids.py
+++ b/bids/grabbids/tests/test_grabbids.py
@@ -114,3 +114,7 @@ def test_exclude(testlayout2):
testlayout2.root, 'models/ds-005_type-russ_sub-all_model.json') \
not in testlayout2.files
assert 'all' not in testlayout2.get_subjects()
+
+
+def test_layout_with_derivs(testlayout3):
+ assert isinstance(testlayout3.files, dict)
|
TEST: Use derivatives fixture, fix error
|
diff --git a/src/rdf2h.js b/src/rdf2h.js
index <HASH>..<HASH> 100644
--- a/src/rdf2h.js
+++ b/src/rdf2h.js
@@ -262,7 +262,7 @@ RDF2h.prototype.getRenderer = function (renderee) {
let types = getTypes(renderee.graphNode).map(t => GraphNode(t, this.rendererGraph));
let renderer = getMatchingRenderer(types, renderee.context);
if (!renderer) {
- throw Error("No renderer found with context: "+renderee.context+" for any of the types "+types.map(t => "<"+t.value+">").join()
+ throw Error("No renderer found with context: <"+renderee.context.value+"> for any of the types "+types.map(t => "<"+t.value+">").join()
+". The resource <"+renderee.graphNode.value+"> could thus not be rendered.");
}
let mustache = renderer.out(vocab.rdf2h("mustache"));
|
error message assmbled more consistently
|
diff --git a/src/com/googlecode/objectify/EntityMetadata.java b/src/com/googlecode/objectify/EntityMetadata.java
index <HASH>..<HASH> 100644
--- a/src/com/googlecode/objectify/EntityMetadata.java
+++ b/src/com/googlecode/objectify/EntityMetadata.java
@@ -139,10 +139,10 @@ public class EntityMetadata<T>
private Field parentField;
/** The fields we persist, not including the @Id or @Parent fields */
- private Set<Field> writeables = new HashSet<Field>();
+ protected Set<Field> writeables = new HashSet<Field>();
/** The things that we read, keyed by name (including @OldName fields and methods). A superset of writeables. */
- private Map<String, Populator> readables = new HashMap<String, Populator>();
+ protected Map<String, Populator> readables = new HashMap<String, Populator>();
/** */
public EntityMetadata(ObjectifyFactory fact, Class<T> clazz)
|
Changed readables and writables to protected so Scott can hack on it :-)
git-svn-id: <URL>
|
diff --git a/js/flowbtc.js b/js/flowbtc.js
index <HASH>..<HASH> 100644
--- a/js/flowbtc.js
+++ b/js/flowbtc.js
@@ -12,7 +12,6 @@ module.exports = class flowbtc extends ndax {
'id': 'flowbtc',
'name': 'flowBTC',
'countries': [ 'BR' ], // Brazil
- 'version': 'v1',
'rateLimit': 1000,
'urls': {
'logo': 'https://user-images.githubusercontent.com/51840849/87443317-01c0d080-c5fe-11ea-95c2-9ebe1a8fafd9.jpg',
|
flowbtc api upgraded close #<I>
|
diff --git a/components/messages.js b/components/messages.js
index <HASH>..<HASH> 100644
--- a/components/messages.js
+++ b/components/messages.js
@@ -469,7 +469,7 @@ SteamUser.prototype._handleNetMessage = function(buffer) {
let sessionID = (header.proto && header.proto.client_sessionid) || header.sessionID;
let steamID = (header.proto && header.proto.steamid) || header.steamID;
- if (steamID && sessionID && sessionID != this._sessionID) {
+ if (steamID && sessionID && (sessionID != this._sessionID || steamID.toString() != this.steamID.toString())) {
this._sessionID = sessionID;
this.steamID = new SteamID(steamID.toString());
delete this._tempSteamID;
|
Reset steamID prop if it's different from header SteamID
|
diff --git a/packages/@vue/cli-plugin-typescript/__tests__/tsPluginESLint.spec.js b/packages/@vue/cli-plugin-typescript/__tests__/tsPluginESLint.spec.js
index <HASH>..<HASH> 100644
--- a/packages/@vue/cli-plugin-typescript/__tests__/tsPluginESLint.spec.js
+++ b/packages/@vue/cli-plugin-typescript/__tests__/tsPluginESLint.spec.js
@@ -1,4 +1,4 @@
-jest.setTimeout(10000)
+jest.setTimeout(60000)
const create = require('@vue/cli-test-utils/createTestProject')
|
test: bump timeout, fixes AppVeyor CI
|
diff --git a/Qt.py b/Qt.py
index <HASH>..<HASH> 100644
--- a/Qt.py
+++ b/Qt.py
@@ -79,6 +79,9 @@ def _pyside2():
def load_ui(ui_filepath, *args, **kwargs):
"""Wrap QtUiTools.QUiLoader().load()
for compatibility against PyQt5.uic.loadUi()
+
+ Args:
+ ui_filepath (str): The filepath to the .ui file
"""
from PySide2 import QtUiTools
return QtUiTools.QUiLoader().load(ui_filepath)
@@ -99,6 +102,9 @@ def _pyside():
def load_ui(ui_filepath, *args, **kwargs):
"""Wrap QtUiTools.QUiLoader().load()
for compatibility against PyQt5.uic.loadUi()
+
+ Args:
+ ui_filepath (str): The filepath to the .ui file
"""
from PySide import QtUiTools
return QtUiTools.QUiLoader().load(ui_filepath)
|
Added args description to docstrings
|
diff --git a/Lib/fontbakery/profiles/shaping.py b/Lib/fontbakery/profiles/shaping.py
index <HASH>..<HASH> 100644
--- a/Lib/fontbakery/profiles/shaping.py
+++ b/Lib/fontbakery/profiles/shaping.py
@@ -88,13 +88,18 @@ def create_report_item(vharfbuzz,
message += f"\n\n<pre>Got : {serialized_buf1}</pre>\n\n"
if buf2:
if isinstance(buf2, FakeBuffer):
- serialized_buf2 = vharfbuzz.serialize_buf(buf2)
+ try:
+ serialized_buf2 = vharfbuzz.serialize_buf(buf2)
+ except Exception:
+ # This may fail if the glyphs are not found in the font
+ serialized_buf2 = None
+ buf2 = None # Don't try to draw it either
else:
serialized_buf2 = buf2
message += f"\n\n<pre>Expected: {serialized_buf2}</pre>\n\n"
# Report a diff table
- if serialized_buf1:
+ if serialized_buf1 and serialized_buf2:
diff = list(ndiff([serialized_buf1], [serialized_buf2]))
if diff and diff[-1][0] == "?":
message += f"\n\n<pre> {diff[-1][1:]}</pre>\n\n"
|
Be more robust when the glyphs are not present
|
diff --git a/src/functions.php b/src/functions.php
index <HASH>..<HASH> 100644
--- a/src/functions.php
+++ b/src/functions.php
@@ -72,7 +72,7 @@ function uri_for($uri)
* @param resource|string|null|int|float|bool|StreamInterface|callable $resource Entity body data
* @param array $options Additional options
*
- * @return Stream
+ * @return StreamInterface
* @throws \InvalidArgumentException if the $resource arg is not valid.
*/
function stream_for($resource = '', array $options = [])
|
Fix the return typehint in docblock of stream_for function (#<I>)
|
diff --git a/nodash.js b/nodash.js
index <HASH>..<HASH> 100644
--- a/nodash.js
+++ b/nodash.js
@@ -507,7 +507,7 @@ function makeNodash(options, undefined) {
return false;
});
- register('/=', 'neq', 'NEQ', function _neq(a, b) {
+ register('/=', '!=', '<>', 'neq', 'NEQ', function _neq(a, b) {
return !Nodash.eq(a, b);
});
|
Added != and <> aliases
|
diff --git a/lurklib/__init__.py b/lurklib/__init__.py
index <HASH>..<HASH> 100644
--- a/lurklib/__init__.py
+++ b/lurklib/__init__.py
@@ -2,7 +2,7 @@ import socket, time, sys, select
from . import channel, connection, optional, sending, squeries, uqueries
try: import ssl
except ImportError: ssl = None
-__version__ = 'Beta 2 AKA 0.4.6.1'
+__version__ = 'Beta 2 AKA 0.4.7'
class irc:
@@ -93,8 +93,8 @@ class irc:
self.KEYSET = self.IRCError
self.PASSWDMISMATCH = self.IRCError
self.NOCHANMODES = self.IRCError
- self.AlreadyInChannel = Exception
- self.NotInChannel = Exception
+ self.AlreadyInChannel = self.IRCError
+ self.NotInChannel = self.IRCError
self.UnhandledEvent = Exception
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from distutils.core import setup
setup (\
name='lurklib',
packages=['lurklib'],
- version='0.4.6.1',
+ version='0.4.7',
author='LK-',
license='GPL V3',
author_email='lk.codeshock@gmail.com',
|
Changed irc.AlreadyInChannel and irc.NotInChannel exceptions to irc.IRCError exception class.
|
diff --git a/pmagpy/pmag.py b/pmagpy/pmag.py
index <HASH>..<HASH> 100755
--- a/pmagpy/pmag.py
+++ b/pmagpy/pmag.py
@@ -9280,7 +9280,7 @@ def mktk03(terms, seed, G2, G3):
g10, sfact, afact = -18e3, 3.8, 2.4
g20 = G2 * g10
g30 = G3 * g10
- alpha = old_div(g10, afact)
+ alpha = g10/afact
s1 = s_l(1, alpha)
s10 = sfact * s1
gnew = random.normal(g10, s10)
|
modified: pmag.py
|
diff --git a/hcn/hcnpolicy.go b/hcn/hcnpolicy.go
index <HASH>..<HASH> 100644
--- a/hcn/hcnpolicy.go
+++ b/hcn/hcnpolicy.go
@@ -167,10 +167,10 @@ type L4ProxyPolicySetting struct {
OutboundNat bool `json:",omitempty"`
// For the WFP proxy
- FilterTuple FiveTuple `json:",omitempty"`
- ProxyType ProxyType `json:",omitempty"`
- UserSID string `json:",omitempty"`
- NetworkCompartmentID uint32 `json:",omitempty"`
+ FilterTuple FiveTuple `json:",omitempty"`
+ ProxyType ProxyType `json:",omitempty"`
+ UserSID string `json:",omitempty"`
+ CompartmentID uint32 `json:",omitempty"`
}
// PortnameEndpointPolicySetting sets the port name for an endpoint.
|
Use the right field name in L4ProxyPolicySetting
WFP expects the field "CompartmentID", not "NetworkCompartmentID".
Passing the wrong field causes it to be silently ignored, but the proxy
would be misconfigured.
|
diff --git a/src/rez/serialise.py b/src/rez/serialise.py
index <HASH>..<HASH> 100644
--- a/src/rez/serialise.py
+++ b/src/rez/serialise.py
@@ -3,7 +3,6 @@ Read and write data from file. File caching via a memcached server is supported.
"""
from contextlib import contextmanager
from inspect import isfunction, ismodule, getargspec
-from StringIO import StringIO
import sys
import stat
import os
@@ -21,6 +20,7 @@ from rez.utils.system import add_sys_paths
from rez.config import config
from rez.vendor.atomicwrites import atomic_write
from rez.vendor.enum import Enum
+from rez.vendor.six.six.moves import StringIO
from rez.vendor import yaml
diff --git a/src/rez/tests/util.py b/src/rez/tests/util.py
index <HASH>..<HASH> 100644
--- a/src/rez/tests/util.py
+++ b/src/rez/tests/util.py
@@ -211,7 +211,7 @@ def get_cli_output(args):
"""
import sys
- from StringIO import StringIO
+ from rez.vendor.six.six.moves import StringIO
command = args[0]
other_args = list(args[1:])
|
import StringIO from six.moves
|
diff --git a/hilbert/tests/runtests.py b/hilbert/tests/runtests.py
index <HASH>..<HASH> 100644
--- a/hilbert/tests/runtests.py
+++ b/hilbert/tests/runtests.py
@@ -21,6 +21,7 @@ if not settings.configured:
'hilbert',
),
ROOT_URLCONF='hilbert.tests.urls',
+ SITE_ID=1,
TEST_RUNNER='hilbert.test.CoverageRunner',
COVERAGE_MODULES=(
'decorators',
|
Fix runtests to pass on Django <I>.
|
diff --git a/simuvex/procedures/libc___so___6/recvfrom.py b/simuvex/procedures/libc___so___6/recvfrom.py
index <HASH>..<HASH> 100644
--- a/simuvex/procedures/libc___so___6/recvfrom.py
+++ b/simuvex/procedures/libc___so___6/recvfrom.py
@@ -8,6 +8,5 @@ class recvfrom(simuvex.SimProcedure):
#pylint:disable=arguments-differ
def run(self, fd, dst, length, flags): #pylint:disable=unused-argument
- data = self.state.posix.read(fd, length)
- self.state.memory.store(dst, data)
- return length
+ bytes_recvd = self.state.posix.read(fd, dst, self.state.se.any_int(length))
+ return bytes_recvd
|
Fix recvfrom
posix.read() takes exactly 4 arguments
original fix was proposed by Yiming Jing
|
diff --git a/src/GraphQL/ReadOneAreaResolver.php b/src/GraphQL/ReadOneAreaResolver.php
index <HASH>..<HASH> 100644
--- a/src/GraphQL/ReadOneAreaResolver.php
+++ b/src/GraphQL/ReadOneAreaResolver.php
@@ -3,7 +3,9 @@
namespace DNADesign\Elemental\GraphQL;
use DNADesign\Elemental\Models\ElementalArea;
+use Exception;
use GraphQL\Type\Definition\ResolveInfo;
+use InvalidArgumentException;
use SilverStripe\GraphQL\OperationResolver;
class ReadOneAreaResolver implements OperationResolver
@@ -12,8 +14,12 @@ class ReadOneAreaResolver implements OperationResolver
{
$area = ElementalArea::get()->byID($args['ID']);
+ if (!$area) {
+ throw new InvalidArgumentException('Could not find elemental area matching ID ' . $args['ID']);
+ }
+
if (!$area->canView($context['currentUser'])) {
- throw new \Exception('Current user cannot view element areas');
+ throw new Exception('Current user cannot view element areas');
}
return $area;
|
FIX Assert elemental areas exist before calling methods on them
|
diff --git a/lib/collection.js b/lib/collection.js
index <HASH>..<HASH> 100644
--- a/lib/collection.js
+++ b/lib/collection.js
@@ -244,6 +244,11 @@ Collection.prototype.findAndModify = function (query, update, opts, fn) {
opts = opts || {};
+ // `new` defaults to `true` for upserts
+ if (null == opts.new && opts.upsert) {
+ opts.new = true;
+ }
+
if (fn) {
promise.on('complete', fn);
}
|
Enhanced findAndModify default behavior for upserts.
|
diff --git a/lib/Post.php b/lib/Post.php
index <HASH>..<HASH> 100644
--- a/lib/Post.php
+++ b/lib/Post.php
@@ -213,7 +213,7 @@ class Post extends Core implements CoreInterface {
* Determined whether or not an admin/editor is looking at the post in "preview mode" via the
* WordPress admin
* @internal
- * @return bool
+ * @return bool
*/
protected static function is_previewing() {
global $wp_query;
@@ -1071,7 +1071,7 @@ class Post extends Core implements CoreInterface {
public function date( $date_format = '' ) {
$df = $date_format ? $date_format : get_option('date_format');
$the_date = (string) mysql2date($df, $this->post_date);
- return apply_filters('get_the_date', $the_date, $df);
+ return apply_filters('get_the_date', $the_date, $df, $this->id);
}
/**
@@ -1095,7 +1095,7 @@ class Post extends Core implements CoreInterface {
public function time( $time_format = '' ) {
$tf = $time_format ? $time_format : get_option('time_format');
$the_time = (string) mysql2date($tf, $this->post_date);
- return apply_filters('get_the_time', $the_time, $tf);
+ return apply_filters('get_the_time', $the_time, $tf, $this->id);
}
|
Changed usage 'get_the_date' and 'get_the_time' filters according WP core: third post id param is added
|
diff --git a/src/devTools.js b/src/devTools.js
index <HASH>..<HASH> 100644
--- a/src/devTools.js
+++ b/src/devTools.js
@@ -63,7 +63,7 @@ function init(options) {
socket = socketCluster.connect(options && options.port ? options : socketOptions);
socket.on('error', function (err) {
- console.error(err);
+ console.warn(err);
});
socket.emit('login', 'master', (err, channelName) => {
|
Just warn when socket is not available instead of showing errors, not to be caught inside the app
|
diff --git a/js/tbone_test.js b/js/tbone_test.js
index <HASH>..<HASH> 100644
--- a/js/tbone_test.js
+++ b/js/tbone_test.js
@@ -147,12 +147,16 @@ var test_strings = [
, "“Hello World!”"
, "Fred" + String.fromCharCode(180) + "s Car"
, "Fred" + String.fromCharCode(8217) + "s Car"
+ , "this is\nanother line."
+ , "&\nthat was it."
];
var expected_strings = [
"Hello World!"
, "“Hello World!”"
, "Fred´s Car"
, "Fred’s Car"
+ , "this is
another line."
+ , "&
that was it."
];
var result_string;
|
Added a test for new line handling.
|
diff --git a/lib/record_cache/version_store.rb b/lib/record_cache/version_store.rb
index <HASH>..<HASH> 100644
--- a/lib/record_cache/version_store.rb
+++ b/lib/record_cache/version_store.rb
@@ -4,7 +4,7 @@ module RecordCache
def initialize(store)
[:increment, :write, :read, :read_multi, :delete].each do |method|
- raise "Store #{store.inspect} must respond to #{method}" unless store.respond_to?(method)
+ raise "Store #{store.class.name} must respond to #{method}" unless store.respond_to?(method)
end
@store = store
end
diff --git a/spec/lib/version_store_spec.rb b/spec/lib/version_store_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/lib/version_store_spec.rb
+++ b/spec/lib/version_store_spec.rb
@@ -9,7 +9,7 @@ describe RecordCache::VersionStore do
end
it "should only accept ActiveSupport cache stores" do
- lambda { RecordCache::VersionStore.new(Object.new) }.should raise_error("Must be an ActiveSupport::Cache::Store")
+ lambda { RecordCache::VersionStore.new(Object.new) }.should raise_error("Store Object must respond to increment")
end
context "current" do
|
Accept Dalli 2 as a version store + spec
|
diff --git a/mod/quiz/attemptlib.php b/mod/quiz/attemptlib.php
index <HASH>..<HASH> 100644
--- a/mod/quiz/attemptlib.php
+++ b/mod/quiz/attemptlib.php
@@ -539,6 +539,7 @@ class quiz_attempt extends quiz {
case QUESTION_EVENTSAVE:
case QUESTION_EVENTGRADE:
+ case QUESTION_EVENTSUBMIT:
return 'answered';
case QUESTION_EVENTCLOSEANDGRADE:
|
MDL-<I> error unexpected event exception in essay question
|
diff --git a/karma.saucelabs.conf.js b/karma.saucelabs.conf.js
index <HASH>..<HASH> 100644
--- a/karma.saucelabs.conf.js
+++ b/karma.saucelabs.conf.js
@@ -30,12 +30,6 @@ var customLaunchers = {
base: 'SauceLabs',
browserName: 'internet explorer',
platform: 'Windows 10'
- },
- win7ie9: {
- base: 'SauceLabs',
- browserName: 'internet explorer',
- platform: 'Windows 7',
- version: '9.0'
}
}
|
Moving to available browsers in saucelabs
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -56,7 +56,7 @@ setup(
data_files=[(
(BASE_DIR, ['data/nssm_original.exe'])
)],
- install_requires=['indy-plenum-dev==1.2.205',
+ install_requires=['indy-plenum-dev==1.2.212',
'indy-anoncreds-dev==1.0.32',
'python-dateutil',
'timeout-decorator'],
|
INDY-<I>: Updated indy-plenum dependency (#<I>)
|
diff --git a/packages/dai-plugin-governance/src/GovPollingService.js b/packages/dai-plugin-governance/src/GovPollingService.js
index <HASH>..<HASH> 100644
--- a/packages/dai-plugin-governance/src/GovPollingService.js
+++ b/packages/dai-plugin-governance/src/GovPollingService.js
@@ -244,7 +244,8 @@ export default class GovPollingService extends PrivateService {
rounds: 1,
winner: null,
totalMkrParticipation,
- options: {}
+ options: {},
+ numVoters: votes.length
};
const defaultOptionObj = {
firstChoice: BigNumber(0),
|
add num voters to ranked choice tally
|
diff --git a/h5p.classes.php b/h5p.classes.php
index <HASH>..<HASH> 100644
--- a/h5p.classes.php
+++ b/h5p.classes.php
@@ -1240,7 +1240,9 @@ class H5PContentValidator {
// Check if string is according to optional regexp in semantics
if (isset($semantics->regexp)) {
- $pattern = '|' . $semantics->regexp->pattern . '|';
+ // Note: '|' used as regexp fence, to allow / in actual patterns.
+ // But also escaping '|' found in patterns, so that is valid too.
+ $pattern = '|' . str_replace('|', '\\|', $semantics->regexp->pattern) . '|';
$pattern .= isset($semantics->regexp->modifiers) ? $semantics->regexp->modifiers : '';
if (preg_match($pattern, $text) === 0) {
// Note: explicitly ignore return value FALSE, to avoid removing text
|
Escape '|' characters in regexp
|
diff --git a/lib/userlist/push/client.rb b/lib/userlist/push/client.rb
index <HASH>..<HASH> 100644
--- a/lib/userlist/push/client.rb
+++ b/lib/userlist/push/client.rb
@@ -40,7 +40,7 @@ module Userlist
request['Content-Type'] = 'application/json; charset=UTF-8'
request.body = JSON.dump(payload)
- logger.debug "Sending #{request.method} to #{endpoint}#{request.path} with body #{request.body}"
+ logger.debug "Sending #{request.method} to #{URI.join(endpoint, request.path)} with body #{request.body}"
http.request(request)
end
|
Improves debug output by properly joining URI segments
|
diff --git a/cassandra_test.go b/cassandra_test.go
index <HASH>..<HASH> 100644
--- a/cassandra_test.go
+++ b/cassandra_test.go
@@ -1132,6 +1132,8 @@ func TestPreparedCacheEviction(t *testing.T) {
t.Fatalf("insert into prepcachetest failed, error '%v'", err)
}
+ stmtsLRU.Lock()
+
//Make sure the cache size is maintained
if stmtsLRU.lru.Len() != stmtsLRU.lru.MaxEntries {
t.Fatalf("expected cache size of %v, got %v", stmtsLRU.lru.MaxEntries, stmtsLRU.lru.Len())
@@ -1154,8 +1156,10 @@ func TestPreparedCacheEviction(t *testing.T) {
_, ok = stmtsLRU.lru.Get(session.cfg.Hosts[i] + ":9042gocql_testSELECT id,mod FROM prepcachetest WHERE id = 0")
selEvict = selEvict || !ok
-
}
+
+ stmtsLRU.Unlock()
+
if !selEvict {
t.Fatalf("expected first select statement to be purged, but statement was found in the cache.")
}
|
Get and Len are not thread safe
Fixes a race condition when checking items inside the prepared
statement cache during tests.
|
diff --git a/src/Twig/Handler/AdminHandler.php b/src/Twig/Handler/AdminHandler.php
index <HASH>..<HASH> 100644
--- a/src/Twig/Handler/AdminHandler.php
+++ b/src/Twig/Handler/AdminHandler.php
@@ -280,7 +280,7 @@ class AdminHandler
public function hclass($classes, $raw = false)
{
if (is_array($classes)) {
- $classes = join(' ', $classes);
+ $classes = join(' ', $classes);
}
$classes = preg_split('/ +/', trim($classes));
$classes = join(' ', $classes);
|
It seems like the identation of this line is off - right, Scruti!
|
diff --git a/python_modules/libraries/dagster-aws/setup.py b/python_modules/libraries/dagster-aws/setup.py
index <HASH>..<HASH> 100644
--- a/python_modules/libraries/dagster-aws/setup.py
+++ b/python_modules/libraries/dagster-aws/setup.py
@@ -27,7 +27,7 @@ if __name__ == "__main__":
],
packages=find_packages(exclude=["test"]),
include_package_data=True,
- install_requires=["boto3>=1.9", "dagster", "psycopg2-binary", "requests",],
+ install_requires=["boto3>=1.9", "dagster", "packaging", "psycopg2-binary", "requests"],
extras_require={"pyspark": ["dagster-pyspark"]},
zip_safe=False,
)
|
Add missing packaging dependency in dagster-aws
Summary: As the title.
Test Plan: bk, eks dev works
Reviewers: johann, alangenfeld, nate
Reviewed By: nate
Differential Revision: <URL>
|
diff --git a/support/cas-server-support-hazelcast-ticket-registry/src/test/java/org/apereo/cas/ticket/registry/config/DefaultHazelcastInstanceConfigurationTests.java b/support/cas-server-support-hazelcast-ticket-registry/src/test/java/org/apereo/cas/ticket/registry/config/DefaultHazelcastInstanceConfigurationTests.java
index <HASH>..<HASH> 100644
--- a/support/cas-server-support-hazelcast-ticket-registry/src/test/java/org/apereo/cas/ticket/registry/config/DefaultHazelcastInstanceConfigurationTests.java
+++ b/support/cas-server-support-hazelcast-ticket-registry/src/test/java/org/apereo/cas/ticket/registry/config/DefaultHazelcastInstanceConfigurationTests.java
@@ -67,7 +67,6 @@ public class DefaultHazelcastInstanceConfigurationTests {
assertNotNull(mapConfig);
assertEquals(28800, mapConfig.getMaxIdleSeconds());
assertEquals(EvictionPolicy.LRU, mapConfig.getEvictionPolicy());
- assertEquals(10, mapConfig.getEvictionPercentage());
}
@After
|
Removed deprecated prop from HZ config;
cleaned up pac4j prop mgmt
|
diff --git a/can/interfaces/vector/canlib.py b/can/interfaces/vector/canlib.py
index <HASH>..<HASH> 100644
--- a/can/interfaces/vector/canlib.py
+++ b/can/interfaces/vector/canlib.py
@@ -670,8 +670,7 @@ class VectorBus(BusABC):
hardware channel.
:raises can.interfaces.vector.VectorInitializationError:
- Raises a VectorError when the application name does not exist in
- Vector Hardware Configuration.
+ If the application name does not exist in the Vector hardware configuration.
"""
hw_type = ctypes.c_uint()
hw_index = ctypes.c_uint()
@@ -722,8 +721,7 @@ class VectorBus(BusABC):
The channel index of the interface.
:raises can.interfaces.vector.VectorInitializationError:
- Raises a VectorError when the application name does not exist in
- Vector Hardware Configuration.
+ If the application name does not exist in the Vector hardware configuration.
"""
xldriver.xlSetApplConfig(
app_name.encode(),
|
improve docstrings related to exceptions
|
diff --git a/src/Speller.php b/src/Speller.php
index <HASH>..<HASH> 100644
--- a/src/Speller.php
+++ b/src/Speller.php
@@ -143,8 +143,8 @@ abstract class Speller
* @param string $language A two-letter, ISO 639-1 code of the language to spell the amount in.
* @param string $currency A three-letter, ISO 4217 currency code.
* @param bool $requireDecimal If true, output decimals even if the value is 0.
- * @param bool $spellDecimal If true, spell decimals out same as whole numbers;
- * otherwise, output decimals as numbers.
+ * @param bool $spellDecimal If true, spell the decimal part out same as the whole part;
+ * otherwise, spell only the whole part and output the decimal part as integer.
* @return string The currency as written in words in the specified language.
* @throws InvalidArgumentException If any parameter is invalid.
*/
|
Updating this parameter's description to be more clear.
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.