diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -50,4 +50,4 @@ setup(name = 'logdissect', version = str(__version__),
"Natural Language :: English",
"Operating System :: POSIX",
"Programming Language :: Python :: 2",
- "Topic :: System :: System Administration"])
+ "Topic :: System :: System Administrations"])
|
Update classifiers in setup.py
|
diff --git a/store.go b/store.go
index <HASH>..<HASH> 100644
--- a/store.go
+++ b/store.go
@@ -98,7 +98,9 @@ func (c *controller) getNetworkFromStore(nid string) (*network, error) {
}
n.epCnt = ec
- n.scope = store.Scope()
+ if n.scope == "" {
+ n.scope = store.Scope()
+ }
return n, nil
}
@@ -132,7 +134,9 @@ func (c *controller) getNetworksForScope(scope string) ([]*network, error) {
}
n.epCnt = ec
- n.scope = scope
+ if n.scope == "" {
+ n.scope = scope
+ }
nl = append(nl, n)
}
@@ -171,7 +175,9 @@ func (c *controller) getNetworksFromStore() ([]*network, error) {
ec.n = n
n.epCnt = ec
}
- n.scope = store.Scope()
+ if n.scope == "" {
+ n.scope = store.Scope()
+ }
n.Unlock()
nl = append(nl, n)
}
|
Do not reset network scope during store read
- Unless it is needed
|
diff --git a/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraMetadata.java b/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraMetadata.java
index <HASH>..<HASH> 100644
--- a/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraMetadata.java
+++ b/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraMetadata.java
@@ -185,7 +185,7 @@ public class CassandraMetadata
private List<SchemaTableName> listTables(ConnectorSession session, SchemaTablePrefix prefix)
{
- if (prefix.getSchemaName() == null || prefix.getTableName() == null) {
+ if (prefix.getTableName() == null) {
return listTables(session, prefix.getSchemaName());
}
return ImmutableList.of(new SchemaTableName(prefix.getSchemaName(), prefix.getTableName()));
|
Simplify condition
`SchemaTablePrefix.schemaName` being null implies its `tableName` to be
null as well.
|
diff --git a/lib/Elastica/Client.php b/lib/Elastica/Client.php
index <HASH>..<HASH> 100644
--- a/lib/Elastica/Client.php
+++ b/lib/Elastica/Client.php
@@ -674,7 +674,7 @@ class Client
* @param array $query OPTIONAL Query params
* @param string $contentType Content-Type sent with this request
*
- * @throws Exception\ConnectionException|\Exception
+ * @throws Exception\ConnectionException|Exception\ClientException
*
* @return Response Response object
*/
|
Improve PHPDoc annotation (#<I>)
Change generic \Exception to more specific one.
|
diff --git a/lib/webpacker/compiler.rb b/lib/webpacker/compiler.rb
index <HASH>..<HASH> 100644
--- a/lib/webpacker/compiler.rb
+++ b/lib/webpacker/compiler.rb
@@ -18,9 +18,8 @@ class Webpacker::Compiler
def compile
if stale?
- record_compilation_digest
run_webpack.tap do |success|
- remove_compilation_digest if !success
+ record_compilation_digest if success
end
else
true
@@ -54,11 +53,6 @@ class Webpacker::Compiler
compilation_digest_path.write(watched_files_digest)
end
- def remove_compilation_digest
- compilation_digest_path.delete if compilation_digest_path.exist?
- rescue Errno::ENOENT, Errno::ENOTDIR
- end
-
def run_webpack
logger.info "Compiling…"
|
Only record compilation digest if webpack runs successfully. (#<I>)
This fixes an issue where current request gets an stale pack,
because previous request wrote the compilation digest before
webpack ends up running.
|
diff --git a/integration/v3_watch_test.go b/integration/v3_watch_test.go
index <HASH>..<HASH> 100644
--- a/integration/v3_watch_test.go
+++ b/integration/v3_watch_test.go
@@ -1128,9 +1128,13 @@ func TestV3WatchWithFilter(t *testing.T) {
}
func TestV3WatchWithPrevKV(t *testing.T) {
+ defer testutil.AfterTest(t)
clus := NewClusterV3(t, &ClusterConfig{Size: 1})
defer clus.Terminate(t)
+ wctx, wcancel := context.WithCancel(context.Background())
+ defer wcancel()
+
tests := []struct {
key string
end string
@@ -1150,7 +1154,7 @@ func TestV3WatchWithPrevKV(t *testing.T) {
t.Fatal(err)
}
- ws, werr := toGRPC(clus.RandClient()).Watch.Watch(context.TODO())
+ ws, werr := toGRPC(clus.RandClient()).Watch.Watch(wctx)
if werr != nil {
t.Fatal(werr)
}
|
integration: cancel Watch when TestV3WatchWithPrevKV exits
Missing ctx cancel was causing goroutine leaks for the proxy tests.
|
diff --git a/src/Net/HTTP/Request.php b/src/Net/HTTP/Request.php
index <HASH>..<HASH> 100644
--- a/src/Net/HTTP/Request.php
+++ b/src/Net/HTTP/Request.php
@@ -123,7 +123,7 @@ class Net_HTTP_Request extends ADT_List_Dictionary
}*/
$this->setMethod( strtoupper( getEnv( 'REQUEST_METHOD' ) ) ); // store HTTP method
- $this->body = file_get_contents( "php://input" ); // store raw post or file data
+ $this->body = file_get_contents( "php://input" ); // store raw POST, PUT or FILE data
}
public function fromString( $request )
@@ -251,13 +251,15 @@ class Net_HTTP_Request extends ADT_List_Dictionary
{
# remark( 'R:remove: '.$key );
parent::remove( $key );
- $this->body = http_build_query( $this->getAll(), NULL, '&' );
+// if( $this->method === "POST" )
+// $this->body = http_build_query( $this->getAll(), NULL, '&' );
}
public function set( $key, $value )
{
parent::set( $key, $value );
- $this->body = http_build_query( $this->getAll(), NULL, '&' );
+// if( $this->method === "POST" )
+// $this->body = http_build_query( $this->getAll(), NULL, '&' );
}
public function setAjax( $value = 'X-Requested-With' )
|
Disable update of body while setting or removing parameters.
|
diff --git a/admin/index.php b/admin/index.php
index <HASH>..<HASH> 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -71,7 +71,7 @@
$db->debug=false;
if (set_field("config", "value", "$version", "name", "version")) {
notify($strdatabasesuccess);
- print_continue("$CFG->wwwroot");
+ print_continue("index.php");
die;
} else {
notify("Upgrade failed! (Could not update version in config table)");
|
After upgrading version, stay on admin page rather than going to home
page, just in case there is more to do.
|
diff --git a/cmd/tiller/tiller.go b/cmd/tiller/tiller.go
index <HASH>..<HASH> 100644
--- a/cmd/tiller/tiller.go
+++ b/cmd/tiller/tiller.go
@@ -68,10 +68,10 @@ var rootCommand = &cobra.Command{
}
func main() {
- pf := rootCommand.PersistentFlags()
- pf.StringVarP(&grpcAddr, "listen", "l", ":44134", "address:port to listen on")
- pf.StringVar(&store, "storage", storageConfigMap, "storage driver to use. One of 'configmap' or 'memory'")
- pf.BoolVar(&enableTracing, "trace", false, "enable rpc tracing")
+ p := rootCommand.PersistentFlags()
+ p.StringVarP(&grpcAddr, "listen", "l", ":44134", "address:port to listen on")
+ p.StringVar(&store, "storage", storageConfigMap, "storage driver to use. One of 'configmap' or 'memory'")
+ p.BoolVar(&enableTracing, "trace", false, "enable rpc tracing")
rootCommand.Execute()
}
|
change var naming to match helm
|
diff --git a/sdk/python/sawtooth_sdk/consensus/zmq_service.py b/sdk/python/sawtooth_sdk/consensus/zmq_service.py
index <HASH>..<HASH> 100644
--- a/sdk/python/sawtooth_sdk/consensus/zmq_service.py
+++ b/sdk/python/sawtooth_sdk/consensus/zmq_service.py
@@ -80,7 +80,7 @@ class ZmqService(Service):
# -- Block Creation --
- def initialize_block(self, previous_id):
+ def initialize_block(self, previous_id=None):
request = (
consensus_pb2.ConsensusInitializeBlockRequest(
previous_id=previous_id)
|
Give Python CSDK initialize_block default None arg
This is specified by the interface.
|
diff --git a/languagetool-standalone/src/main/java/org/languagetool/gui/LanguageToolSupport.java b/languagetool-standalone/src/main/java/org/languagetool/gui/LanguageToolSupport.java
index <HASH>..<HASH> 100644
--- a/languagetool-standalone/src/main/java/org/languagetool/gui/LanguageToolSupport.java
+++ b/languagetool-standalone/src/main/java/org/languagetool/gui/LanguageToolSupport.java
@@ -811,7 +811,9 @@ class LanguageToolSupport {
private void removeHighlights() {
for (Highlighter.Highlight hl : textComponent.getHighlighter().getHighlights()) {
- textComponent.getHighlighter().removeHighlight(hl);
+ if (hl.getPainter() instanceof HighlightPainter) {
+ textComponent.getHighlighter().removeHighlight(hl);
+ }
}
}
|
fix drawing problems: selected text could sometimes disappear (e.g. when selecting text after start up, but before the first errors were marked)
|
diff --git a/src/Event/Http/HttpRequestEvent.php b/src/Event/Http/HttpRequestEvent.php
index <HASH>..<HASH> 100644
--- a/src/Event/Http/HttpRequestEvent.php
+++ b/src/Event/Http/HttpRequestEvent.php
@@ -38,7 +38,7 @@ final class HttpRequestEvent implements LambdaEvent
throw new InvalidLambdaEvent('API Gateway or ALB', $event);
}
- $this->payloadVersion = (float) $event['version'];
+ $this->payloadVersion = (float) ($event['version'] ?? '1.0');
$this->event = $event;
$this->queryString = $this->rebuildQueryString();
$this->headers = $this->extractHeaders();
|
Default HTTP request event version to <I>
|
diff --git a/lib/chef_zero/server.rb b/lib/chef_zero/server.rb
index <HASH>..<HASH> 100644
--- a/lib/chef_zero/server.rb
+++ b/lib/chef_zero/server.rb
@@ -300,8 +300,8 @@ module ChefZero
#
def stop(wait = 5)
if @running
- @server.shutdown
- @thread.join(wait)
+ @server.shutdown if @server
+ @thread.join(wait) if @thread
end
rescue Timeout::Error
if @thread
|
Handle exceptional conditions where stops are being called all over
|
diff --git a/lib/fuel-soap.js b/lib/fuel-soap.js
index <HASH>..<HASH> 100644
--- a/lib/fuel-soap.js
+++ b/lib/fuel-soap.js
@@ -283,11 +283,11 @@ FuelSoap.prototype.makeRequest = function (action, req, callback) {
requestOptions.headers = this.defaultHeaders;
requestOptions.headers.SOAPAction = action;
- this.AuthClient.on('error', function (err) {
+ this.AuthClient.once('error', function (err) {
console.log(err);
});
- this.AuthClient.on('response', function (body) {
+ this.AuthClient.once('response', function (body) {
var env = self.buildEnvelope(req, body.accessToken);
console.log(env);
|
Changed AuthClient binding from .on to .once.
|
diff --git a/TYPO3.TYPO3CR/Classes/TYPO3/TYPO3CR/Domain/Model/AbstractNodeData.php b/TYPO3.TYPO3CR/Classes/TYPO3/TYPO3CR/Domain/Model/AbstractNodeData.php
index <HASH>..<HASH> 100644
--- a/TYPO3.TYPO3CR/Classes/TYPO3/TYPO3CR/Domain/Model/AbstractNodeData.php
+++ b/TYPO3.TYPO3CR/Classes/TYPO3/TYPO3CR/Domain/Model/AbstractNodeData.php
@@ -268,6 +268,8 @@ abstract class AbstractNodeData {
$nodeData = $this->nodeDataRepository->findOneByIdentifier($value, $this->getWorkspace());
if ($nodeData instanceof NodeData) {
$value = $nodeData;
+ } else {
+ $value = NULL;
}
break;
}
|
[TASK] Add safe guard in getProperty() for non-existing node reference
This adds a safe guard to Node::getProperty() which returns NULL if
the node the property is referring to does not exist (anymore).
Change-Id: I1a3e9c<I>f<I>ce8d<I>bed8bbce<I>efc<I>
Reviewed-on: <URL>
|
diff --git a/tests/Monolog/Handler/SyslogUdpHandlerTest.php b/tests/Monolog/Handler/SyslogUdpHandlerTest.php
index <HASH>..<HASH> 100644
--- a/tests/Monolog/Handler/SyslogUdpHandlerTest.php
+++ b/tests/Monolog/Handler/SyslogUdpHandlerTest.php
@@ -2,6 +2,9 @@
namespace Monolog\Handler;
+/**
+ * @requires extension sockets
+ */
class SyslogUdpHandlerTest extends \PHPUnit_Framework_TestCase
{
/**
diff --git a/tests/Monolog/Handler/UdpSocketTest.php b/tests/Monolog/Handler/UdpSocketTest.php
index <HASH>..<HASH> 100644
--- a/tests/Monolog/Handler/UdpSocketTest.php
+++ b/tests/Monolog/Handler/UdpSocketTest.php
@@ -4,6 +4,9 @@ namespace Monolog\Handler;
use Monolog\TestCase;
+/**
+ * @requires extension sockets
+ */
class UdpSocketTest extends TestCase
{
public function testWeDoNotSplitShortMessages()
|
avoid test suites failed with Fatal error when sockets extension is not available
|
diff --git a/raiden/transfer/node.py b/raiden/transfer/node.py
index <HASH>..<HASH> 100644
--- a/raiden/transfer/node.py
+++ b/raiden/transfer/node.py
@@ -867,8 +867,6 @@ def is_transaction_successful(chain_state, transaction, state_change):
isinstance(state_change, ContractReceiveSecretReveal) and
isinstance(transaction, ContractSendSecretReveal) and
state_change.transaction_from == our_address and
- state_change.secret_registry_address == transaction.secret_registry_address and
- state_change.secrethash == transaction.secrethash and
state_change.secret == transaction.secret
)
if is_our_secret_reveal:
|
bugfix: ContractSendSecretReveal doesnt have the registry address
[ci integration]
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -2,6 +2,14 @@
import os
import sys
+from pip.req import parse_requirements
+
+# parse_requirements() returns generator of pip.req.InstallRequirement objects
+install_reqs = parse_requirements('requirements.txt')
+
+# reqs is a list of requirement
+# e.g. ['django==1.5.1', 'mezzanine==1.4.6']
+reqs = [str(ir.req) for ir in install_reqs]
try:
from setuptools import setup
@@ -29,8 +37,7 @@ setup(
],
package_dir={'leicaexperiment': 'leicaexperiment'},
include_package_data=True,
- install_requires=[
- ],
+ install_requires=reqs,
license='MIT',
zip_safe=False,
keywords='leicaexperiment',
|
install requires from requirements.txt
|
diff --git a/py/test/selenium/webdriver/common/api_examples.py b/py/test/selenium/webdriver/common/api_examples.py
index <HASH>..<HASH> 100644
--- a/py/test/selenium/webdriver/common/api_examples.py
+++ b/py/test/selenium/webdriver/common/api_examples.py
@@ -177,9 +177,6 @@ class ApiExampleTest (unittest.TestCase):
self._loadPage(page)
elem = self.driver.find_element_by_id("id1")
attr = elem.get_attribute("href")
- # IE returns full URL
- if self.driver.name == "internet explorer":
- attr = attr[-1]
self.assertEquals("http://localhost:%d/xhtmlTest.html#" % self.webserver.port, attr)
def testGetImplicitAttribute(self):
|
DavidBurns updating test to desired behavior for getattribute of href
r<I>
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ with open('README.md', 'r') as f:
long_description = f.read()
setup(name='carpi-obddaemon',
- version='0.3.0',
+ version='0.3.1',
description='OBD II Daemon (developed for CarPi)',
long_description=long_description,
url='https://github.com/rGunti/CarPi-OBDDaemon',
@@ -23,7 +23,10 @@ setup(name='carpi-obddaemon',
author='Raphael "rGunti" Guntersweiler',
author_email='raphael@rgunti.ch',
license='MIT',
- packages=['obddaemon'],
+ packages=[
+ 'obddaemon',
+ 'obddaemon.custom'
+ ],
install_requires=[
'obd',
'wheel'
|
Fixed a packaging issue, created a <I> patch
|
diff --git a/api/src/opentrons/data_storage/database_migration.py b/api/src/opentrons/data_storage/database_migration.py
index <HASH>..<HASH> 100755
--- a/api/src/opentrons/data_storage/database_migration.py
+++ b/api/src/opentrons/data_storage/database_migration.py
@@ -116,8 +116,18 @@ def _do_schema_changes():
db_version = database.get_version()
if db_version == 0:
log.info("doing database schema migration")
- execute_schema_change(conn, create_table_ContainerWells)
- execute_schema_change(conn, create_table_Containers)
+ try:
+ execute_schema_change(conn, create_table_ContainerWells)
+ except sqlite3.OperationalError:
+ log.warning(
+ "Creation of container wells failed, robot may have been "
+ "interrupted during last boot")
+ try:
+ execute_schema_change(conn, create_table_Containers)
+ except sqlite3.OperationalError:
+ log.warning(
+ "Creation of containers failed, robot may have been "
+ "interrupted during last boot")
database.set_version(1)
return conn
|
fix(api): apiv1: handle partial db schema changes (#<I>)
If the labware database has been partially migrated - one or both of the schema
changes creating tables have occurred, but the sqlite user version has not yet
been set - then the next time the robot boots, it will try to recreate the
tables and die from an unhandled exception. This commit handles these exceptions
and moves to the next migration.
|
diff --git a/spec/jekyll-timeago_spec.rb b/spec/jekyll-timeago_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/jekyll-timeago_spec.rb
+++ b/spec/jekyll-timeago_spec.rb
@@ -18,6 +18,7 @@ describe Jekyll::Timeago do
end
it 'process successfully the site using filters and tags' do
+ allow(Date).to receive(:today) { Date.new(2016, 1, 1) }
expect { site.process }.to_not raise_error
lines = [
|
fix tests by mocking Date.today
|
diff --git a/generators/fix-entity/index.js b/generators/fix-entity/index.js
index <HASH>..<HASH> 100644
--- a/generators/fix-entity/index.js
+++ b/generators/fix-entity/index.js
@@ -87,7 +87,7 @@ module.exports = generator.extend({
}
// Add/Change/Keep tableNameDBH
- {
+ const replaceTableName = () => {
const pattern = `"entityTableName": "${this.entityTableName}"`;
const key = 'tableNameDBH';
const oldValue = this.tableNameDBH;
@@ -103,7 +103,8 @@ module.exports = generator.extend({
// We search either for our value or jhipster value, so it works even if user didn't accept JHipster overwrite after a regeneration
jhipsterFunc.replaceContent(files.ORM, `@Table\\(name = "(${this.entityTableName}|${oldValue})`, `@Table(name = "${newValue}`, true);
jhipsterFunc.replaceContent(files.liquibase, `\\<createTable tableName="(${this.entityTableName}|${oldValue})`, `<createTable tableName="${newValue}`);
- }
+ };
+ replaceTableName();
// Add/Change/Keep columnNameDBH for each field
this.columnsInput.forEach((columnItem) => {
|
assign a block to a function and call it
|
diff --git a/tests/testpatch.py b/tests/testpatch.py
index <HASH>..<HASH> 100644
--- a/tests/testpatch.py
+++ b/tests/testpatch.py
@@ -726,8 +726,8 @@ class PatchTest(unittest2.TestCase):
patcher = patch('%s.something' % __name__)
self.assertIs(something, original)
mock = patcher.start()
- self.assertIsNot(mock, original)
try:
+ self.assertIsNot(mock, original)
self.assertIs(something, mock)
finally:
patcher.stop()
@@ -746,8 +746,8 @@ class PatchTest(unittest2.TestCase):
patcher = patch.object(PTModule, 'something', 'foo')
self.assertIs(something, original)
replaced = patcher.start()
- self.assertEqual(replaced, 'foo')
try:
+ self.assertEqual(replaced, 'foo')
self.assertIs(something, replaced)
finally:
patcher.stop()
@@ -761,9 +761,10 @@ class PatchTest(unittest2.TestCase):
self.assertEqual(d, original)
patcher.start()
- self.assertEqual(d, {'spam': 'eggs'})
-
- patcher.stop()
+ try:
+ self.assertEqual(d, {'spam': 'eggs'})
+ finally:
+ patcher.stop()
self.assertEqual(d, original)
|
Some test fixes to always clean up patches
|
diff --git a/lib/bson/array.rb b/lib/bson/array.rb
index <HASH>..<HASH> 100644
--- a/lib/bson/array.rb
+++ b/lib/bson/array.rb
@@ -73,11 +73,11 @@ module BSON
# @example Convert the array to a normalized value.
# array.to_bson_normalized_value
#
- # @return [ Array ] The normazlied array.
+ # @return [ Array ] The normalized array.
#
# @since 3.0.0
def to_bson_normalized_value
- map!{ |value| value.to_bson_normalized_value }
+ map { |value| value.to_bson_normalized_value }
end
module ClassMethods
diff --git a/spec/bson/array_spec.rb b/spec/bson/array_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/bson/array_spec.rb
+++ b/spec/bson/array_spec.rb
@@ -29,6 +29,19 @@ describe Array do
it_behaves_like "a deserializable bson element"
end
+ describe "#to_bson_normalized_value" do
+
+ let(:klass) { Class.new(Hash) }
+ let(:obj) {[ Foo.new ]}
+
+ before(:each) { stub_const "Foo", klass }
+
+ it "does not mutate the receiver" do
+ obj.to_bson_normalized_value
+ expect(obj.first.class).to eq(Foo)
+ end
+ end
+
describe "#to_bson_object_id" do
context "when the array has 12 elements" do
|
RUBY-<I> Array#to_bson_normalized_value shouldn't mutate the receiver
Ref. <URL>
|
diff --git a/spacy/language.py b/spacy/language.py
index <HASH>..<HASH> 100644
--- a/spacy/language.py
+++ b/spacy/language.py
@@ -239,7 +239,7 @@ class Language(object):
if not hasattr(component, '__call__'):
msg = ("Not a valid pipeline component. Expected callable, but "
"got {}. ".format(repr(component)))
- if component in self.factories.keys():
+ if component in self.factories:
msg += ("If you meant to add a built-in component, use "
"create_pipe: nlp.add_pipe(nlp.create_pipe('{}'))"
.format(component))
|
Fix component check in self.factories (see #<I>)
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -35,6 +35,7 @@ setup(
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
+ 'Programming Language :: Python :: 3.5',
'Topic :: Utilities',
],
)
|
Mark Python <I> support in setup.py
|
diff --git a/Route.php b/Route.php
index <HASH>..<HASH> 100755
--- a/Route.php
+++ b/Route.php
@@ -263,7 +263,9 @@ class Route
continue;
}
- $mapValue = (is_array($mapValue) && isset($mapValue["to"])) ? $mapValue["to"] : "";
+ if (is_array($mapValue)) {
+ $mapValue = isset($mapValue["to"]) ? $mapValue["to"] : "";
+ }
if (! empty($mapValue)) {
foreach ($parameters as $key => $value) {
|
Little fix for when mapping was defined only with transform action
|
diff --git a/lib/utils/write.js b/lib/utils/write.js
index <HASH>..<HASH> 100644
--- a/lib/utils/write.js
+++ b/lib/utils/write.js
@@ -13,7 +13,9 @@ const co = Promise.coroutine;
* @param {String} data The data to write.
*/
module.exports = co(function * (file, data) {
- file = p.normalize(file);
- yield mkdirp(p.dirname(file));
- yield write(file, data);
+ try {
+ file = p.normalize(file);
+ yield mkdirp(p.dirname(file));
+ yield write(file, data);
+ } catch (_) {}
});
diff --git a/test/utils.js b/test/utils.js
index <HASH>..<HASH> 100644
--- a/test/utils.js
+++ b/test/utils.js
@@ -66,6 +66,10 @@ test('utils.write', co(function * (t) {
const done = yield $.write(file, demo);
t.equal(done, undefined, 'returns nothing');
+ yield $.write(nest, demo);
+ const nada = yield $.read(nest);
+ t.equal(nada, null, 'does not attempt to write to directory');
+
const seek = yield $.find(file);
t.true(seek && seek.length, 'creates the file, including sub-dirs');
|
wrap $.write in try/catch; prevent ESDIR error
|
diff --git a/raiden/ui/cli.py b/raiden/ui/cli.py
index <HASH>..<HASH> 100644
--- a/raiden/ui/cli.py
+++ b/raiden/ui/cli.py
@@ -150,6 +150,14 @@ def check_synced(blockchain_service):
"node cannot be trusted. Giving up.\n"
)
sys.exit(1)
+ except KeyError:
+ print(
+ 'Your ethereum client is connected to a non-recognized private \n'
+ 'network with network-ID {}. Since we can not check if the client \n'
+ 'is synced please restart raiden with the --no-sync-check argument.'
+ '\n'.format(net_id)
+ )
+ sys.exit(1)
url = ETHERSCAN_API.format(
network=network,
|
Give warning for nosyncheck arg for privatenets
|
diff --git a/keywords/_util.js b/keywords/_util.js
index <HASH>..<HASH> 100644
--- a/keywords/_util.js
+++ b/keywords/_util.js
@@ -4,7 +4,7 @@ module.exports = {
metaSchemaRef: metaSchemaRef
};
-var META_SCHEMA_ID = 'http://json-schema.org/draft-06/schema';
+var META_SCHEMA_ID = 'http://json-schema.org/draft-07/schema';
function metaSchemaRef(ajv) {
var defaultMeta = ajv._opts.defaultMeta;
|
fix: draft-<I> is a default schema
|
diff --git a/dashboard/modules/snapshot/snapshot_head.py b/dashboard/modules/snapshot/snapshot_head.py
index <HASH>..<HASH> 100644
--- a/dashboard/modules/snapshot/snapshot_head.py
+++ b/dashboard/modules/snapshot/snapshot_head.py
@@ -4,9 +4,6 @@ from ray.core.generated import gcs_service_pb2_grpc
from ray.experimental.internal_kv import _internal_kv_get
import ray.new_dashboard.utils as dashboard_utils
-from ray.serve.controller import SNAPSHOT_KEY as SERVE_SNAPSHOT_KEY
-from ray.serve.constants import SERVE_CONTROLLER_NAME
-from ray.serve.kv_store import format_key
import json
@@ -91,6 +88,15 @@ class SnapshotHead(dashboard_utils.DashboardHeadModule):
return actors
async def get_serve_info(self):
+ # Conditionally import serve to prevent ModuleNotFoundError from serve
+ # dependencies when only ray[default] is installed (#17712)
+ try:
+ from ray.serve.controller import SNAPSHOT_KEY as SERVE_SNAPSHOT_KEY
+ from ray.serve.constants import SERVE_CONTROLLER_NAME
+ from ray.serve.kv_store import format_key
+ except Exception:
+ return "{}"
+
client = self._dashboard_head.gcs_client
# Serve wraps Ray's internal KV store and specially formats the keys.
|
[Dashboard] [Serve] Make serve import conditional (#<I>)
|
diff --git a/sources/lib/Converter/PgJson.php b/sources/lib/Converter/PgJson.php
index <HASH>..<HASH> 100644
--- a/sources/lib/Converter/PgJson.php
+++ b/sources/lib/Converter/PgJson.php
@@ -117,9 +117,9 @@ class PgJson implements ConverterInterface
if ($return === false) {
throw new ConverterException(
sprintf(
- "Could not convert data to JSON. Driver returned '%s'.\n======\n%s\n",
- json_last_error(),
- $data
+ "Could not convert %s data to JSON. Driver returned '%s'.",
+ gettype($data),
+ json_last_error()
)
);
}
|
fix error in PgJson exception if data not a string
When the data given to the converter is not a string (can be any
instances of classes implementing the `JsonSerializable` interface), and
the json_encode fails, the error message was formatted assuming it could
turn data into a string which may not be the case. This was creating a
fatal error in PHP.
|
diff --git a/iserve-rest/src/main/java/uk/ac/open/kmi/iserve/rest/sal/resource/ServicesResource.java b/iserve-rest/src/main/java/uk/ac/open/kmi/iserve/rest/sal/resource/ServicesResource.java
index <HASH>..<HASH> 100644
--- a/iserve-rest/src/main/java/uk/ac/open/kmi/iserve/rest/sal/resource/ServicesResource.java
+++ b/iserve-rest/src/main/java/uk/ac/open/kmi/iserve/rest/sal/resource/ServicesResource.java
@@ -552,6 +552,9 @@ public class ServicesResource {
} catch (NumberFormatException nfe) {
try {
valueObj = new URI(value);
+ if (!((URI) valueObj).isAbsolute()) {
+ valueObj = value;
+ }
} catch (URISyntaxException e) {
valueObj = value;
}
|
Fixed bug in RESTful interface. Now, literal values of service properties are stored properly.
|
diff --git a/Tone/core/Tone.js b/Tone/core/Tone.js
index <HASH>..<HASH> 100644
--- a/Tone/core/Tone.js
+++ b/Tone/core/Tone.js
@@ -79,7 +79,7 @@ define("Tone/core/Tone", [], function(){
AudioNode.prototype._nativeConnect = AudioNode.prototype.connect;
AudioNode.prototype.connect = function(B){
if (B.input){
- this._nativeConnect(B.input);
+ this.connect(B.input);
} else {
try {
this._nativeConnect.apply(this, arguments);
|
recursive connect if the input is also a ToneNode
|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index <HASH>..<HASH> 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -5,6 +5,12 @@ require 'rspec/rails'
require 'factory_girl'
Factory.find_definitions
+User
+class User
+ alias real_send_create_notification send_create_notification
+ def send_create_notification; end
+end
+
# Requires supporting ruby files with custom matchers and macros, etc,
# in spec/support/ and its subdirectories.
Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
|
Do not construct mail on User creation in specs.
|
diff --git a/spec/lib/great_pretender/pretender_spec.rb b/spec/lib/great_pretender/pretender_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/lib/great_pretender/pretender_spec.rb
+++ b/spec/lib/great_pretender/pretender_spec.rb
@@ -5,12 +5,20 @@ class PrefixSlugPretender
def say_hello
"Hello, guest!"
end
+
+ def name
+ "Flip"
+ end
end
class TestSlugPretender
def ohai
"ohai"
end
+
+ def name
+ "Avery"
+ end
end
describe GreatPretender::Pretender do
@@ -30,4 +38,7 @@ describe GreatPretender::Pretender do
expect(recipient.say_hello).to eq("Hello, guest!")
end
+ it "delegates methods to the most specific responder" do
+ expect(recipient.name).to eq("Avery")
+ end
end
|
Add test for method specificity in pretenders
|
diff --git a/art/art.py b/art/art.py
index <HASH>..<HASH> 100644
--- a/art/art.py
+++ b/art/art.py
@@ -347,7 +347,7 @@ def text2art(text, font=DEFAULT_FONT, chr_ignore=True):
result_list = []
letters = standard_dic
text_temp = text
- spliter = "\n"
+ splitter = "\n"
if isinstance(text, str) is False:
raise artError(TEXT_TYPE_ERROR)
if isinstance(font, str) is False:
@@ -386,8 +386,11 @@ def text2art(text, font=DEFAULT_FONT, chr_ignore=True):
temp = temp + split_list[j][i]
result_list.append(temp)
if "win32" != sys.platform:
- spliter = "\r\n"
- return((spliter).join(result_list))
+ splitter = "\r\n"
+ result = (splitter).join(result_list)
+ if result[-1] != "\n":
+ result += splitter
+ return result
def set_default(font=DEFAULT_FONT, chr_ignore=True, filename="art",
|
fix : minor edit in text2art for 3new fonts
|
diff --git a/src/Node/NodeFactory.php b/src/Node/NodeFactory.php
index <HASH>..<HASH> 100644
--- a/src/Node/NodeFactory.php
+++ b/src/Node/NodeFactory.php
@@ -56,14 +56,6 @@ final class NodeFactory
}
/**
- * Creates "false"
- */
- public function createFalseConstant(): ConstFetch
- {
- return BuilderHelpers::normalizeValue(false);
- }
-
- /**
* Creates "\SomeClass::CONSTANT"
*/
public function createClassConstant(string $className, string $constantName): ClassConstFetch
|
Remove unused method NodeFactory::createFalseConstant
|
diff --git a/threads/models.py b/threads/models.py
index <HASH>..<HASH> 100644
--- a/threads/models.py
+++ b/threads/models.py
@@ -110,7 +110,7 @@ def post_save_thread(sender, instance, created, **kwargs):
if not created and thread.number_of_messages == 0:
thread.delete()
-def update_message(sender, instance, created, **kwargs):
+def post_save_message(sender, instance, created, **kwargs):
message = instance
thread = message.thread
@@ -119,13 +119,13 @@ def update_message(sender, instance, created, **kwargs):
thread.save()
-def delete_message(sender, instance, **kwargs):
+def post_delete_message(sender, instance, **kwargs):
message = instance
message.thread.save()
# Connect signals with their respective functions from above.
# When a message is created, update that message's thread's change_date to the post_date of that message.
-models.signals.post_save.connect(update_message, sender=Message)
-models.signals.post_delete.connect(delete_message, sender=Message)
+models.signals.post_save.connect(post_save_message, sender=Message)
+models.signals.post_delete.connect(post_delete_message, sender=Message)
models.signals.pre_save.connect(pre_save_thread, sender=Thread)
models.signals.post_save.connect(post_save_thread, sender=Thread)
|
Renamed functions to make their context more clear
|
diff --git a/nuimo_dbus.py b/nuimo_dbus.py
index <HASH>..<HASH> 100644
--- a/nuimo_dbus.py
+++ b/nuimo_dbus.py
@@ -119,20 +119,24 @@ class GattDevice:
return
def connect(self):
+ self.__connect_retry_attempt = 0
self.__connect()
+ def connect_failed(self, e):
+ pass
+
def __connect(self):
print("__connect...")
+ self.__connect_retry_attempt += 1
try:
self.object.Connect()
+ if self.is_services_resolved():
+ self.services_resolved()
except dbus.exceptions.DBusException as e:
- # TODO: Only retry on "software" exceptions and only retry for a given number of retries
- print("Failed to connect:", e)
- print("Trying to connect again...")
- self.__connect()
-
- if self.is_services_resolved():
- self.services_resolved()
+ if (self.__connect_retry_attempt <= 5) and (e.get_dbus_name() == "org.bluez.Error.Failed") and (e.get_dbus_message() == "Software caused connection abort"):
+ self.__connect()
+ else:
+ self.connect_failed(e)
def disconnect(self):
self.object.Disconnect()
|
Retry device connection only after certain errors
|
diff --git a/exchangelib/transport.py b/exchangelib/transport.py
index <HASH>..<HASH> 100644
--- a/exchangelib/transport.py
+++ b/exchangelib/transport.py
@@ -220,26 +220,26 @@ def get_auth_method_from_response(response):
def _tokenize(val):
# Splits cookie auth values
- auth_tokens = []
- auth_token = ''
+ auth_methods = []
+ auth_method = ''
quote = False
for c in val:
if c in (' ', ',') and not quote:
- if auth_token not in ('', ','):
- auth_tokens.append(auth_token)
- auth_token = ''
+ if auth_method not in ('', ','):
+ auth_methods.append(auth_method)
+ auth_method = ''
continue
elif c == '"':
- auth_token += c
+ auth_method += c
if quote:
- auth_tokens.append(auth_token)
- auth_token = ''
+ auth_methods.append(auth_method)
+ auth_method = ''
quote = not quote
continue
- auth_token += c
- if auth_token:
- auth_tokens.append(auth_token)
- return auth_tokens
+ auth_method += c
+ if auth_method:
+ auth_methods.append(auth_method)
+ return auth_methods
def dummy_xml(version, name):
|
Rename vars to avoid security linter false positive
|
diff --git a/lib/reset_properties.js b/lib/reset_properties.js
index <HASH>..<HASH> 100644
--- a/lib/reset_properties.js
+++ b/lib/reset_properties.js
@@ -5,7 +5,8 @@ const getCacheFolderPath = require('../lib/get_cache_folder_path')
module.exports = function () {
return getCacheFolderPath('props')
.then(function (propsDir) {
- exec(`rm ${propsDir}/*.json`, function (err, res) {
+ // -f: ignore if there are no more files to delete
+ exec(`rm -f ${propsDir}/*.json`, function (err, res) {
if (err) {
console.error('reset properties failed', err)
} else {
|
reset_properties: use a --force flag to ignore if there are no more files to delete
instead rejecting an error
|
diff --git a/lib/flex.rb b/lib/flex.rb
index <HASH>..<HASH> 100644
--- a/lib/flex.rb
+++ b/lib/flex.rb
@@ -628,7 +628,6 @@ module Flex
def doc(*args)
flex.doc(*args)
end
- alias_method :info, :doc
def scan_search(*args, &block)
flex.scan_search(*args, &block)
diff --git a/lib/flex/deprecation.rb b/lib/flex/deprecation.rb
index <HASH>..<HASH> 100644
--- a/lib/flex/deprecation.rb
+++ b/lib/flex/deprecation.rb
@@ -78,6 +78,13 @@ module Flex
end
+ # Flex.info
+ def info(*names)
+ Deprecation.warn 'Flex.info', 'Flex.doc'
+ doc *names
+ end
+
+
module Result::Collection
NEW_MODULE = Struct::Paginable
extend Deprecation::Module
|
added deprecation warning for Flex.info
|
diff --git a/lib/configurations/maps/readers/tolerant.rb b/lib/configurations/maps/readers/tolerant.rb
index <HASH>..<HASH> 100644
--- a/lib/configurations/maps/readers/tolerant.rb
+++ b/lib/configurations/maps/readers/tolerant.rb
@@ -3,8 +3,8 @@ module Configurations
module Readers
class Tolerant
def read(map, path)
- path.reduce(map) do |map, value|
- map[value] if map
+ path.reduce(map) do |m, value|
+ m[value] if m
end
end
end
diff --git a/test/configurations/configuration/test_configure_synchronized.rb b/test/configurations/configuration/test_configure_synchronized.rb
index <HASH>..<HASH> 100644
--- a/test/configurations/configuration/test_configure_synchronized.rb
+++ b/test/configurations/configuration/test_configure_synchronized.rb
@@ -19,7 +19,6 @@ class TestConfigurationSynchronized < MiniTest::Test
def test_configuration_synchronized
collector = []
- semaphore = Mutex.new
threads = 100.times.map do |i|
Thread.new do
sleep i%50 / 1000.0
|
Fix warnings for shadowed and unused variables
|
diff --git a/Services/Twilio/CapabilityTaskRouter.php b/Services/Twilio/CapabilityTaskRouter.php
index <HASH>..<HASH> 100644
--- a/Services/Twilio/CapabilityTaskRouter.php
+++ b/Services/Twilio/CapabilityTaskRouter.php
@@ -17,7 +17,7 @@ class Services_Twilio_TaskRouter_Worker_Capability
private $workerSid;
private $apiCapability;
- private $baseUrl = 'https://api.twilio.com/2010-04-01';
+ private $baseUrl = 'https://taskrouter.twilio.com/v1';
private $baseWsUrl = 'https://event-bridge.twilio.com/v1/wschannels';
private $workerUrl;
private $reservationsUrl;
@@ -32,7 +32,7 @@ class Services_Twilio_TaskRouter_Worker_Capability
$this->authToken = $authToken;
$this->workspaceSid = $workspaceSid;
$this->workerSid = $workerSid;
- $this->apiCapability = new Services_Twilio_API_Capability($accountSid, $authToken, '2010-04-10', $workerSid);
+ $this->apiCapability = new Services_Twilio_API_Capability($accountSid, $authToken, 'v1', $workerSid);
if(isset($overrideBaseWDSUrl)) {
$this->baseUrl = $overrideBaseWDSUrl;
}
|
Update base URL and version for TaskRouter scoped token generation
|
diff --git a/art/art.py b/art/art.py
index <HASH>..<HASH> 100644
--- a/art/art.py
+++ b/art/art.py
@@ -11,7 +11,7 @@ SMALLTHRESHOLD = 80
MEDIUMTHRESHOLD = 200
LARGETHRESHOLD = 500
-description = '''ASCII art is also known as "computer text art".
+DESCRIPTION = '''ASCII art is also known as "computer text art".
It involves the smart placement of typed special characters or
letters to make a visual shape that is spread over multiple lines of text.
Art is a Python lib for text converting to ASCII ART fancy.'''
@@ -344,7 +344,7 @@ def help_func():
'''
tprint("art")
tprint("v" + VERSION)
- print(description + "\n")
+ print(DESCRIPTION + "\n")
print("Webpage : http://art.shaghighi.ir\n")
print("Help : \n")
print(" - list --> (list of arts)\n")
|
fix : description renamed to DESCRIPTION
|
diff --git a/src/main.py b/src/main.py
index <HASH>..<HASH> 100644
--- a/src/main.py
+++ b/src/main.py
@@ -65,7 +65,7 @@ def cmd_list(args):
print '#%s Display %s %s' % (n, _id,
' '.join(get_flags_of_display(_id)))
cmode = Q.CGDisplayCopyDisplayMode(_id)
- for m in Q.CGDisplayCopyAllDisplayModes(_id, None):
+ for mode in Q.CGDisplayCopyAllDisplayModes(_id, None):
if (not args.all
and not Q.CGDisplayModeIsUsableForDesktopGUI(
mode)):
|
bugfix: m -> mode
|
diff --git a/src/threadPool.py b/src/threadPool.py
index <HASH>..<HASH> 100644
--- a/src/threadPool.py
+++ b/src/threadPool.py
@@ -40,7 +40,7 @@ class ThreadPool(Module):
self.pool.expectedFT -= 1
self.pool.workers.remove(self)
self.pool.cond.release()
- self.l.debug("Bye")
+ self.l.debug("Bye (%s)" % self.name)
def __init__(self, *args, **kwargs):
super(ThreadPool, self).__init__(*args, **kwargs)
|
threadPool: add name to "Bye"
|
diff --git a/src/NullCache.php b/src/NullCache.php
index <HASH>..<HASH> 100644
--- a/src/NullCache.php
+++ b/src/NullCache.php
@@ -16,7 +16,7 @@ class NullCache implements Cache
*/
public function get($key, $default = null)
{
- return false;
+ return $default;
}
/**
diff --git a/tests/NullCacheTest.php b/tests/NullCacheTest.php
index <HASH>..<HASH> 100644
--- a/tests/NullCacheTest.php
+++ b/tests/NullCacheTest.php
@@ -10,7 +10,8 @@ class NullCacheTest extends \PHPUnit\Framework\TestCase
public function testNullCache()
{
$cache = new NullCache();
- $this->assertFalse($cache->get('foo'));
+ $this->assertNull($cache->get('foo'));
+ $this->assertEquals('dflt', $cache->get("foo", "dflt"));
$this->assertFalse($cache->set('foo', 'bar'));
$this->assertFalse($cache->delete('foo'));
$this->assertFalse($cache->clean());
|
Make NullCache a little more PSR-<I> compliant by making it heed the dafault
|
diff --git a/test/lynckia-test.js b/test/lynckia-test.js
index <HASH>..<HASH> 100644
--- a/test/lynckia-test.js
+++ b/test/lynckia-test.js
@@ -1,8 +1,8 @@
/*global require, module*/
var vows = require('vows'),
assert = require('assert'),
- N = require('./extras/basic_example/nuve'),
- config = require('./lynckia_config');
+ N = require('../extras/basic_example/nuve'),
+ config = require('../lynckia_config');
vows.describe('lynckia').addBatch({
"Lynckia service": {
|
Testing travis with apt-get
|
diff --git a/web/web.go b/web/web.go
index <HASH>..<HASH> 100644
--- a/web/web.go
+++ b/web/web.go
@@ -9,7 +9,9 @@ import (
"crypto/sha1"
"encoding/base64"
"fmt"
- "github.com/codegangsta/martini"
+ // When do the merges, should correct the import path
+ // or martini.Context would not be correctly injected
+ "github.com/Archs/martini"
"io/ioutil"
"mime"
"net/http"
diff --git a/web/web_test.go b/web/web_test.go
index <HASH>..<HASH> 100644
--- a/web/web_test.go
+++ b/web/web_test.go
@@ -1,7 +1,9 @@
package web
import (
- "github.com/codegangsta/martini"
+ // When do the merges, should correct the import path
+ // or martini.Context would not be correctly injected
+ "github.com/Archs/martini"
"net/http"
"net/http/httptest"
"testing"
|
update web to work with new martini route method: Any
|
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index <HASH>..<HASH> 100755
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -1767,8 +1767,10 @@ public class Jenkins extends AbstractCIBase implements ModifiableItemGroup<TopLe
* correctly, especially when a migration is involved), but the downside
* is that unless you are processing a request, this method doesn't work.
*
- * Please note that this will not work in all cases if Jenkins is running behind a reverse proxy.
- * In this case, only the user-configured value from getRootUrl is correct.
+ * Please note that this will not work in all cases if Jenkins is running behind a
+ * reverse proxy (namely when user has switched off ProxyPreserveHost, which is
+ * default setup) and you should use getRootUrl if you want to be sure you reflect
+ * user setup.
* See https://wiki.jenkins-ci.org/display/JENKINS/Running+Jenkins+behind+Apache
*
* @since 1.263
|
changed text a bit after some discussion with vjuranek
|
diff --git a/openquake/commonlib/oqvalidation.py b/openquake/commonlib/oqvalidation.py
index <HASH>..<HASH> 100644
--- a/openquake/commonlib/oqvalidation.py
+++ b/openquake/commonlib/oqvalidation.py
@@ -171,15 +171,14 @@ class OqParam(valid.ParamSet):
flags = dict(
sites=getattr(self, 'sites', 0),
sites_csv=self.inputs.get('sites', 0),
- sites_model_file=self.inputs.get('site_model', 0),
hazard_curves_csv=self.inputs.get('hazard_curves', 0),
gmvs_csv=self.inputs.get('gmvs', 0),
region=getattr(self, 'region', 0),
exposure=self.inputs.get('exposure', 0))
# NB: below we check that all the flags
# are mutually exclusive
- return sum(bool(v) for v in flags.values()) == 1 or (
- self.inputs.get('site_model'))
+ return sum(bool(v) for v in flags.values()) == 1 or self.inputs.get(
+ 'site_model')
def is_valid_poes(self):
"""
|
Removed a file added by accident
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -1,7 +1,7 @@
const {toString} = Object.prototype;
const vowels = /^[aeiou]/i;
-const builtin = [Array, Boolean, Date, Error, Function, Number, Object, RegExp, String, Symbol];
+const builtin = [Array, Boolean, Date, Error, Function, Number, Object, Promise, RegExp, String, Symbol];
if (typeof Buffer == 'function') builtin.push(Buffer);
const _TypeError = TypeError;
|
fix: add Promise to builtin array
|
diff --git a/ui/src/utils/groupBy.js b/ui/src/utils/groupBy.js
index <HASH>..<HASH> 100644
--- a/ui/src/utils/groupBy.js
+++ b/ui/src/utils/groupBy.js
@@ -99,11 +99,15 @@ const constructCells = serieses => {
vals,
}))
+ const tagSet = map(Object.keys(tags), tag => `[${tag}=${tags[tag]}]`)
+ .sort()
+ .join('')
+
const unsortedLabels = map(columns.slice(1), (field, i) => ({
label:
groupByColumns && i <= groupByColumns.length - 1
? `${field}`
- : `${measurement}.${field}`,
+ : `${measurement}.${field}${tagSet}`,
responseIndex,
seriesIndex,
}))
|
Restore groupBy naming behavior for lineGraphs
|
diff --git a/src/Drupal/DrupalExtension/Context/DrupalContext.php b/src/Drupal/DrupalExtension/Context/DrupalContext.php
index <HASH>..<HASH> 100644
--- a/src/Drupal/DrupalExtension/Context/DrupalContext.php
+++ b/src/Drupal/DrupalExtension/Context/DrupalContext.php
@@ -172,7 +172,7 @@ class DrupalContext extends MinkContext implements DrupalAwareInterface {
* Override MinkContext::locatePath() to work around Selenium not supporting
* basic auth.
*/
- protected function locatePath($path) {
+ public function locatePath($path) {
$driver = $this->getSession()->getDriver();
if ($driver instanceof Selenium2Driver && isset($this->basic_auth)) {
// Add the basic auth parameters to the base url. This only works for
|
Issue #<I> by langworthy: Fixed locatePath() should be public.
|
diff --git a/Component/Drivers/PostgreSQL.php b/Component/Drivers/PostgreSQL.php
index <HASH>..<HASH> 100644
--- a/Component/Drivers/PostgreSQL.php
+++ b/Component/Drivers/PostgreSQL.php
@@ -305,7 +305,7 @@ class PostgreSQL extends DoctrineBaseDriver implements Manageble, Routable, Geog
$wkt = $db->quote($wkt);
$srid = is_numeric($srid) ? intval($srid) : $db->quote($srid);
$sridTo = is_numeric($sridTo) ? intval($sridTo) : $db->quote($sridTo);
- return "(ST_ISVALID($geomFieldName) AND ST_INTERSECTS(ST_TRANSFORM(ST_GEOMFROMTEXT($wkt,$srid),$sridTo), $geomFieldName ))";
+ return "(ST_TRANSFORM(ST_GEOMFROMTEXT($wkt,$srid),$sridTo) && ST_MakeValid($geomFieldName))";
}
/**
|
Fix Postgis intersection filtering on self-intersecting geometries
|
diff --git a/lib/puppet/type/cron.rb b/lib/puppet/type/cron.rb
index <HASH>..<HASH> 100644
--- a/lib/puppet/type/cron.rb
+++ b/lib/puppet/type/cron.rb
@@ -427,7 +427,6 @@ Puppet::Type.newtype(:cron) do
unless ret
case name
when :command
- devfail "No command, somehow" unless @parameters[:ensure].value == :absent
when :special
# nothing
else
diff --git a/spec/unit/provider/cron/parsed_spec.rb b/spec/unit/provider/cron/parsed_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/unit/provider/cron/parsed_spec.rb
+++ b/spec/unit/provider/cron/parsed_spec.rb
@@ -31,6 +31,14 @@ describe Puppet::Type.type(:cron).provider(:crontab) do
)
end
+ let :resource_sparse do
+ Puppet::Type.type(:cron).new(
+ :minute => %w{42},
+ :target => 'root',
+ :name => 'sparse'
+ )
+ end
+
let :record_special do
{
:record_type => :crontab,
@@ -321,5 +329,12 @@ describe Puppet::Type.type(:cron).provider(:crontab) do
end
end
end
+
+ describe "with a resource without a command" do
+ it "should not raise an error" do
+ expect { described_class.match(record,{resource_sparse[:name] => resource_sparse}) }.to_not raise_error
+ end
+ end
+
end
end
|
(PUP-<I>) allow managing existing cronjobs without caring for command
When the catalog contains a cron resource that does not specify a value
for the command property, the transaction would fail with the cryptic
error message 'no command, somehow' under certain conditions.
This error is spurious. Generally, it's quite allowable to manage a subset
of cron properties that does not include the command. Fixed by removing
the devfail invocation. The command property is now handled just like
the 'special' property.
|
diff --git a/asv/environment.py b/asv/environment.py
index <HASH>..<HASH> 100644
--- a/asv/environment.py
+++ b/asv/environment.py
@@ -249,13 +249,14 @@ class Environment(object):
"""
self.install_requirements()
self.uninstall(conf.project)
- log.info("Installing {0} into {1}".format(conf.project, self.name))
+ log.info("Building {0} for {1}".format(conf.project, self.name))
orig_path = os.getcwd()
os.chdir(conf.project)
try:
- self.run(['setup.py', 'install'])
+ self.run(['setup.py', 'build'])
finally:
os.chdir(orig_path)
+ self.install(os.path.abspath(conf.project))
def can_install_project(self):
"""
|
Build with setup.py, then install with pip
|
diff --git a/ezp/Persistence/Content/Field.php b/ezp/Persistence/Content/Field.php
index <HASH>..<HASH> 100644
--- a/ezp/Persistence/Content/Field.php
+++ b/ezp/Persistence/Content/Field.php
@@ -39,6 +39,6 @@ class Field extends AbstractValueObject
/**
* @var int|null Null if not created yet
*/
- public $versionId;
+ public $versionNo;
}
?>
|
Fixed: $versionId -> $versionNo.
|
diff --git a/buildutils/bundle.py b/buildutils/bundle.py
index <HASH>..<HASH> 100644
--- a/buildutils/bundle.py
+++ b/buildutils/bundle.py
@@ -35,8 +35,8 @@ pjoin = os.path.join
# Constants
#-----------------------------------------------------------------------------
-bundled_version = (0,5,2)
-libcapnp = "capnproto-c++-%i.%i.%i.tar.gz" % (bundled_version)
+bundled_version = (0,5,3,1)
+libcapnp = "capnproto-c++-%i.%i.%i.%i.tar.gz" % (bundled_version)
libcapnp_url = "https://capnproto.org/" + libcapnp
HERE = os.path.dirname(__file__)
|
Bump bundled capnp version to <I>
|
diff --git a/script/build_gem.rb b/script/build_gem.rb
index <HASH>..<HASH> 100755
--- a/script/build_gem.rb
+++ b/script/build_gem.rb
@@ -5,6 +5,8 @@ include RailsFancies
# `git add .`
# `git commit -m "Build v#{RailsFancies::VERSION} of rails_fancies"`
`bundle`
+`git add .`
+`git commit`
`git push origin master`
# `gem push rails_fancies-#{RailsFancies::VERSION}.gem`
`git tag v#{RailsFancies::VERSION} -a`
|
Fix nokogiri security by upgrading to <I>
|
diff --git a/salt/modules/xapi.py b/salt/modules/xapi.py
index <HASH>..<HASH> 100644
--- a/salt/modules/xapi.py
+++ b/salt/modules/xapi.py
@@ -10,7 +10,7 @@ compatibility in mind.
'''
import sys
-from contextlib import contextmanager
+import contextlib
# This module has only been tested on Debian GNU/Linux and NetBSD, it
# probably needs more path appending for other distributions.
# The path to append is the path to python Xen libraries, where resides
@@ -32,7 +32,7 @@ def __virtual__():
return 'virt'
-@contextmanager
+@contextlib.contextmanager
def _get_xapi_session():
'''
Get a session to XenAPI. By default, use the local UNIX socket.
|
Don't import direct function in modules so they are not exposed
|
diff --git a/openquake/baselib/hdf5.py b/openquake/baselib/hdf5.py
index <HASH>..<HASH> 100644
--- a/openquake/baselib/hdf5.py
+++ b/openquake/baselib/hdf5.py
@@ -433,10 +433,8 @@ def dumps(dic):
new[k] = {cls2dotname(v.__class__): dumps(vars(v))}
elif isinstance(v, dict):
new[k] = dumps(v)
- elif isinstance(v, str):
- new[k] = '"%s"' % v
else:
- new[k] = v
+ new[k] = json.dumps(v)
return "{%s}" % ','.join('\n"%s": %s' % it for it in new.items())
|
Fixed hdf5.dumps
|
diff --git a/src/SAML2/Assertion/Transformer/NameIdDecryptionTransformer.php b/src/SAML2/Assertion/Transformer/NameIdDecryptionTransformer.php
index <HASH>..<HASH> 100644
--- a/src/SAML2/Assertion/Transformer/NameIdDecryptionTransformer.php
+++ b/src/SAML2/Assertion/Transformer/NameIdDecryptionTransformer.php
@@ -40,6 +40,7 @@ class NameIdDecryptionTransformer implements
LoggerInterface $logger,
PrivateKeyLoader $privateKeyLoader
) {
+ $this->logger = $logger;
$this->privateKeyLoader = $privateKeyLoader;
}
|
bugfix: Set logger in SAML2\Assertion\Transformer\NameIDDecryptionTransformer.
This resolves #<I>.
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -74,7 +74,7 @@ Queue.prototype.start = function (cb) {
this.running = true
- if (this.pending === this.concurrency) {
+ if (this.pending >= this.concurrency) {
return
}
|
Fix for "cannot update concurrency mid-process"
|
diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/spaces/_CreateSpaceRequest.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/spaces/_CreateSpaceRequest.java
index <HASH>..<HASH> 100644
--- a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/spaces/_CreateSpaceRequest.java
+++ b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/spaces/_CreateSpaceRequest.java
@@ -85,7 +85,7 @@ abstract class _CreateSpaceRequest {
/**
* The space quota definition id
*/
- @JsonProperty("space quota definition guid")
+ @JsonProperty("space_quota_definition_guid")
@Nullable
abstract String getSpaceQuotaDefinitionId();
|
Add underscores to variable
Underscores are missing in the space quota definition guid variable.
[resolves #<I>]
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,12 @@ setup(
'Development Status :: 4 - Beta',
'Environment :: Web Environment',
'Framework :: Django',
- "Framework :: Django :: 1.4",
+ 'Framework :: Django :: 1.4',
+ 'Framework :: Django :: 1.5',
+ 'Framework :: Django :: 1.6',
+ 'Framework :: Django :: 1.7',
+ 'Framework :: Django :: 1.8',
+ 'Framework :: Django :: 1.9',
'Intended Audience :: Developers',
'Topic :: Internet :: WWW/HTTP',
'Topic :: Software Development :: Libraries :: Python Modules',
|
add supported django versions
This should now work up to django <I>. I'll try and help get automated testing set up so we can be more sure.
|
diff --git a/src/ol/structs/rtree.js b/src/ol/structs/rtree.js
index <HASH>..<HASH> 100644
--- a/src/ol/structs/rtree.js
+++ b/src/ol/structs/rtree.js
@@ -59,8 +59,8 @@ ol.structs.RTreeNode_ = function(bounds, parent, level) {
* @param {string=} opt_type Type for another indexing dimension.
*/
ol.structs.RTreeNode_.prototype.find = function(bounds, results, opt_type) {
- if (ol.extent.intersects(this.bounds, bounds) &&
- (!goog.isDef(opt_type) || this.types[opt_type] === true)) {
+ if ((!goog.isDef(opt_type) || this.types[opt_type] === true) &&
+ ol.extent.intersects(this.bounds, bounds)) {
var numChildren = this.children.length;
if (numChildren === 0) {
if (goog.isDef(this.object)) {
|
Making RTree's find more efficient
By doing the type check before the intersection check, we can
save he intersection check for cases where we don't care about
type or have the specified type in a node.
|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index <HASH>..<HASH> 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,6 +1,5 @@
$:.unshift File.expand_path('../lib', File.dirname(__FILE__))
require 'respec'
-require 'tmpdir'
require 'temporaries'
ROOT = File.expand_path('..', File.dirname(__FILE__))
|
No longer need tmpdir in specs.
|
diff --git a/jre_emul/android/platform/libcore/luni/src/test/java/libcore/java/text/NumberFormatTest.java b/jre_emul/android/platform/libcore/luni/src/test/java/libcore/java/text/NumberFormatTest.java
index <HASH>..<HASH> 100644
--- a/jre_emul/android/platform/libcore/luni/src/test/java/libcore/java/text/NumberFormatTest.java
+++ b/jre_emul/android/platform/libcore/luni/src/test/java/libcore/java/text/NumberFormatTest.java
@@ -246,8 +246,9 @@ public class NumberFormatTest extends junit.framework.TestCase {
public void test_currencyWithPatternDigits() throws Exception {
// Japanese Yen 0 fractional digits.
NumberFormat nf = NumberFormat.getCurrencyInstance(Locale.JAPAN);
- // TODO(tball): investigate iOS 10 failures, b/33557359.
- //assertEquals("￥50", nf.format(50.00));
+ String result = nf.format(50.00);
+ // Allow either full-width (0xFFE5) or regular width yen sign (0xA5).
+ assertTrue(result.equals("￥50") || result.equals("¥50"));
// Armenian Dram 0 fractional digits.
nf = NumberFormat.getCurrencyInstance(Locale.forLanguageTag("hy-AM"));
|
Fixes test by switching the expected currency symbol from the full width yen (0xFFE5) to the regular yen sign (0xA5).
|
diff --git a/gcs/bucket.go b/gcs/bucket.go
index <HASH>..<HASH> 100644
--- a/gcs/bucket.go
+++ b/gcs/bucket.go
@@ -39,10 +39,11 @@ type Bucket interface {
Name() string
// Create a reader for the contents of a particular generation of an object.
- // The caller must arrange for the reader to be closed when it is no longer
- // needed.
+ // On a nil error, the caller must arrange for the reader to be closed when
+ // it is no longer needed.
//
- // If the object doesn't exist, err will be of type *NotFoundError.
+ // Non-existent objects cause either this method or the first read from the
+ // resulting reader to return an error of type *NotFoundError.
//
// Official documentation:
// https://cloud.google.com/storage/docs/json_api/v1/objects/get
|
Updated the contract for NewReader.
|
diff --git a/wpull/http.py b/wpull/http.py
index <HASH>..<HASH> 100644
--- a/wpull/http.py
+++ b/wpull/http.py
@@ -326,7 +326,7 @@ class Connection(object):
gzipped = 'gzip' in response.fields.get('Content-Encoding', '')
# TODO: handle gzip responses
- if re.search(r'chunked$|;',
+ if re.match(r'chunked($|;)',
response.fields.get('Transfer-Encoding', '')):
yield self._read_response_by_chunk(response)
elif 'Content-Length' in response.fields:
|
Fixes chunked transfer encoding field match.
|
diff --git a/karma.conf.js b/karma.conf.js
index <HASH>..<HASH> 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -11,6 +11,7 @@ module.exports = function(config) {
files: [
'https://ajax.googleapis.com/ajax/libs/jquery/2.2.1/jquery.min.js',
+ 'https://cdnjs.cloudflare.com/ajax/libs/velocity/1.2.3/velocity.js',
'dist/garnish-0.1.js',
'test/**/*.js'
],
diff --git a/karma.coverage.conf.js b/karma.coverage.conf.js
index <HASH>..<HASH> 100644
--- a/karma.coverage.conf.js
+++ b/karma.coverage.conf.js
@@ -9,6 +9,7 @@ module.exports = function(config) {
files: [
'https://ajax.googleapis.com/ajax/libs/jquery/2.2.1/jquery.min.js',
+ 'https://cdnjs.cloudflare.com/ajax/libs/velocity/1.2.3/velocity.js',
'dist/garnish-0.1.js',
'test/**/*.js'
],
|
Added Velocity.js to karma config files
|
diff --git a/sockeye/data_io.py b/sockeye/data_io.py
index <HASH>..<HASH> 100644
--- a/sockeye/data_io.py
+++ b/sockeye/data_io.py
@@ -630,7 +630,7 @@ def prepare_data(source_fnames: List[str],
save_shard(shard_idx, data_loader, shard_sources, shard_target,
shard_stats, output_prefix, keep_tmp_shard_files)
else:
- logger.info(f"Processing shards using {max_processes} processes.")
+ logger.info("Processing shards using %s processes.", max_processes)
# Process shards in parallel using max_processes process
results = []
pool = multiprocessing.pool.Pool(processes=max_processes)
|
fix Python <I> build, no format strings (#<I>)
|
diff --git a/tenacity/tests/test_asyncio.py b/tenacity/tests/test_asyncio.py
index <HASH>..<HASH> 100644
--- a/tenacity/tests/test_asyncio.py
+++ b/tenacity/tests/test_asyncio.py
@@ -36,9 +36,8 @@ def asynctest(callable_):
@retry
-@asyncio.coroutine
-def _retryable_coroutine(thing):
- yield from asyncio.sleep(0.00001)
+async def _retryable_coroutine(thing):
+ await asyncio.sleep(0.00001)
return thing.go()
|
Test async keyword
This is possible since tenacity dropped support for <I>.
|
diff --git a/lib/puppet/provider/package/gem.rb b/lib/puppet/provider/package/gem.rb
index <HASH>..<HASH> 100755
--- a/lib/puppet/provider/package/gem.rb
+++ b/lib/puppet/provider/package/gem.rb
@@ -20,7 +20,9 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
else
gem_list_command << "--remote"
end
-
+ if options[:source]
+ gem_list_command << "--source" << options[:source]
+ end
if name = options[:justme]
gem_list_command << name + "$"
end
@@ -104,7 +106,9 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
def latest
# This always gets the latest version available.
- hash = self.class.gemlist(:justme => resource[:name])
+ gemlist_options = {:justme => resource[:name]}
+ gemlist_options.merge!({:source => resource[:source]}) unless resource[:source].nil?
+ hash = self.class.gemlist(gemlist_options)
hash[:ensure][0]
end
|
(#<I>) add --source to the gem list command
Without this patch the `gem list` command in the gem package provider
will search all package repositories. This is a problem because the end
user is likely expecting Puppet to only search the specified repository
instead of all repositories.
This patch fixes the problem by passing the source parameter value onto
the gem list command as the `--source` command line option.
Commit message amended by Jeff McCune <<EMAIL>>
|
diff --git a/src/test/basic.test.js b/src/test/basic.test.js
index <HASH>..<HASH> 100644
--- a/src/test/basic.test.js
+++ b/src/test/basic.test.js
@@ -34,6 +34,11 @@ describe('basic', () => {
expect(() => styled.notExistTag``).toThrow()
})
+ it('should allow for inheriting components that are not styled', () => {
+ const componentConfig = { name: 'Parent', template: '<div><slot/></div>', methods: {} }
+ expect(() => styled(componentConfig, {})``).toNotThrow()
+ })
+
// it('should generate an empty tag once rendered', () => {
// const Comp = styled.div``
// const vm = new Vue(Comp).$mount()
diff --git a/src/utils/isStyledComponent.js b/src/utils/isStyledComponent.js
index <HASH>..<HASH> 100644
--- a/src/utils/isStyledComponent.js
+++ b/src/utils/isStyledComponent.js
@@ -1,5 +1,5 @@
export default function isStyledComponent (target) {
return target &&
target.methods &&
- typeof target.methods.generateAndInjectStyles() === 'string'
+ typeof target.methods.generateAndInjectStyles === 'function'
}
|
Fixed error when inheriting from components with methods
|
diff --git a/lib/bugsnag/cleaner.rb b/lib/bugsnag/cleaner.rb
index <HASH>..<HASH> 100644
--- a/lib/bugsnag/cleaner.rb
+++ b/lib/bugsnag/cleaner.rb
@@ -38,7 +38,7 @@ module Bugsnag
end
clean_hash
when Array, Set
- obj.map { |el| traverse_object(el, seen, scope) }.compact
+ obj.map { |el| traverse_object(el, seen, scope) }
when Numeric, TrueClass, FalseClass
obj
when String
diff --git a/spec/cleaner_spec.rb b/spec/cleaner_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/cleaner_spec.rb
+++ b/spec/cleaner_spec.rb
@@ -19,6 +19,11 @@ describe Bugsnag::Cleaner do
expect(subject.clean_object(a)).to eq(["[RECURSION]", "hello"])
end
+ it "doesn't remove nil from arrays" do
+ a = ["b", nil, "c"]
+ expect(subject.clean_object(a)).to eq(["b", nil, "c"])
+ end
+
it "allows multiple copies of the same string" do
a = {:name => "bugsnag"}
a[:second] = a[:name]
|
Prevent nil from being cleaned in arrays and sets (#<I>)
|
diff --git a/railties/lib/rails/generators/testing/assertions.rb b/railties/lib/rails/generators/testing/assertions.rb
index <HASH>..<HASH> 100644
--- a/railties/lib/rails/generators/testing/assertions.rb
+++ b/railties/lib/rails/generators/testing/assertions.rb
@@ -1,3 +1,5 @@
+require 'shellwords'
+
module Rails
module Generators
module Testing
|
Require shellwords since it is dependecy of this file
Closes #<I>
|
diff --git a/src/PatternLab/PatternEngine/Twig/PatternEngineRule.php b/src/PatternLab/PatternEngine/Twig/PatternEngineRule.php
index <HASH>..<HASH> 100644
--- a/src/PatternLab/PatternEngine/Twig/PatternEngineRule.php
+++ b/src/PatternLab/PatternEngine/Twig/PatternEngineRule.php
@@ -33,7 +33,10 @@ class PatternEngineRule extends Rule {
*/
public function getPatternLoader($options = array()) {
- $twigLoader = new PatternLoader(Config::$options["patternSourceDir"],array("patternPaths" => $options["patternPaths"]));
+ //default var
+ $patternSourceDir = Config::getOption("patternSourceDir");
+
+ $twigLoader = new PatternLoader($patternSourceDir,array("patternPaths" => $options["patternPaths"]));
return new \Twig_Environment($twigLoader);
|
matching the get/set changes in core
|
diff --git a/src/selectivity-dropdown.js b/src/selectivity-dropdown.js
index <HASH>..<HASH> 100644
--- a/src/selectivity-dropdown.js
+++ b/src/selectivity-dropdown.js
@@ -584,7 +584,10 @@ $.extend(SelectivityDropdown.prototype, EventDelegator.prototype, {
*/
_showResults: function(results, options) {
- this.showResults(this.selectivity.filterResults(results), options);
+ this.showResults(
+ this.selectivity.filterResults(results),
+ $.extend({ dropdown: this }, options)
+ );
},
/**
diff --git a/src/selectivity-submenu.js b/src/selectivity-submenu.js
index <HASH>..<HASH> 100644
--- a/src/selectivity-submenu.js
+++ b/src/selectivity-submenu.js
@@ -126,7 +126,7 @@ var callSuper = Selectivity.inherits(SelectivitySubmenu, SelectivityDropdown, {
}
}
- if (this.submenu) {
+ if (this.submenu && options.dropdown !== this) {
this.submenu.showResults(results, options);
} else {
results.forEach(setSelectable);
|
Fix race condition in pagination when submenus are open.
|
diff --git a/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/api/config/MasterSlaveRuleConfiguration.java b/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/api/config/MasterSlaveRuleConfiguration.java
index <HASH>..<HASH> 100644
--- a/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/api/config/MasterSlaveRuleConfiguration.java
+++ b/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/api/config/MasterSlaveRuleConfiguration.java
@@ -29,6 +29,7 @@ import lombok.Setter;
import javax.sql.DataSource;
import java.util.Collection;
import java.util.HashMap;
+import java.util.LinkedList;
import java.util.Map;
/**
@@ -44,7 +45,7 @@ public class MasterSlaveRuleConfiguration {
private String masterDataSourceName;
- private Collection<String> slaveDataSourceNames;
+ private Collection<String> slaveDataSourceNames = new LinkedList<>();
private MasterSlaveLoadBalanceAlgorithmType loadBalanceAlgorithmType;
|
refactor MasterSlaveRuleConfiguration
|
diff --git a/src/Service/Emailer.php b/src/Service/Emailer.php
index <HASH>..<HASH> 100644
--- a/src/Service/Emailer.php
+++ b/src/Service/Emailer.php
@@ -610,13 +610,11 @@ class Emailer
if (Environment::not(Environment::ENV_PROD)) {
if (Config::get('EMAIL_OVERRIDE')) {
$oEmail->to->email = Config::get('EMAIL_OVERRIDE');
- } elseif (Config::get('EMAIL_WHITELIST')) {
+ } elseif (!empty(Config::get('EMAIL_WHITELIST'))) {
$aWhitelist = array_values(
array_filter(
- (array) json_decode(
- Config::get('EMAIL_WHITELIST')
- )
+ (array) Config::get('EMAIL_WHITELIST')
)
);
|
Fixes issue with already decoded config value
|
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowIntent.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowIntent.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowIntent.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowIntent.java
@@ -171,16 +171,16 @@ public class ShadowIntent {
}
@Implementation
- public boolean hasExtra(String name) {
- return extras.containsKey(name);
- }
-
- @Implementation
public void putExtra(String key, byte[] value) {
extras.put(key, value);
}
@Implementation
+ public boolean hasExtra(String name) {
+ return extras.containsKey(name);
+ }
+
+ @Implementation
public String getStringExtra(String name) {
return (String) extras.get(name);
}
@@ -211,6 +211,11 @@ public class ShadowIntent {
public Serializable getSerializableExtra(String name) {
return (Serializable) extras.get(name);
}
+
+ @Implementation
+ public void removeExtra(String name) {
+ extras.remove(name);
+ }
@Implementation
public Intent setComponent(ComponentName componentName) {
|
added removeExtra to ShadowIntent
|
diff --git a/tests/PasswordHasherTest.php b/tests/PasswordHasherTest.php
index <HASH>..<HASH> 100644
--- a/tests/PasswordHasherTest.php
+++ b/tests/PasswordHasherTest.php
@@ -20,7 +20,7 @@ class PasswordHashTester extends PHPUnit_Framework_TestCase {
$password = new Password($password);
$hash = $hasher->make($password);
- $this->assertTrue(password_verify($password, (string)$hash));
+ $this->assertTrue(password_verify((string)$password, (string)$hash));
$hash = new PasswordHash(password_hash($password, $algo), $hasher);
$this->assertTrue($hasher->check($password, $hash));
|
Another fix for hhvm
|
diff --git a/gobblin-utility/src/main/java/gobblin/util/JobLauncherUtils.java b/gobblin-utility/src/main/java/gobblin/util/JobLauncherUtils.java
index <HASH>..<HASH> 100644
--- a/gobblin-utility/src/main/java/gobblin/util/JobLauncherUtils.java
+++ b/gobblin-utility/src/main/java/gobblin/util/JobLauncherUtils.java
@@ -212,7 +212,7 @@ public class JobLauncherUtils {
private static ParallelRunner getParallelRunner(FileSystem fs, Closer closer, int parallelRunnerThreads,
Map<String, ParallelRunner> parallelRunners) {
- String uriAndHomeDir = fs.getUri().toString() + fs.getHomeDirectory();
+ String uriAndHomeDir = new Path(new Path(fs.getUri()), fs.getHomeDirectory()).toString();
if (!parallelRunners.containsKey(uriAndHomeDir)) {
parallelRunners.put(uriAndHomeDir, closer.register(new ParallelRunner(parallelRunnerThreads, fs)));
}
|
Addressing comments on PR-<I>
|
diff --git a/lib/markdown.js b/lib/markdown.js
index <HASH>..<HASH> 100644
--- a/lib/markdown.js
+++ b/lib/markdown.js
@@ -33,6 +33,8 @@ Object.defineProperty(helpers, 'markdown', {
markdown = val;
},
get: function() {
+ // this is defined as a getter to avoid calling this function
+ // unless the helper is actually used
return markdown || (markdown = require('helper-markdown')());
}
});
@@ -52,13 +54,4 @@ Object.defineProperty(helpers, 'markdown', {
* @api public
*/
-Object.defineProperty(helpers, 'md', {
- configurable: true,
- enumerable: true,
- set: function(val) {
- md = val;
- },
- get: function() {
- return md || (md = require('helper-md'));
- }
-});
+helpers.md = require('helper-md');
|
add comments
also export the `md` helper directly
|
diff --git a/client.go b/client.go
index <HASH>..<HASH> 100644
--- a/client.go
+++ b/client.go
@@ -8,8 +8,8 @@ import (
"sync"
"time"
- "code.google.com/p/go.net/ipv4"
- "code.google.com/p/go.net/ipv6"
+ "github.com/hashicorp/go.net/ipv4"
+ "github.com/hashicorp/go.net/ipv6"
"github.com/miekg/dns"
)
|
Switch to fork of go.net
|
diff --git a/src/main/com/siemens/ct/exi/datatype/NBitBigIntegerDatatype.java b/src/main/com/siemens/ct/exi/datatype/NBitBigIntegerDatatype.java
index <HASH>..<HASH> 100644
--- a/src/main/com/siemens/ct/exi/datatype/NBitBigIntegerDatatype.java
+++ b/src/main/com/siemens/ct/exi/datatype/NBitBigIntegerDatatype.java
@@ -68,6 +68,14 @@ public class NBitBigIntegerDatatype extends AbstractDatatype {
numberOfBits4Range = MethodsBag.getCodingLength(boundedRange);
}
+ public int getNumberOfBits() {
+ return numberOfBits4Range;
+ }
+
+ public BigInteger getLowerBound() {
+ return lowerBound;
+ }
+
protected static final HugeIntegerValue getHugeInteger(BigInteger bi) {
if (bi.bitLength() <= 63) {
// fits into long
|
consistency with other n-bit datatypes
|
diff --git a/ramda.js b/ramda.js
index <HASH>..<HASH> 100644
--- a/ramda.js
+++ b/ramda.js
@@ -42,7 +42,7 @@
from = from || 0;
to = to || args.length;
- arr = new Array (from - to);
+ arr = new Array (to - from);
i = from - 1;
while (++i < to) {
|
Corrected length definition in _slice
|
diff --git a/library/WT/Controller/Individual.php b/library/WT/Controller/Individual.php
index <HASH>..<HASH> 100644
--- a/library/WT/Controller/Individual.php
+++ b/library/WT/Controller/Individual.php
@@ -748,7 +748,7 @@ class WT_Controller_Individual extends WT_Controller_GedcomRecord {
$controller
->addInlineJavascript('
jQuery("#sidebarAccordion").accordion({
- active:"#family_nav",
+ active: 1,
autoHeight: false,
collapsible: true,
icons:{ "header": "ui-icon-triangle-1-s", "headerSelected": "ui-icon-triangle-1-n" }
|
A change in the jquery api for accordion elements means that the "active" option can now only accept boolean or integer values, not selectors.
|
diff --git a/src/index.js b/src/index.js
index <HASH>..<HASH> 100644
--- a/src/index.js
+++ b/src/index.js
@@ -110,8 +110,9 @@ let cssVarsObserver = null;
* @param {function} [options.onComplete] Callback after all CSS has been
* processed, legacy-compatible CSS has been generated, and
* (optionally) the DOM has been updated. Passes 1) a CSS
- * string with CSS variable values resolved, and 2) a
- * reference to the appended <style> node.
+ * string with CSS variable values resolved, 2) a reference to
+ * the appended <style> node, and 3) an object containing all
+ * custom properies names and values.
*
* @example
*
|
Added JSDoc comments for options.onComplete
|
diff --git a/eZ/Publish/API/Repository/Values/ObjectState/ObjectStateGroup.php b/eZ/Publish/API/Repository/Values/ObjectState/ObjectStateGroup.php
index <HASH>..<HASH> 100644
--- a/eZ/Publish/API/Repository/Values/ObjectState/ObjectStateGroup.php
+++ b/eZ/Publish/API/Repository/Values/ObjectState/ObjectStateGroup.php
@@ -40,7 +40,7 @@ abstract class ObjectStateGroup extends ValueObject
*
* @var string
*/
- public $defaultLanguageCode;
+ protected $defaultLanguageCode;
/**
* The available language codes for names an descriptions
|
Fixed: Only protected members in domain value objects.
|
diff --git a/lib/reporter.js b/lib/reporter.js
index <HASH>..<HASH> 100644
--- a/lib/reporter.js
+++ b/lib/reporter.js
@@ -186,8 +186,12 @@ module.exports = class Reporter extends events.EventEmitter {
}
await this._fnAfterConfigLoaded(this)
- this.options.tenant = this.options.tenant || {name: ''}
+
+ if (this.options.tempDirectory && !path.isAbsolute(this.options.tempDirectory)) {
+ this.options.tempDirectory = path.join(this.options.rootDirectory, this.options.tempDirectory)
+ }
this.options.tempDirectory = this.options.tempDirectory || path.join(os.tmpdir(), 'jsreport')
+
this.options.tempAutoCleanupDirectory = path.join(this.options.tempDirectory, 'autocleanup')
this.options.tempCoreDirectory = path.join(this.options.tempDirectory, 'core')
this.options.store = this.options.store || {provider: 'memory'}
|
support relative tempDirectory in config
|
diff --git a/content/template/listTemplate/template_A_listCourses.php b/content/template/listTemplate/template_A_listCourses.php
index <HASH>..<HASH> 100644
--- a/content/template/listTemplate/template_A_listCourses.php
+++ b/content/template/listTemplate/template_A_listCourses.php
@@ -196,22 +196,21 @@ foreach($ede as $e)
$occIds[] = $e->OccationID;
}
-$pricenames = get_transient('eduadmin-publicpricenames');
-//if(!$pricenames)
+$pricenames = get_transient('eduadmin-publicobjectpricenames');
+if(!$pricenames)
{
$ft = new XFiltering();
$f = new XFilter('PublicPriceName', '=', 'true');
$ft->AddItem($f);
$pricenames = $eduapi->GetObjectPriceName($edutoken,'',$ft->ToString());
- set_transient('eduadmin-publicpricenames', $pricenames, HOUR_IN_SECONDS);
+ set_transient('eduadmin-publicobjectpricenames', $pricenames, HOUR_IN_SECONDS);
}
if(!empty($pricenames))
{
$ede = array_filter($ede, function($object) use (&$pricenames) {
$pn = $pricenames;
- print_r($pn);
foreach($pn as $subj)
{
if($object->ObjectID == $subj->ObjectID)
|
1 file changed, 3 insertions(+), 4 deletions(-)
On branch master
Your branch is up-to-date with 'origin/master'.
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: content/template/listTemplate/template_A_listCourses.php
|
diff --git a/subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java b/subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java
index <HASH>..<HASH> 100644
--- a/subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java
+++ b/subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java
@@ -3065,7 +3065,14 @@ public class Sql {
handleError(connection, e);
throw e;
} finally {
- if (connection != null) connection.setAutoCommit(savedAutoCommit);
+ if (connection != null) {
+ try {
+ connection.setAutoCommit(savedAutoCommit);
+ }
+ catch (SQLException e) {
+ LOG.finest("Caught exception resetting auto commit: " + e.getMessage() + " - continuing");
+ }
+ }
cacheConnection = false;
closeResources(connection, null);
cacheConnection = savedCacheConnection;
|
GROOVY-<I>: Sql.withTransaction setAutoCommit in finally not wrapped in try/catch
|
diff --git a/plugins/Diagnostics/Diagnostic/ReportInformational.php b/plugins/Diagnostics/Diagnostic/ReportInformational.php
index <HASH>..<HASH> 100644
--- a/plugins/Diagnostics/Diagnostic/ReportInformational.php
+++ b/plugins/Diagnostics/Diagnostic/ReportInformational.php
@@ -64,6 +64,10 @@ class ReportInformational implements Diagnostic
$row = null;
}
+ if ($numDays === 1 && defined('PIWIK_TEST_MODE') && PIWIK_TEST_MODE) {
+ return '0'; // fails randomly in tests
+ }
+
if (!empty($row)) {
return '1';
}
|
Fix randomly failing test diagnostic page UI test (#<I>)
Depending of the time of the day it returns 0 or 1. There might be better ways to fix this but thought to keep it simple. Happy to change if needed.
<URL>
|
diff --git a/src/main/java/net/sundell/snax/SNAXParser.java b/src/main/java/net/sundell/snax/SNAXParser.java
index <HASH>..<HASH> 100755
--- a/src/main/java/net/sundell/snax/SNAXParser.java
+++ b/src/main/java/net/sundell/snax/SNAXParser.java
@@ -132,7 +132,7 @@ public class SNAXParser<T> {
done = false;
}
- private XMLEvent processEvent(XMLEvent event) throws XMLStreamException, SNAXUserException {
+ private XMLEvent processEvent(XMLEvent event) throws SNAXUserException {
try {
int type = event.getEventType();
currentLocation = event.getLocation();
@@ -200,6 +200,11 @@ public class SNAXParser<T> {
e.setLocation(currentLocation);
throw e;
}
+ catch (Exception e) {
+ SNAXUserException se = new SNAXUserException(e);
+ se.setLocation(currentLocation);
+ throw se;
+ }
}
private void checkState(boolean test, String message) {
|
Issue 5: Wrap exceptions thrown within processEvent as SNAXUserException
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.