diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/fat/directory.go b/fat/directory.go
index <HASH>..<HASH> 100644
--- a/fat/directory.go
+++ b/fat/directory.go
@@ -120,6 +120,10 @@ func (d *DirectoryEntry) Name() string {
}
func (d *DirectoryEntry) ShortName() string {
+ if d.entry.name == "." || d.entry.name == ".." {
+ return d.entry.name
+ }
+
return fmt.Sprintf("%s.%s", d.entry.name, d.entry.ext)
}
|
fat: handle ./.. in the directory name
|
diff --git a/src/Command/DropDatabaseDoctrineCommand.php b/src/Command/DropDatabaseDoctrineCommand.php
index <HASH>..<HASH> 100644
--- a/src/Command/DropDatabaseDoctrineCommand.php
+++ b/src/Command/DropDatabaseDoctrineCommand.php
@@ -89,7 +89,8 @@ EOT
$ifExists = $input->getOption('if-exists');
- unset($params['dbname'], $params['url']);
+ // Need to get rid of _every_ occurrence of dbname from connection configuration
+ unset($params['dbname'], $params['path'], $params['url']);
$connection->close();
$connection = DriverManager::getConnection($params);
|
use the same code in drop as in create
|
diff --git a/array/rotate_array.py b/array/rotate_array.py
index <HASH>..<HASH> 100644
--- a/array/rotate_array.py
+++ b/array/rotate_array.py
@@ -28,6 +28,10 @@ def rotate_one_by_one(nums, k):
nums[0] = temp
+#
+# Reverse segments of the array, followed by the entire array
+# T(n)- O(n)
+#
def rotate(nums, k):
"""
:type nums: List[int]
|
Added time complexity of the optimized solution
|
diff --git a/hbmqtt/utils.py b/hbmqtt/utils.py
index <HASH>..<HASH> 100644
--- a/hbmqtt/utils.py
+++ b/hbmqtt/utils.py
@@ -13,4 +13,11 @@ def not_in_dict_or_none(dict, key):
if key not in dict or dict[key] is None:
return True
else:
- return False
\ No newline at end of file
+ return False
+
+
+def format_client_message(session=None, address=None, port=None, id=None):
+ if session:
+ return "(client @=%s:%d id=%s)" % (session.remote_address, session.remote_port, session.client_id)
+ else:
+ return "(client @=%s:%d id=%s)" % (address, port, id)
|
Add method for formatting client info (address, port, id)
|
diff --git a/telethon/client/auth.py b/telethon/client/auth.py
index <HASH>..<HASH> 100644
--- a/telethon/client/auth.py
+++ b/telethon/client/auth.py
@@ -155,7 +155,7 @@ class AuthMethods:
'not login to the bot account using the provided '
'bot_token (it may not be using the user you expect)'
)
- elif not callable(phone) and phone != me.phone:
+ elif phone and not callable(phone) and utils.parse_phone(phone) != me.phone:
warnings.warn(
'the session already had an authorized user so it did '
'not login to the user account using the provided '
|
Fix warning when using formatted phones in start (#<I>)
|
diff --git a/libraries/botframework-connector/setup.py b/libraries/botframework-connector/setup.py
index <HASH>..<HASH> 100644
--- a/libraries/botframework-connector/setup.py
+++ b/libraries/botframework-connector/setup.py
@@ -12,6 +12,7 @@ REQUIRES = [
"PyJWT==1.5.3",
"botbuilder-schema>=4.7.1",
"adal==1.2.1",
+ "msal==1.1.0"
]
root = os.path.abspath(os.path.dirname(__file__))
|
Updated botframework-connector setup.py requirements.
|
diff --git a/test/spec.js b/test/spec.js
index <HASH>..<HASH> 100644
--- a/test/spec.js
+++ b/test/spec.js
@@ -92,7 +92,7 @@ describe('Task: checkDependencies', () => {
});
// Deprecated.
- it('should install missing packages and continue when `install` and `continue`' +
+ it('(deprecated) should install missing packages and continue when `install` and `continue`' +
' are set to true',
function (done) {
this.timeout(30000);
|
Mark `continue` as deprecated in the test message
|
diff --git a/expression/bench_test.go b/expression/bench_test.go
index <HASH>..<HASH> 100644
--- a/expression/bench_test.go
+++ b/expression/bench_test.go
@@ -1118,8 +1118,6 @@ func genVecExprBenchCase(ctx sessionctx.Context, funcName string, testCase vecEx
// testVectorizedEvalOneVec is used to verify that the vectorized
// expression is evaluated correctly during projection
func testVectorizedEvalOneVec(t *testing.T, vecExprCases vecExprBenchCases) {
- t.Parallel()
-
ctx := mock.NewContext()
for funcName, testCases := range vecExprCases {
for _, testCase := range testCases {
@@ -1321,8 +1319,6 @@ func removeTestOptions(args []string) []string {
// testVectorizedBuiltinFunc is used to verify that the vectorized
// expression is evaluated correctly
func testVectorizedBuiltinFunc(t *testing.T, vecExprCases vecExprBenchCases) {
- t.Parallel()
-
testFunc := make(map[string]bool)
argList := removeTestOptions(flag.Args())
testAll := len(argList) == 0
|
expression: fix data race in builtin_other_vec_generated_test.go (#<I>)
|
diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/DefaultIntegrationTestConfig.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/DefaultIntegrationTestConfig.java
index <HASH>..<HASH> 100644
--- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/DefaultIntegrationTestConfig.java
+++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/DefaultIntegrationTestConfig.java
@@ -69,6 +69,7 @@ public class DefaultIntegrationTestConfig {
LoggingPreferences logs = new LoggingPreferences();
logs.enable(LogType.PERFORMANCE, Level.ALL);
options.setCapability(CapabilityType.LOGGING_PREFS, logs);
+ options.setAcceptInsecureCerts(true);
ChromeDriver driver = new ChromeDriver(options);
|
Allow self-signed certs when running integration tests
[#<I>] <URL>
|
diff --git a/salt/modules/virtualenv_mod.py b/salt/modules/virtualenv_mod.py
index <HASH>..<HASH> 100644
--- a/salt/modules/virtualenv_mod.py
+++ b/salt/modules/virtualenv_mod.py
@@ -176,7 +176,7 @@ def create(path,
cmd.append('--distribute')
if python is not None and python.strip() != '':
- if not os.access(python, os.X_OK):
+ if not salt.utils.which(python):
raise salt.exceptions.CommandExecutionError(
'Requested python ({0}) does not appear '
'executable.'.format(python)
|
allow lookup of python on system path fix: #<I>
fixes #<I>
|
diff --git a/src/playbacks/hls/hls.js b/src/playbacks/hls/hls.js
index <HASH>..<HASH> 100644
--- a/src/playbacks/hls/hls.js
+++ b/src/playbacks/hls/hls.js
@@ -44,6 +44,7 @@ export default class HLS extends HTML5VideoPlayback {
// be ignored. "playableRegionDuration" does not consider this
this.playableRegionDuration = 0
options.autoPlay && this.setupHls()
+ this.recoverAttemptsRemaining = options.hlsRecoverAttempts || 16
}
setupHls() {
@@ -134,7 +135,8 @@ export default class HLS extends HTML5VideoPlayback {
}
onError(evt, data) {
- if (data && data.fatal) {
+ if (data && data.fatal && this.recoverAttemptsRemaining > 0) {
+ this.recoverAttemptsRemaining -= 1
switch (data.type) {
case Hls.ErrorTypes.NETWORK_ERROR:
hls.startLoad()
|
hls: Limmit recover attempts.
|
diff --git a/mapi/constants.py b/mapi/constants.py
index <HASH>..<HASH> 100644
--- a/mapi/constants.py
+++ b/mapi/constants.py
@@ -1,4 +1,5 @@
# coding=utf-8
+
from datetime import date as _date
ABOUT_AUTHOR = 'Jessy Williams'
@@ -66,4 +67,5 @@ USER_AGENT_EDGE = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36
USER_AGENT_IOS = 'Mozilla/5.0 (iPhone; CPU iPhone OS 10_0_1 like Mac OS X) AppleWebKit/602.1.50 (KHTML, like Gecko) Version/10.0 Mobile/14A403 Safari/602.1'
USER_AGENT_ALL = (USER_AGENT_CHROME, USER_AGENT_EDGE, USER_AGENT_IOS)
-ENV_TMDB_API_KEY = 'TMDB_API_KEY'
+ENV_TMDB_API_KEY = 'API_KEY_TMDB'
+ENV_TVDB_API_KEY = 'API_KEY_TVDB'
|
Renames api key environment variable constants
|
diff --git a/src/models/event-timeline-set.js b/src/models/event-timeline-set.js
index <HASH>..<HASH> 100644
--- a/src/models/event-timeline-set.js
+++ b/src/models/event-timeline-set.js
@@ -746,6 +746,10 @@ EventTimelineSet.prototype._aggregateRelations = function(event) {
eventType,
this.room,
);
+ const relatesToEvent = this.findEventById(relatesToEventId);
+ if (relatesToEvent) {
+ relatesToEvent.emit("Event.relationsCreated", relationType, eventType);
+ }
}
relationsWithEventType.addEvent(event);
|
Add `Event.relationsCreated` event to listen for future relations collections
If you ask for relations but none currently exist, we return `null` to avoid the
overhead of many empty relations objects in memory. However, we still want some
way to alert consumers when one _is_ later made, so this event level event
provides that.
Part of <URL>
|
diff --git a/mock/mock.go b/mock/mock.go
index <HASH>..<HASH> 100644
--- a/mock/mock.go
+++ b/mock/mock.go
@@ -147,7 +147,7 @@ func (c *Call) After(d time.Duration) *Call {
}
// Run sets a handler to be called before returning. It can be used when
-// mocking a method such as unmarshalers that takes a pointer to a struct and
+// mocking a method (such as an unmarshaler) that takes a pointer to a struct and
// sets properties in such struct
//
// Mock.On("Unmarshal", AnythingOfType("*map[string]interface{}").Return().Run(func(args Arguments) {
|
Grammatical change in documentation for Run()
There was a switch between singular and plural which made this line a
little bit hard to parse.
|
diff --git a/js/ghostdown.js b/js/ghostdown.js
index <HASH>..<HASH> 100644
--- a/js/ghostdown.js
+++ b/js/ghostdown.js
@@ -87,11 +87,11 @@ window.socket = io();
$(e.target).closest('section').addClass('active');
});
- //You're probably looking for this to add functionality when the text
- //changes.
+ // You're probably looking for this to add functionality when the text
+ // changes.
editor.on ("change", function () {
updatePreview();
- if (editInProgress) { return false; }
+ if (editInProgress) { editInProgress = false; return false; }
window.socket.emit('markdown', editor.getValue());
});
|
Fixed issue where flag wasn't being reset
|
diff --git a/plugins/guests/esxi/cap/public_key.rb b/plugins/guests/esxi/cap/public_key.rb
index <HASH>..<HASH> 100644
--- a/plugins/guests/esxi/cap/public_key.rb
+++ b/plugins/guests/esxi/cap/public_key.rb
@@ -24,7 +24,9 @@ module VagrantPlugins
set -e
SSH_DIR="$(grep -q '^AuthorizedKeysFile\s*\/etc\/ssh\/keys-%u\/authorized_keys$' /etc/ssh/sshd_config && echo -n /etc/ssh/keys-${USER} || echo -n ~/.ssh)"
mkdir -p "${SSH_DIR}"
- chmod 0700 "${SSH_DIR}"
+ # NB in ESXi 7.0 we cannot change the /etc/ssh/keys-root directory
+ # permissions, so ignore any errors.
+ chmod 0700 "${SSH_DIR}" || true
cat '#{remote_path}' >> "${SSH_DIR}/authorized_keys"
chmod 0600 "${SSH_DIR}/authorized_keys"
rm -f '#{remote_path}'
|
esxi guest: do not fail when we cannot set the ssh directory permissions in esxi <I>
|
diff --git a/SingularityService/src/main/java/com/hubspot/singularity/data/RackManager.java b/SingularityService/src/main/java/com/hubspot/singularity/data/RackManager.java
index <HASH>..<HASH> 100644
--- a/SingularityService/src/main/java/com/hubspot/singularity/data/RackManager.java
+++ b/SingularityService/src/main/java/com/hubspot/singularity/data/RackManager.java
@@ -50,12 +50,13 @@ public class RackManager extends AbstractMachineManager<SingularityRack> {
return getObject(rackName);
}
+ @Override
public int getNumActive() {
if (leaderCache.active()) {
return Math.toIntExact(leaderCache.getRacks().stream().filter(x -> x.getCurrentState().getState().equals(MachineState.ACTIVE)).count());
}
- return getNumObjectsAtState(MachineState.ACTIVE);
+ return super.getNumActive();
}
@Override
|
Delegate to superclass when appropriate.
|
diff --git a/systemd/test/test_daemon.py b/systemd/test/test_daemon.py
index <HASH>..<HASH> 100644
--- a/systemd/test/test_daemon.py
+++ b/systemd/test/test_daemon.py
@@ -26,7 +26,7 @@ def closing_socketpair(family):
def test_booted():
- if os.path.exists('/run/systemd'):
+ if os.path.exists('/run/systemd/system'):
# assume we are running under systemd
assert booted()
else:
|
tests: mirror is-systemd-running test from systemd
|
diff --git a/lib/solve.rb b/lib/solve.rb
index <HASH>..<HASH> 100644
--- a/lib/solve.rb
+++ b/lib/solve.rb
@@ -25,7 +25,10 @@ module Solve
# @param [Array<Solve::Demand>, Array<String, String>] demands
#
# @option options [#say] :ui (nil)
- # a ui object for output
+ # a ui object for output, this will be used to output from a Solve::Tracers::HumanReadable if
+ # no other tracer is provided in options[:tracer]
+ # @option options [AbstractTracer] :tracer (nil)
+ # a Tracer object that is used to format and output tracing information
# @option options [Boolean] :sorted (false)
# should the output be a sorted list rather than a Hash
#
@@ -33,7 +36,7 @@ module Solve
#
# @return [Hash]
def it!(graph, demands, options = {})
- @tracer = Solve::Tracers.human_readable(options[:ui])
+ @tracer = options[:tracer] || Solve::Tracers.human_readable(options[:ui])
Solver.new(graph, demands, options[:ui]).resolve(options)
end
|
Allow a user to pass in their own Tracer object so they are not forced
into using the HumanReadable one.
|
diff --git a/lib/action_cable_notifications/callbacks.rb b/lib/action_cable_notifications/callbacks.rb
index <HASH>..<HASH> 100644
--- a/lib/action_cable_notifications/callbacks.rb
+++ b/lib/action_cable_notifications/callbacks.rb
@@ -45,8 +45,6 @@ module ActionCableNotifications
end
end
- private
-
def notify_create
self.ActionCableNotificationsOptions.each do |broadcasting, options|
# Checks if record is within scope before broadcasting
@@ -89,5 +87,6 @@ module ActionCableNotifications
end
end
end
+
end
end
|
Allows callbacks to be called directly on the model instance
|
diff --git a/src/PackageChangeLogServiceProvider.php b/src/PackageChangeLogServiceProvider.php
index <HASH>..<HASH> 100644
--- a/src/PackageChangeLogServiceProvider.php
+++ b/src/PackageChangeLogServiceProvider.php
@@ -12,7 +12,10 @@ class PackageChangeLogServiceProvider extends ServiceProvider
Commands\PCLCommand::class,
]);
- $this->autoReg();
+ // append event
+ if (!app('cache')->store('file')->has('ct-pcl')) {
+ $this->autoReg();
+ }
}
protected function autoReg()
@@ -60,6 +63,11 @@ EOT;
$final = str_replace('\/', '/', $json);
file_put_contents($comp_file, $final);
}
+
+ // run check once
+ app('cache')->store('file')->remember('ct-pcl', 10080, function () {
+ return 'added';
+ });
}
protected function checkExist($file, $search)
|
run append chk only once
|
diff --git a/lib/record.js b/lib/record.js
index <HASH>..<HASH> 100644
--- a/lib/record.js
+++ b/lib/record.js
@@ -1,7 +1,7 @@
var _ = require('lodash');
var Record = function(data) {
-
+
var self = this;
this.attributes = {};
@@ -19,7 +19,7 @@ var Record = function(data) {
self._attachment = val;
}
});
-
+
}
Record.prototype.get = function(field) {
@@ -101,7 +101,7 @@ Record.prototype.getAttachment = function() {
}
Record.prototype.setAttachment = function(fileName, body) {
- this._attachment = { filename: fileName, body: body };
+ this._attachment = { fileName: fileName, body: body };
}
Record.prototype.getFileName = function() {
@@ -178,11 +178,11 @@ Record.prototype._getPayload = function(changedOnly) {
if(changedOnly && _.indexOf(self._changed, key) === -1) return;
key = key.toLowerCase();
if(key !== 'id' && key !== self.getExternalIdField()) {
- result[key] = value;
+ result[key] = value;
}
});
return data;
}
-module.exports = Record;
\ No newline at end of file
+module.exports = Record;
|
fixes issue with getFileName and the filename property mismatch #<I>
|
diff --git a/tomodachi/protocol/protobuf_base.py b/tomodachi/protocol/protobuf_base.py
index <HASH>..<HASH> 100644
--- a/tomodachi/protocol/protobuf_base.py
+++ b/tomodachi/protocol/protobuf_base.py
@@ -2,6 +2,7 @@ import logging
import uuid
import time
import base64
+import zlib
from typing import Any, Dict, Tuple, Union
from tomodachi.proto_build.protobuf.sns_sqs_message_pb2 import SNSSQSMessage
@@ -44,7 +45,11 @@ class ProtobufBase(object):
return False, message_uuid, timestamp
obj = proto_class()
- obj.ParseFromString(base64.b64decode(message.data))
+
+ if message.metadata.data_encoding == 'base64':
+ obj.ParseFromString(base64.b64decode(message.data))
+ elif message.metadata.data_encoding == 'base64_gzip_proto':
+ obj.ParseFromString(zlib.decompress(base64.b64decode(message.data)))
if validator is not None:
try:
|
added support for gzipped proto message payload
|
diff --git a/server/migrations/04-00400-query-history-to-batch.js b/server/migrations/04-00400-query-history-to-batch.js
index <HASH>..<HASH> 100644
--- a/server/migrations/04-00400-query-history-to-batch.js
+++ b/server/migrations/04-00400-query-history-to-batch.js
@@ -86,7 +86,7 @@ async function up(queryInterface, config, appLog, nedb, sequelizeDb) {
SELECT
batch_id,
SUM(row_count) AS row_count,
- MAX(incomplete) AS incomplete
+ MAX(CONVERT(INT, incomplete)) AS incomplete
FROM
statements
GROUP BY
|
make view compatible with MSSQL
|
diff --git a/uptick/wallet.py b/uptick/wallet.py
index <HASH>..<HASH> 100644
--- a/uptick/wallet.py
+++ b/uptick/wallet.py
@@ -64,14 +64,15 @@ def addkey(ctx, key):
installedKeys = ctx.bitshares.wallet.getPublicKeys()
if len(installedKeys) == 1:
name = ctx.bitshares.wallet.getAccountFromPublicKey(installedKeys[0])
- account = Account(name, bitshares_instance=ctx.bitshares)
- click.echo("=" * 30)
- click.echo("Setting new default user: %s" % account["name"])
- click.echo()
- click.echo("You can change these settings with:")
- click.echo(" uptick set default_account <account>")
- click.echo("=" * 30)
- config["default_account"] = account["name"]
+ if name: # only if a name to the key was found
+ account = Account(name, bitshares_instance=ctx.bitshares)
+ click.echo("=" * 30)
+ click.echo("Setting new default user: %s" % account["name"])
+ click.echo()
+ click.echo("You can change these settings with:")
+ click.echo(" uptick set default_account <account>")
+ click.echo("=" * 30)
+ config["default_account"] = account["name"]
@main.command()
|
[addkey] do not set a default_account if no name can be found to the key
|
diff --git a/app/lang/fr/cachet.php b/app/lang/fr/cachet.php
index <HASH>..<HASH> 100644
--- a/app/lang/fr/cachet.php
+++ b/app/lang/fr/cachet.php
@@ -4,8 +4,8 @@ return [
// Components
'components' => [
'status' => [
- 1 => 'Opérationel',
- 2 => 'Problèmes de performances',
+ 1 => 'Opérationnel',
+ 2 => 'Problème de performances',
3 => 'Panne partielle',
4 => 'Panne majeure',
],
@@ -28,13 +28,13 @@ return [
// Service Status
'service' => [
- 'good' => 'Tous les systèmes sont fonctionnels.',
- 'bad' => 'Certains systèmes rencontrent des problèmes.',
+ 'good' => 'Tous les services sont fonctionnels.',
+ 'bad' => 'Certains services rencontrent des problèmes.',
],
'api' => [
- 'regenerate' => 'Regénérer une clé API',
- 'revoke' => 'Révoquer cette clé API',
+ 'regenerate' => 'Regénérer une clé d\'API',
+ 'revoke' => 'Révoquer cette clé d\'API',
],
// Other
|
[French] Wording + typo
|
diff --git a/Highlight/Language.php b/Highlight/Language.php
index <HASH>..<HASH> 100644
--- a/Highlight/Language.php
+++ b/Highlight/Language.php
@@ -231,7 +231,7 @@ class Language extends Mode
private function expandMode($mode)
{
- if (count($mode->variants) && !count($mode->cachedVariants)) {
+ if ($mode->variants && !$mode->cachedVariants) {
$mode->cachedVariants = array();
foreach ($mode->variants as $variant) {
@@ -242,7 +242,7 @@ class Language extends Mode
// EXPAND
// if we have variants then essentually "replace" the mode with the variants
// this happens in compileMode, where this function is called from
- if (count($mode->cachedVariants)) {
+ if ($mode->cachedVariants) {
return $mode->cachedVariants;
}
|
Allow variants to be nullable
|
diff --git a/inginious/frontend/lti/lis_outcome_manager.py b/inginious/frontend/lti/lis_outcome_manager.py
index <HASH>..<HASH> 100644
--- a/inginious/frontend/lti/lis_outcome_manager.py
+++ b/inginious/frontend/lti/lis_outcome_manager.py
@@ -36,8 +36,8 @@ class LisOutcomeManager(threading.Thread):
self._course_factory = course_factory
self._lti_consumers = lti_consumers
self._queue = Queue.Queue()
- self.start()
self._stopped = False
+ self.start()
def stop(self):
self._stopped = True
|
(probably) fix a race-condition in lis_outcome_manager, forbidding it to start
|
diff --git a/Gruntfile.js b/Gruntfile.js
index <HASH>..<HASH> 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -42,9 +42,9 @@ module.exports = function(grunt) {
}
},
watch: {
- test: {
+ build: {
files: ['src/**/*.js', 'test/**/*.js', '*.js'],
- tasks: ['eslint:all', 'browserify:build'],
+ tasks: ['build'],
options: {
livereload: true
}
@@ -59,8 +59,8 @@ module.exports = function(grunt) {
}
},
concurrent: {
- test: {
- tasks: ['connect:keepalive', 'watch:test'],
+ build: {
+ tasks: ['connect:keepalive', 'watch:build'],
options: {
logConcurrentOutput : true
}
@@ -102,6 +102,6 @@ module.exports = function(grunt) {
});
grunt.registerTask('build', ['eslint:all', 'browserify:build', 'uglify:build']);
- grunt.registerTask('serve', ['concurrent:test']);
+ grunt.registerTask('serve', ['build', 'concurrent:build']);
grunt.registerTask('test', ['connect:test', 'mocha:test']);
};
|
fix issue with grunt serve not building source when the task first starts
|
diff --git a/src/Illuminate/Support/Facades/Blade.php b/src/Illuminate/Support/Facades/Blade.php
index <HASH>..<HASH> 100755
--- a/src/Illuminate/Support/Facades/Blade.php
+++ b/src/Illuminate/Support/Facades/Blade.php
@@ -17,7 +17,7 @@ namespace Illuminate\Support\Facades;
* @method static void compile(string|null $path = null)
* @method static void component(string $class, string|null $alias = null, string $prefix = '')
* @method static void components(array $components, string $prefix = '')
- * @method static void anonymousComponentNamespace(string $directory, string $prefix)
+ * @method static void anonymousComponentNamespace(string $directory, string $prefix = null)
* @method static void componentNamespace(string $prefix, string $directory = null)
* @method static void directive(string $name, callable $handler)
* @method static void extend(callable $compiler)
|
Update Blade.php (#<I>)
|
diff --git a/lib/json_schemer/schema/base.rb b/lib/json_schemer/schema/base.rb
index <HASH>..<HASH> 100644
--- a/lib/json_schemer/schema/base.rb
+++ b/lib/json_schemer/schema/base.rb
@@ -93,6 +93,8 @@ module JSONSchemer
validate_custom_format(instance, formats.fetch(format), &block)
end
+ data = instance.data
+
if keywords
keywords.each do |keyword, callable|
if schema.key?(keyword)
@@ -106,8 +108,6 @@ module JSONSchemer
end
end
- data = instance.data
-
yield error(instance, 'enum') if enum && !enum.include?(data)
yield error(instance, 'const') if schema.key?('const') && schema['const'] != data
|
Fix keywords option
`data` was referenced before it was assigned. Need some tests...
|
diff --git a/Kwc/Shop/Products/Detail/AddToCartGenerator.php b/Kwc/Shop/Products/Detail/AddToCartGenerator.php
index <HASH>..<HASH> 100644
--- a/Kwc/Shop/Products/Detail/AddToCartGenerator.php
+++ b/Kwc/Shop/Products/Detail/AddToCartGenerator.php
@@ -6,12 +6,11 @@ class Kwc_Shop_Products_Detail_AddToCartGenerator extends Kwf_Component_Generato
if ($key != $this->getGeneratorKey()) {
throw new Kwf_Exception("invalid key '$key'");
}
- $generators = Kwc_Abstract::getSetting($this->getClass(), 'generators');
- if (count($generators['addToCart']['component']) <= 1) {
- return $generators['addToCart']['component']['product'];
+ if (count($this->_settings['component']) <= 1) {
+ return $this->_settings['component']['product'];
}
if ($parentData) {
- foreach ($generators['addToCart']['component'] as $component => $class) {
+ foreach ($this->_settings['component'] as $component => $class) {
if ($component == $parentData->row->component) {
return $class;
}
|
access own child components, don't get them from class settings with fixed generator key
|
diff --git a/examples/merge_config.py b/examples/merge_config.py
index <HASH>..<HASH> 100644
--- a/examples/merge_config.py
+++ b/examples/merge_config.py
@@ -37,7 +37,7 @@
# # Ops... assigned twice
# # CONFIG_FOO is not set
#
-# Ops... this symbol doesn't exist
+# # Ops... this symbol doesn't exist
# CONFIG_OPS=y
#
# CONFIG_BAZ="baz string"
@@ -85,12 +85,9 @@ kconf.write_config(sys.argv[2])
# Print warnings for symbols whose actual value doesn't match the assigned
# value
-def name_and_loc_str(sym):
- """
- Helper for printing the symbol name along with the location(s) in the
- Kconfig files where the symbol is defined
- """
- # If the symbol has no menu nodes, it is undefined
+def name_and_loc(sym):
+ # Helper for printing symbol names and Kconfig file location(s) in warnings
+
if not sym.nodes:
return sym.name + " (undefined)"
@@ -112,4 +109,4 @@ for sym in kconf.defined_syms:
if user_value != sym.str_value:
print('warning: {} was assigned the value "{}" but got the '
'value "{}" -- check dependencies'
- .format(name_and_loc_str(sym), user_value, sym.str_value))
+ .format(name_and_loc(sym), user_value, sym.str_value))
|
merge_config.py: Clean up name_and_loc_str()
- Rename to name_and_loc(), to be consistent with the kconfiglib.py
version
- Use a comment instead of a docstring. Shorten the description a bit
too.
- Piggyback a missing # in conf3 in the module docstring. Typo.
|
diff --git a/src/org/parosproxy/paros/model/SiteMap.java b/src/org/parosproxy/paros/model/SiteMap.java
index <HASH>..<HASH> 100644
--- a/src/org/parosproxy/paros/model/SiteMap.java
+++ b/src/org/parosproxy/paros/model/SiteMap.java
@@ -33,6 +33,7 @@
// ZAP: 2014/01/06 Issue 965: Support 'single page' apps and 'non standard' parameter separators
// ZAP: 2014/01/16 Issue 979: Sites and Alerts trees can get corrupted
// ZAP: 2014/03/23 Issue 997: Session.open complains about improper use of addPath
+// ZAP: 2014/04/10 Initialise the root SiteNode with a reference to SiteMap
package org.parosproxy.paros.model;
@@ -73,9 +74,11 @@ public class SiteMap extends DefaultTreeModel {
private static Logger log = Logger.getLogger(SiteMap.class);
public static SiteMap createTree(Model model) {
- SiteNode root = new SiteNode(null, -1, Constant.messages.getString("tab.sites"));
+ SiteMap siteMap = new SiteMap(null, model);
+ SiteNode root = new SiteNode(siteMap, -1, Constant.messages.getString("tab.sites"));
+ siteMap.setRoot(root);
hrefMap = new HashMap<>();
- return new SiteMap(root, model);
+ return siteMap;
}
public SiteMap(SiteNode root, Model model) {
|
Changed SiteMap to initialise the root node with a reference to SiteMap itself so the root node can notify SiteMap of changes (through SiteNode#nodeChangedEventHandler()).
|
diff --git a/lib/app.js b/lib/app.js
index <HASH>..<HASH> 100644
--- a/lib/app.js
+++ b/lib/app.js
@@ -45,7 +45,13 @@ function App(config) {
}
});
- // this.meteorApp.stdout.pipe(process.stdout);
+ this.meteorApp.stdout.on('data', function(data) {
+ data = data.toString();
+ if(data.match(/error/i)) {
+ console.log(data);
+ }
+ });
+
this.meteorApp.stderr.on('data', function(data) {
console.log(data.toString());
});
|
print stdout with error information to the console
|
diff --git a/src/python/test/test_dxclient.py b/src/python/test/test_dxclient.py
index <HASH>..<HASH> 100755
--- a/src/python/test/test_dxclient.py
+++ b/src/python/test/test_dxclient.py
@@ -1794,7 +1794,7 @@ dxpy.run()
# download tar.gz file
gen_file_tar("test-file", "test.tar.gz", proj_id)
buf = run("dx cat test.tar.gz | tar zvxf -")
- self.assertEqual(buf.strip(), 'test-file')
+ self.assertTrue(os.path.exists('test-file'))
def test_dx_download_resume_and_checksum(self):
def assert_md5_checksum(filename, hasher):
|
DEVEX-<I> Change assert to fix the OSX test
|
diff --git a/Request/ParamFetcher.php b/Request/ParamFetcher.php
index <HASH>..<HASH> 100644
--- a/Request/ParamFetcher.php
+++ b/Request/ParamFetcher.php
@@ -161,7 +161,7 @@ class ParamFetcher implements ParamFetcherInterface
if ('' !== $config->requirements
&& ($param !== $default || null === $default)
- && !preg_match('#^'.$config->requirements.'$#xs', $param)
+ && !preg_match('#^'.$config->requirements.'$#xsu', $param)
) {
if ($strict) {
$paramType = $config instanceof QueryParam ? 'Query' : 'Request';
|
Update ParamFetcher to handle UTF8 requirements
Added the 'u' modifier to the regex in cleanParamWithRequirements() so that parameters with UTF8 content will work with the regex.
Fixes #<I>
|
diff --git a/src/shared/js/ch.Expandable.js b/src/shared/js/ch.Expandable.js
index <HASH>..<HASH> 100644
--- a/src/shared/js/ch.Expandable.js
+++ b/src/shared/js/ch.Expandable.js
@@ -10,7 +10,7 @@
options = {
'content': options
};
- }2
+ }
return options;
};
|
# <I> Expandable: Delete number '2' from line <I>.
|
diff --git a/gff3/gff3.py b/gff3/gff3.py
index <HASH>..<HASH> 100644
--- a/gff3/gff3.py
+++ b/gff3/gff3.py
@@ -47,7 +47,7 @@ CODON_TABLE = dict(zip(CODONS, AMINO_ACIDS))
def translate(seq):
seq = seq.lower().replace('\n', '').replace(' ', '')
peptide = ''
- for i in xrange(0, len(seq), 3):
+ for i in range(0, len(seq), 3):
codon = seq[i: i+3]
amino_acid = CODON_TABLE.get(codon, '!')
if amino_acid != '!': # end of seq
|
remove xrange to make it compatible to Python 3
|
diff --git a/src/screenfull.js b/src/screenfull.js
index <HASH>..<HASH> 100644
--- a/src/screenfull.js
+++ b/src/screenfull.js
@@ -6,8 +6,7 @@
var fn = (function () {
var val;
- var valLength;
-
+
var fnMap = [
[
'requestFullscreen',
@@ -62,7 +61,7 @@
for (; i < l; i++) {
val = fnMap[i];
if (val && val[1] in document) {
- for (i = 0, valLength = val.length; i < valLength; i++) {
+ for (i = 0; i < val.length; i++) {
ret[fnMap[0][i]] = val[i];
}
return ret;
|
Minor code tweak (#<I>)
|
diff --git a/lib/ruby-lint/definitions/core/kernel.rb b/lib/ruby-lint/definitions/core/kernel.rb
index <HASH>..<HASH> 100644
--- a/lib/ruby-lint/definitions/core/kernel.rb
+++ b/lib/ruby-lint/definitions/core/kernel.rb
@@ -492,4 +492,13 @@ RubyLint.global_scope.define_constant('Kernel') do |klass|
klass.define_instance_method('untrust')
klass.define_instance_method('untrusted?')
-end
\ No newline at end of file
+end
+
+# Methods defined in Kernel (both class and instance methods) are globally
+# available regardless of whether the code is evaluated in a class or instance
+# context.
+RubyLint.global_scope.copy(
+ RubyLint.global_constant('Kernel'),
+ :method,
+ :instance_method
+)
|
Properly include Kernel into the global scope.
This code was removed by accident when the definitions for Kernel were
re-generated.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -73,6 +73,7 @@ setup(
"ukpostcodeparser>=1.1.1",
"mock",
"pytest>=3.8.0,<3.9",
+ "more-itertools<6.0.0",
],
extras_require={
':python_version=="2.7"': [
|
Pin more-itertools to a version compatible with py<I> (#<I>)
|
diff --git a/azurerm/helpers/validate/api_management.go b/azurerm/helpers/validate/api_management.go
index <HASH>..<HASH> 100644
--- a/azurerm/helpers/validate/api_management.go
+++ b/azurerm/helpers/validate/api_management.go
@@ -71,7 +71,7 @@ func ApiManagementApiName(v interface{}, k string) (ws []string, es []error) {
func ApiManagementApiPath(v interface{}, k string) (ws []string, es []error) {
value := v.(string)
- if matched := regexp.MustCompile(`^(?:|[\w][\w-/.]{0,398}[\w-])$`).Match([]byte(value)); !matched {
+ if matched := regexp.MustCompile(`^(?:|[\w.][\w-/.]{0,398}[\w-])$`).Match([]byte(value)); !matched {
es = append(es, fmt.Errorf("%q may only be up to 400 characters in length, not start or end with `/` and only contain valid url characters", k))
}
return ws, es
|
Update path validation for api management api
Adding support for paths that start with the character '.'
This is important for path implementations such as ".well-known" in universal links
|
diff --git a/src/FOM/UserBundle/Form/Type/ACLType.php b/src/FOM/UserBundle/Form/Type/ACLType.php
index <HASH>..<HASH> 100644
--- a/src/FOM/UserBundle/Form/Type/ACLType.php
+++ b/src/FOM/UserBundle/Form/Type/ACLType.php
@@ -133,13 +133,13 @@ class ACLType extends AbstractType
$permissions = is_string($options['permissions']) ? $this->getStandardPermissions($options['permissions']) : $options['permissions'];
$aceOptions = array(
- 'type' => 'FOM\UserBundle\Form\Type\ACEType',
+ 'entry_type' => 'FOM\UserBundle\Form\Type\ACEType',
'label' => 'Permissions',
'allow_add' => true,
'allow_delete' => true,
'auto_initialize' => false,
'prototype' => true,
- 'options' => array(
+ 'entry_options' => array(
'available_permissions' => $permissions,
),
'mapped' => false,
|
Resolve deprecated CollectionType option usage
|
diff --git a/test/integration/rails/dummy/config/application.rb b/test/integration/rails/dummy/config/application.rb
index <HASH>..<HASH> 100644
--- a/test/integration/rails/dummy/config/application.rb
+++ b/test/integration/rails/dummy/config/application.rb
@@ -1,12 +1,12 @@
require File.expand_path('../boot', __FILE__)
-require "active_model/railtie"
-require "active_record/railtie"
-require "action_controller/railtie"
-require "action_view/railtie"
-require "action_mailer/railtie"
+require 'active_model/railtie'
+require 'active_record/railtie'
+require 'action_controller/railtie'
+require 'action_view/railtie'
+require 'action_mailer/railtie'
-require "slim/rails"
+require 'slim'
module Dummy
class Application < Rails::Application
|
use slim instead of slim/rails
|
diff --git a/src/Chrisguitarguy/Annotation/Tokens.php b/src/Chrisguitarguy/Annotation/Tokens.php
index <HASH>..<HASH> 100644
--- a/src/Chrisguitarguy/Annotation/Tokens.php
+++ b/src/Chrisguitarguy/Annotation/Tokens.php
@@ -43,8 +43,10 @@ final class Tokens
const T_WHITESPACE = 'T_WHITESPACE';
const T_EOF = 'T_EOF';
+ // @codeCoverageIgnoreStart
private function __construct()
{
// noop
}
+ // @codeCoverageIgnoreEnd
}
|
ignore Tokens::__construct on code coverage reports
|
diff --git a/packages/veritone-react-common/src/helpers/withMuiThemeProvider.js b/packages/veritone-react-common/src/helpers/withMuiThemeProvider.js
index <HASH>..<HASH> 100644
--- a/packages/veritone-react-common/src/helpers/withMuiThemeProvider.js
+++ b/packages/veritone-react-common/src/helpers/withMuiThemeProvider.js
@@ -1,5 +1,6 @@
import React from 'react';
import { MuiThemeProvider, createMuiTheme } from 'material-ui/styles';
+import blue from 'material-ui/colors/blue';
export default function withMuiThemeProvider(Component) {
return class WrappedComponent extends React.Component {
@@ -7,7 +8,17 @@ export default function withMuiThemeProvider(Component) {
render() {
return (
- <MuiThemeProvider theme={createMuiTheme()}>
+ <MuiThemeProvider theme={createMuiTheme({
+ palette: {
+ primary: blue
+ },
+ typography: {
+ button: {
+ fontWeight: 400
+ }
+ }
+
+ })}>
<Component {...this.props} />
</MuiThemeProvider>
);
|
fix theme colors, bring in button override from vda
|
diff --git a/build/fn.js b/build/fn.js
index <HASH>..<HASH> 100644
--- a/build/fn.js
+++ b/build/fn.js
@@ -60,7 +60,7 @@ fn.concat = function () {
var args = fn.toArray(arguments);
var first = args[ 0 ];
- if (!fn.is(first, 'array') && !fn.is(first, 'string')) {
+ if (!fn.is('array', first) && !fn.is('string', first)) {
first = args.length > 0 ? [ first ] : [ ];
}
return first.concat.apply(first, args.slice(1));
diff --git a/src/index.js b/src/index.js
index <HASH>..<HASH> 100644
--- a/src/index.js
+++ b/src/index.js
@@ -51,7 +51,7 @@ fn.concat = function () {
var args = fn.toArray(arguments);
var first = args[ 0 ];
- if (!fn.is(first, 'array') && !fn.is(first, 'string')) {
+ if (!fn.is('array', first) && !fn.is('string', first)) {
first = args.length > 0 ? [ first ] : [ ];
}
return first.concat.apply(first, args.slice(1));
|
The order of arguments has changed for 'is'
|
diff --git a/tests/CollectionExtendedTest.php b/tests/CollectionExtendedTest.php
index <HASH>..<HASH> 100644
--- a/tests/CollectionExtendedTest.php
+++ b/tests/CollectionExtendedTest.php
@@ -607,8 +607,11 @@ class CollectionExtendedTest extends
$exampleDocument = Document::createFromArray(array('someNewAttribute' => 'someNewValue'));
- $resultingDocument = $collectionHandler->byExample($collection->getId(), $exampleDocument);
-
+ $cursor = $collectionHandler->byExample($collection->getId(), $exampleDocument);
+ $this->assertTrue(
+ $cursor->getCount() == 1,
+ 'should return 1.'
+ );
$exampleDocument = Document::createFromArray(array('someOtherAttribute' => 'someOtherValue'));
$result = $collectionHandler->removeByExample(
@@ -776,6 +779,11 @@ class CollectionExtendedTest extends
}
$this->assertTrue(
+ $cursor->getCount() == 2,
+ 'should return 2.'
+ );
+
+ $this->assertTrue(
($resultingDocument[0]->getKey() == 'test1' && $resultingDocument[0]->firstName == 'Joe'),
'Document returned did not contain expected data.'
);
|
Extended test with getCount() for byExample()
|
diff --git a/config.js b/config.js
index <HASH>..<HASH> 100644
--- a/config.js
+++ b/config.js
@@ -14,7 +14,10 @@ config.items =
, invalidRequestMessage:
{ def: "Invalid request. Make sure you are respecting the sprite maker api (https://github.com/vigour-io/vigour-img/blob/master/README.md#user-content-api) and that the requested data exists." }
, port:
- { def: 8000 }
+ { def: 8000
+ , cli: "-p, --port <nb>"
+ , desc: "Port on which the server should listen"
+ }
, maxWidth:
{ def: 10000 }
, maxHeight:
|
Add command-line option to change port
|
diff --git a/src/bin/nca-release.js b/src/bin/nca-release.js
index <HASH>..<HASH> 100644
--- a/src/bin/nca-release.js
+++ b/src/bin/nca-release.js
@@ -28,7 +28,8 @@ export default function run() {
console.log(chalk.green(`The tag "${version}" was successfully released.`))
}
else {
- console.log(chalk.red(SHOW_HOW_TO_RELEASE_IN_CIRCLE_CI))
+ const { CIRCLE_PROJECT_USERNAME, CIRCLE_PROJECT_REPONAME } = process.env
+ console.log(chalk.red(SHOW_HOW_TO_RELEASE_IN_CIRCLE_CI(CIRCLE_PROJECT_USERNAME, CIRCLE_PROJECT_REPONAME)))
process.exit(0)
}
@@ -38,7 +39,7 @@ export default function run() {
executor.publishNpm(NPM_EMAIL, NPM_AUTH)
}
else {
- const {CIRCLE_PROJECT_USERNAME, CIRCLE_PROJECT_REPONAME } = process.env
+ const { CIRCLE_PROJECT_USERNAME, CIRCLE_PROJECT_REPONAME } = process.env
console.log(SHOW_HOW_TO_NPM_PUBLISH(CIRCLE_PROJECT_USERNAME, CIRCLE_PROJECT_REPONAME))
}
}
|
show how to release in circleci when release fails
|
diff --git a/phpsec/phpsec.crypt.php b/phpsec/phpsec.crypt.php
index <HASH>..<HASH> 100644
--- a/phpsec/phpsec.crypt.php
+++ b/phpsec/phpsec.crypt.php
@@ -140,12 +140,12 @@ class phpsecCrypt {
*/
public static function pbkdf2($p, $s, $c, $dkLen, $a = 'sha256') {
$hLen = strlen(hash($a, null, true)); /* Hash length. */
- $l = ceil($dkLen / $hLen); /* Length in blocks of derived key. */
- $dk = ''; /* Derived key. */
+ $l = ceil($dkLen / $hLen); /* Length in blocks of derived key. */
+ $dk = ''; /* Derived key. */
/* Step 1. Check dkLen. */
- if($dkLen > (2^32-1)*$hLen) {
- phpsec::error('derived key too long');
+ if($dkLen > (2^32-1) * $hLen) {
+ phpsec::error('Derived key too long');
return false;
}
|
Fixed typo in error message in phpsecCrypt::pbkdf2(), and also made
some coding style improvements.
|
diff --git a/simulator/src/main/java/com/hazelcast/simulator/protocol/registry/ComponentRegistry.java b/simulator/src/main/java/com/hazelcast/simulator/protocol/registry/ComponentRegistry.java
index <HASH>..<HASH> 100644
--- a/simulator/src/main/java/com/hazelcast/simulator/protocol/registry/ComponentRegistry.java
+++ b/simulator/src/main/java/com/hazelcast/simulator/protocol/registry/ComponentRegistry.java
@@ -251,6 +251,12 @@ public class ComponentRegistry {
+ " [" + worker.getSettings().getVersionSpec() + "]");
}
}
+
+ List<TestData> tests = new ArrayList<TestData>(this.tests.values());
+ LOGGER.info(format(" Tests %s", tests.size()));
+ for (TestData testData : tests) {
+ LOGGER.info(" " + testData.getAddress() + " " + testData.getTestCase().getId());
+ }
}
public WorkerData getFirstWorker() {
|
Added tests to cluster layout: fix #<I>
|
diff --git a/src/Datachore.php b/src/Datachore.php
index <HASH>..<HASH> 100644
--- a/src/Datachore.php
+++ b/src/Datachore.php
@@ -504,10 +504,10 @@ class Datachore
break;
}
}
+
+ $this->_where($property, $chain, $operator, $value);
+ return $this;
}
-
- $this->_where($property, $chain, $operator, $value);
- return $this;
}
throw new \Exception("No such method: {$func}");
|
FIX: move call to _where in _call to avoid an undefined property variable error.
|
diff --git a/tests/spec/fs.stat.spec.js b/tests/spec/fs.stat.spec.js
index <HASH>..<HASH> 100644
--- a/tests/spec/fs.stat.spec.js
+++ b/tests/spec/fs.stat.spec.js
@@ -91,4 +91,33 @@ describe('fs.stat', function() {
});
});
});
+
+ it('(promise) should be a function', function() {
+ var fs = util.fs();
+ expect(fs.promises.stat).to.be.a('function');
+ });
+
+ it('should return a promise', function() {
+ var fs = util.fs();
+ expect(fs.promises.stat()).to.be.a('Promise');
+ });
+
+ it('(promise) should return a stat object if file exists', function() {
+ var fs = util.fs();
+
+ return fs.promises
+ .stat('/')
+ .then(result => {
+ expect(result).to.exist;
+
+ expect(result.node).to.be.a('string');
+ expect(result.dev).to.equal(fs.name);
+ expect(result.size).to.be.a('number');
+ expect(result.nlinks).to.be.a('number');
+ expect(result.atime).to.be.a('number');
+ expect(result.mtime).to.be.a('number');
+ expect(result.ctime).to.be.a('number');
+ expect(result.type).to.equal('DIRECTORY');
+ });
+ });
});
|
Fix #<I>: added proimse support for fs.stat (#<I>)
* added promise support to fs.stat
* restored package lock
* fixed lint issues
* made tests more promise freindly
* removed .catch statement from promise and fixed style issues
* removed .catch statement from promise and fixed style issues
|
diff --git a/lib/chef_zero/cookbook_data.rb b/lib/chef_zero/cookbook_data.rb
index <HASH>..<HASH> 100644
--- a/lib/chef_zero/cookbook_data.rb
+++ b/lib/chef_zero/cookbook_data.rb
@@ -36,7 +36,7 @@ module ChefZero
file = filename(directory, 'metadata.rb') || "(#{name}/metadata.rb)"
metadata.instance_eval(read_file(directory, 'metadata.rb'), file)
rescue
- ChefZero::Log.error("Error loading cookbook #{name}: #{$!}\n#{$!.backtrace}")
+ ChefZero::Log.error("Error loading cookbook #{name}: #{$!}\n #{$!.backtrace.join("\n ")}")
end
elsif has_child(directory, 'metadata.json')
metadata.from_json(read_file(directory, 'metadata.json'))
@@ -68,8 +68,8 @@ module ChefZero
def initialize(cookbook)
self.name(cookbook.name)
self.recipes(cookbook.fully_qualified_recipe_names)
- %w(dependencies supports recommendations suggestions conflicting providing replacing recipes).each do |cookbook_arg|
- self[cookbook_arg.to_sym] = Hashie::Mash.new
+ %w(attributes grouping dependencies supports recommendations suggestions conflicting providing replacing recipes).each do |hash_arg|
+ self[hash_arg.to_sym] = Hashie::Mash.new
end
end
|
Support attribute() and grouping() in cookbook metadata
|
diff --git a/src/layer/tile/TileLayer.js b/src/layer/tile/TileLayer.js
index <HASH>..<HASH> 100644
--- a/src/layer/tile/TileLayer.js
+++ b/src/layer/tile/TileLayer.js
@@ -12,8 +12,8 @@
Z.TileLayer = Z.Layer.extend(/** @lends maptalks.TileLayer.prototype */{
options: {
- 'errorTileUrl' : 'images/system/transparent.png',
- 'urlTemplate' : 'images/system/transparent.png',
+ 'errorTileUrl' : '#',
+ 'urlTemplate' : '#',
'subdomains' : null,
'gradualLoading' : true,
@@ -22,7 +22,7 @@ Z.TileLayer = Z.Layer.extend(/** @lends maptalks.TileLayer.prototype */{
'renderWhenPanning' : false,
//移图时地图的更新间隔, 默认为0即实时更新, -1表示不更新.如果效率较慢则可改为适当的值
- 'renderSpanWhenPanning' : 0,
+ 'renderSpanWhenPanning' : (function(){return Z.Browser.mobile?-1:0;})(),
'crossOrigin' : null,
|
change TileLayer's renderSpanWhenPanning to -1 on mobile devices.
|
diff --git a/lib/fog/aws/models/storage/file.rb b/lib/fog/aws/models/storage/file.rb
index <HASH>..<HASH> 100644
--- a/lib/fog/aws/models/storage/file.rb
+++ b/lib/fog/aws/models/storage/file.rb
@@ -1,6 +1,5 @@
require 'fog/core/model'
require 'fog/aws/models/storage/versions'
-require 'digest/md5'
module Fog
module Storage
|
Whoops, don't need to require digest/md5
|
diff --git a/spec/httparty/request_spec.rb b/spec/httparty/request_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/httparty/request_spec.rb
+++ b/spec/httparty/request_spec.rb
@@ -86,7 +86,7 @@ describe HTTParty::Request do
end
it "should use digest auth when configured" do
- FakeWeb.register_uri(:head, "http://api.foo.com/v1",
+ FakeWeb.register_uri(:get, "http://api.foo.com/v1",
:www_authenticate => 'Digest realm="Log Viewer", qop="auth", nonce="2CA0EC6B0E126C4800E56BA0C0003D3C", opaque="5ccc069c403ebaf9f0171e9517f40e41", stale=false')
@request.options[:digest_auth] = {:username => 'foobar', :password => 'secret'}
|
Update test to use correct method instead of always using HEAD
|
diff --git a/lib/index.js b/lib/index.js
index <HASH>..<HASH> 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -20,7 +20,7 @@ function Rela(opts){
opts = {};
this.clients = opts.dummies || [];
- this.server = opts.server || new Server(handler.bind(this));
+ this.server = opts.server || new Server(handler);
}
// Add EventEmitter functionality to all Rela instances.
|
Change back to no bind, changed to arrow function.
|
diff --git a/linkcheck/checker/urlbase.py b/linkcheck/checker/urlbase.py
index <HASH>..<HASH> 100644
--- a/linkcheck/checker/urlbase.py
+++ b/linkcheck/checker/urlbase.py
@@ -920,7 +920,7 @@ class UrlBase (object):
try:
app = winutil.get_word_app()
try:
- doc = winutil.open_word(app, filename)
+ doc = winutil.open_wordfile(app, filename)
try:
for link in doc.Hyperlinks:
url_data = get_url_from(link.Address,
diff --git a/linkcheck/winutil.py b/linkcheck/winutil.py
index <HASH>..<HASH> 100644
--- a/linkcheck/winutil.py
+++ b/linkcheck/winutil.py
@@ -65,6 +65,9 @@ def get_word_app ():
"""Return open Word.Application handle, or None on error."""
if not has_word():
return None
+ # Since this function is called from different threads, initialize
+ # the COM layer.
+ pythoncom.CoInitialize()
import win32com.client
app = win32com.client.gencache.EnsureDispatch("Word.Application")
app.Visible = False
|
Fix errors in Word file parsing.
|
diff --git a/mmcv/cnn/builder.py b/mmcv/cnn/builder.py
index <HASH>..<HASH> 100644
--- a/mmcv/cnn/builder.py
+++ b/mmcv/cnn/builder.py
@@ -1,5 +1,4 @@
-import torch.nn as nn
-
+from ..runner import Sequential
from ..utils import Registry, build_from_cfg
@@ -22,7 +21,7 @@ def build_model_from_cfg(cfg, registry, default_args=None):
modules = [
build_from_cfg(cfg_, registry, default_args) for cfg_ in cfg
]
- return nn.Sequential(*modules)
+ return Sequential(*modules)
else:
return build_from_cfg(cfg, registry, default_args)
|
Use Sequential rather than nn.Sequential in build_model_from_cfg. (#<I>)
|
diff --git a/plan/column_pruning.go b/plan/column_pruning.go
index <HASH>..<HASH> 100644
--- a/plan/column_pruning.go
+++ b/plan/column_pruning.go
@@ -165,10 +165,6 @@ func (ds *DataSource) PruneColumns(parentUsedCols []*expression.Column) {
}
// PruneColumns implements LogicalPlan interface.
-func (p *LogicalTableDual) PruneColumns(_ []*expression.Column) {
-}
-
-// PruneColumns implements LogicalPlan interface.
func (p *LogicalExists) PruneColumns(parentUsedCols []*expression.Column) {
p.children[0].PruneColumns(nil)
}
|
plan: remove unneeded lines of code (#<I>)
|
diff --git a/src/Container/AbstractProjectionManagerFactory.php b/src/Container/AbstractProjectionManagerFactory.php
index <HASH>..<HASH> 100644
--- a/src/Container/AbstractProjectionManagerFactory.php
+++ b/src/Container/AbstractProjectionManagerFactory.php
@@ -87,7 +87,7 @@ abstract class AbstractProjectionManagerFactory implements
public function mandatoryOptions(): iterable
{
- return ['event_store', 'connection'];
+ return ['connection'];
}
public function defaultOptions(): iterable
|
event_store is not mandatory (because of defaults)
|
diff --git a/src/effects.js b/src/effects.js
index <HASH>..<HASH> 100644
--- a/src/effects.js
+++ b/src/effects.js
@@ -363,9 +363,17 @@ jQuery.fx.prototype = {
t.elem = this.elem;
if ( t() && jQuery.timers.push(t) && !timerId ) {
- timerId = jQuery.support.requestAnimationFrame ?
- !window[jQuery.support.requestAnimationFrame](fx.tick):
- setInterval(fx.tick, fx.interval);
+ if ( jQuery.support.requestAnimationFrame ) {
+ timerId = true;
+ (function raf() {
+ if (timerId) {
+ window[jQuery.support.requestAnimationFrame](raf);
+ }
+ fx.tick();
+ })();
+ } else {
+ timerId = setInterval(fx.tick, fx.interval);
+ }
}
},
@@ -470,8 +478,6 @@ jQuery.extend( jQuery.fx, {
if ( !timers.length ) {
jQuery.fx.stop();
- } else if ( jQuery.support.requestAnimationFrame && timerId) {
- window[jQuery.support.requestAnimationFrame](jQuery.fx.tick);
}
},
|
reduce impact of requestAnimationFrame on incompatible browsers by minimizing number of lookups
|
diff --git a/src/Resource/Source.php b/src/Resource/Source.php
index <HASH>..<HASH> 100644
--- a/src/Resource/Source.php
+++ b/src/Resource/Source.php
@@ -13,4 +13,94 @@ use Nails\Common\Resource;
class Source extends Resource
{
+ /**
+ * The ID of the source
+ *
+ * @var int
+ */
+ public $id;
+
+ /**
+ * The source's customer ID
+ *
+ * @var int
+ */
+ public $customer_id;
+
+ /**
+ * Which driver is responsible for the source
+ *
+ * @var string
+ */
+ public $driver;
+
+ /**
+ * Any data required by the driver
+ *
+ * @var string
+ */
+ public $data;
+
+ /**
+ * The source's label
+ *
+ * @var string
+ */
+ public $label;
+
+ /**
+ * The source's brand
+ *
+ * @var string
+ */
+ public $brand;
+
+ /**
+ * The source's last four digits
+ *
+ * @var string
+ */
+ public $last_four;
+
+ /**
+ * The source's expiry date
+ *
+ * @var string
+ */
+ public $expiry;
+
+ /**
+ * Whether the source is the default for the customer or not
+ *
+ * @var bool
+ */
+ public $is_default;
+
+ /**
+ * The source's creation date
+ *
+ * @var string
+ */
+ public $created;
+
+ /**
+ * The source's creator's ID
+ *
+ * @var string
+ */
+ public $created_by;
+
+ /**
+ * The source's modification date
+ *
+ * @var string
+ */
+ public $modified;
+
+ /**
+ * The source's modifier's ID
+ *
+ * @var string
+ */
+ public $modified_by;
}
|
Adds field information to the Source Resource
|
diff --git a/src/Category.php b/src/Category.php
index <HASH>..<HASH> 100644
--- a/src/Category.php
+++ b/src/Category.php
@@ -78,7 +78,8 @@ class Category implements SerializableInterface, JsonLdSerializableInterface
}
/**
- * {@inheritdoc}
+ * @param array $data
+ * @return Category
*/
public static function deserialize(array $data)
{
diff --git a/src/Label/Events/Created.php b/src/Label/Events/Created.php
index <HASH>..<HASH> 100644
--- a/src/Label/Events/Created.php
+++ b/src/Label/Events/Created.php
@@ -58,7 +58,8 @@ class Created extends AbstractEvent
}
/**
- * @inheritdoc
+ * @param array $data
+ * @return Created
*/
public static function deserialize(array $data)
{
diff --git a/src/Organizer/Events/AddressTranslated.php b/src/Organizer/Events/AddressTranslated.php
index <HASH>..<HASH> 100644
--- a/src/Organizer/Events/AddressTranslated.php
+++ b/src/Organizer/Events/AddressTranslated.php
@@ -45,8 +45,7 @@ final class AddressTranslated extends AddressUpdated
}
/**
- * @param array $data
- * @return static
+ * @return AddressTranslated
*/
public static function deserialize(array $data): AddressUpdated
{
|
Document return types where it's impossible to set one because of bad inheritance behaviour
|
diff --git a/src/io/bt.js b/src/io/bt.js
index <HASH>..<HASH> 100644
--- a/src/io/bt.js
+++ b/src/io/bt.js
@@ -19,7 +19,7 @@ class BT extends JSONRPCWebSocket {
this._ws = ws;
this._ws.onopen = this.requestPeripheral.bind(this); // only call request peripheral after socket opens
- this._ws.onerror = this._sendDisconnectError.bind(this, 'ws onerror');
+ this._ws.onerror = this._sendRequestError.bind(this, 'ws onerror');
this._ws.onclose = this._sendDisconnectError.bind(this, 'ws onclose');
this._availablePeripherals = {};
|
On websocket error, use sendRequestError instead of disconnect (#<I>)
|
diff --git a/pytodoist/test/api.py b/pytodoist/test/api.py
index <HASH>..<HASH> 100644
--- a/pytodoist/test/api.py
+++ b/pytodoist/test/api.py
@@ -1,6 +1,7 @@
#!/usr/bin/env python
"""This module contains unit tests for the pytodoist.api module."""
+from __future__ import print_function
import sys
import unittest
from pytodoist.api import TodoistAPI
@@ -165,7 +166,7 @@ class TodoistAPITest(unittest.TestCase):
response = self.t.archive_project(self.user.token, project['id'])
self.assertEqual(response.status_code, 200)
archived_ids = response.json()
- print archived_ids
+ print(archived_ids)
self.assertEqual(len(archived_ids), 1)
def test_get_archived_projects(self):
@@ -173,7 +174,7 @@ class TodoistAPITest(unittest.TestCase):
self.t.archive_project(self.user.token, project['id'])
response = self.t.archive_project(self.user.token, project['id'])
archived_projects = response.json()
- print response.json()
+ print(response.json())
self.assertEqual(len(archived_projects), 1)
def test_unarchive_project(self):
|
make api test run under Python 3
|
diff --git a/src/Illuminate/Foundation/Testing/TestResponse.php b/src/Illuminate/Foundation/Testing/TestResponse.php
index <HASH>..<HASH> 100644
--- a/src/Illuminate/Foundation/Testing/TestResponse.php
+++ b/src/Illuminate/Foundation/Testing/TestResponse.php
@@ -73,7 +73,7 @@ class TestResponse
{
PHPUnit::assertTrue(
$this->isOk(),
- 'Response status code [' . $this->getStatusCode() . '] does match expected 200 status code.'
+ 'Response status code ['.$this->getStatusCode().'] does match expected 200 status code.'
);
return $this;
|
Apply fixes from StyleCI (#<I>)
|
diff --git a/src/Tweech/Chat/Chat.php b/src/Tweech/Chat/Chat.php
index <HASH>..<HASH> 100644
--- a/src/Tweech/Chat/Chat.php
+++ b/src/Tweech/Chat/Chat.php
@@ -59,7 +59,7 @@ class Chat
$this->client->listen('tick.second', function(){
$this->secondsElapsed++;
- if ($this->secondsElapsed >= 1) {
+ if ($this->secondsElapsed >= 2) {
$this->messagesPerSecond = $this->messagesReceived / $this->secondsElapsed;
}
});
|
Wait 2 seconds before calculating mps
|
diff --git a/cloudsmith_cli/cli/validators.py b/cloudsmith_cli/cli/validators.py
index <HASH>..<HASH> 100644
--- a/cloudsmith_cli/cli/validators.py
+++ b/cloudsmith_cli/cli/validators.py
@@ -145,7 +145,8 @@ def validate_optional_tokens(ctx, param, value):
for token in value.split(","):
if not token.isalnum() or len(token) != 12:
raise click.BadParameter(
- "Tokens must contain one or more valid entitlement token identifiers as a comma seperated string.",
+ "Tokens must contain one or more valid entitlement token "
+ "identifiers as a comma seperated string.",
param=param,
)
@@ -162,7 +163,8 @@ def validate_optional_timestamp(ctx, param, value):
)
except ValueError:
raise click.BadParameter(
- f"{param.name} must be a valid utc timestamp formatted as `%Y-%m-%dT%H:%M:%SZ` e.g. `2020-12-31T00:00:00Z`",
+ "{} must be a valid utc timestamp formatted as `%Y-%m-%dT%H:%M:%SZ` "
+ "e.g. `2020-12-31T00:00:00Z`".format(param.name),
param=param,
)
|
Removed Python3-only f-strings
|
diff --git a/cmd/util/deps/deps.go b/cmd/util/deps/deps.go
index <HASH>..<HASH> 100644
--- a/cmd/util/deps/deps.go
+++ b/cmd/util/deps/deps.go
@@ -66,7 +66,7 @@ func LoadDeps(pkgs ...Pkg) (*Deps, error) {
}
// get all dependencies for applications defined above
- dependencies := set.New()
+ dependencies := set.New(set.ThreadSafe)
for _, pkg := range packages {
for _, imp := range pkg.Deps {
dependencies.Add(imp)
|
fix set usage in deps.go
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -78,10 +78,10 @@ setup(
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
- "Programming Language :: Python :: 3.3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
+ "Programming Language :: Python :: 3.7",
"License :: OSI Approved :: Apache Software License",
"Topic :: Software Development :: Testing",
],
|
Add Python <I> support, remove Python <I> support
As of #<I>, Python <I> is supported, so reflect that in the Trove
classifiers.
As of <I>-<I>-<I>, Python <I> is end-of-life and no longer receives
updates of any kind (including security fixes), so remove it from the
list of supported versions.
|
diff --git a/test/environments.js b/test/environments.js
index <HASH>..<HASH> 100644
--- a/test/environments.js
+++ b/test/environments.js
@@ -63,10 +63,6 @@ class ReplicaSetEnvironment extends EnvironmentBase {
genReplsetConfig(31004, { arbiter: true })
];
- this.manager = new ReplSetManager('mongod', this.nodes, {
- replSet: 'rs'
- });
-
// Do we have 3.2+
const version = discoverResult.version.join('.');
if (semver.satisfies(version, '>=3.2.0')) {
@@ -75,6 +71,10 @@ class ReplicaSetEnvironment extends EnvironmentBase {
return x;
});
}
+
+ this.manager = new ReplSetManager('mongod', this.nodes, {
+ replSet: 'rs'
+ });
}
}
|
test: add `enableMajorityReadConcern` before starting nodes
|
diff --git a/src/Application.php b/src/Application.php
index <HASH>..<HASH> 100644
--- a/src/Application.php
+++ b/src/Application.php
@@ -9,7 +9,6 @@ use Limber\Exceptions\NotFoundHttpException;
use Limber\Middleware\CallableMiddleware;
use Limber\Middleware\PrepareHttpResponse;
use Limber\Middleware\RequestHandler;
-use Limber\Router\Route;
use Limber\Router\Router;
use Psr\Container\ContainerInterface;
use Psr\Http\Message\ResponseInterface;
@@ -18,7 +17,6 @@ use Psr\Http\Server\MiddlewareInterface;
use Psr\Http\Server\RequestHandlerInterface;
use ReflectionClass;
use ReflectionFunction;
-use ReflectionMethod;
use ReflectionObject;
use ReflectionParameter;
use Throwable;
|
Removing unused import statements.
|
diff --git a/core/src/main/java/com/google/bitcoin/crypto/MnemonicCode.java b/core/src/main/java/com/google/bitcoin/crypto/MnemonicCode.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/com/google/bitcoin/crypto/MnemonicCode.java
+++ b/core/src/main/java/com/google/bitcoin/crypto/MnemonicCode.java
@@ -67,7 +67,14 @@ public class MnemonicCode {
/** Initialise from the included word list. Won't work on Android. */
public MnemonicCode() throws IOException {
- this(MnemonicCode.class.getResourceAsStream("mnemonic/wordlist/english.txt"), BIP39_ENGLISH_SHA256);
+ this(openDefaultWords(), BIP39_ENGLISH_SHA256);
+ }
+
+ private static InputStream openDefaultWords() throws IOException {
+ InputStream stream = MnemonicCode.class.getResourceAsStream("mnemonic/wordlist/english.txt");
+ if (stream == null)
+ throw new IOException(); // Handle Dalvik vs ART divergence.
+ return stream;
}
/**
|
Fix for Android ART vs Dalvik difference.
|
diff --git a/grimoire_elk/elastic_items.py b/grimoire_elk/elastic_items.py
index <HASH>..<HASH> 100644
--- a/grimoire_elk/elastic_items.py
+++ b/grimoire_elk/elastic_items.py
@@ -81,6 +81,11 @@ class ElasticItems():
from .utils import get_connector_name
return get_connector_name(type(self))
+ def get_connector_backend_name(self):
+ """ Find the name for the current connector """
+ from .utils import get_connector_backend_name
+ return get_connector_backend_name(type(self))
+
# Items generator
def fetch(self, _filter=None):
""" Fetch the items from raw or enriched index. An optional _filter
@@ -137,6 +142,14 @@ class ElasticItems():
filters = self.get_repository_filter_raw(term=True)
filters = json.dumps(filters)
+ # Filter also using the backend_name to let a raw index with items
+ # from different backends (arthur common raw index)
+ filters += '''
+ , {"term":
+ { "backend_name":"%s" }
+ }
+ ''' % (self.get_connector_backend_name())
+
if self.filter_raw:
filters += '''
, {"term":
|
[ocean] Filter always the raw items using the backend_name field to support
that in a raw index there are items from different data sources (arthur).
|
diff --git a/cluster_analyticsquery.go b/cluster_analyticsquery.go
index <HASH>..<HASH> 100644
--- a/cluster_analyticsquery.go
+++ b/cluster_analyticsquery.go
@@ -425,7 +425,7 @@ func (c *Cluster) doAnalyticsQuery(tracectx opentracing.SpanContext, b *Bucket,
return nil, err
}
- if !retryBehavior.CanRetry(retries) {
+ if retryBehavior == nil || !retryBehavior.CanRetry(retries) {
break
}
diff --git a/cluster_searchquery.go b/cluster_searchquery.go
index <HASH>..<HASH> 100644
--- a/cluster_searchquery.go
+++ b/cluster_searchquery.go
@@ -260,7 +260,7 @@ func (c *Cluster) doSearchQuery(tracectx opentracing.SpanContext, b *Bucket, q *
return nil, err
}
- if !retryBehavior.CanRetry(retries) {
+ if retryBehavior == nil || !retryBehavior.CanRetry(retries) {
break
}
|
Check that retrybehavior is not nil before using.
Motivation
----------
It's possible for a user to provide a retrybehavior for search or
analytics so we should check that they aren't nil before use.
Changes
-------
Added nil checks before use in search and analytics query execution.
Change-Id: I8c<I>b9bf<I>fded<I>b<I>d<I>b8f
Reviewed-on: <URL>
|
diff --git a/src-gwt/org/opencms/gwt/client/ui/CmsListItemWidget.java b/src-gwt/org/opencms/gwt/client/ui/CmsListItemWidget.java
index <HASH>..<HASH> 100644
--- a/src-gwt/org/opencms/gwt/client/ui/CmsListItemWidget.java
+++ b/src-gwt/org/opencms/gwt/client/ui/CmsListItemWidget.java
@@ -139,7 +139,7 @@ HasClickHandlers, HasDoubleClickHandlers, HasMouseOverHandlers, I_CmsTruncable {
if (CmsStringUtil.isEmptyOrWhitespaceOnly(value)) {
m_valueLabel.setHTML(CmsDomUtil.Entity.nbsp.html());
} else {
- m_valueLabel.setHTML(value);
+ m_valueLabel.setText(value);
}
m_valueLabel.addStyleName(style.itemAdditionalValue());
if (additionalStyle != null) {
|
Changed additional info lines in resource info boxes to escape HTML.
|
diff --git a/twitter_bot/since_id/redis_provider.py b/twitter_bot/since_id/redis_provider.py
index <HASH>..<HASH> 100644
--- a/twitter_bot/since_id/redis_provider.py
+++ b/twitter_bot/since_id/redis_provider.py
@@ -6,11 +6,11 @@ from twitter_bot.since_id.base_provider import BaseSinceIdProvider
class RedisSinceIdProvider(BaseSinceIdProvider):
- def __init__(self, redis_url=None):
+ def __init__(self, redis_url=''):
super(RedisSinceIdProvider, self).__init__()
if not redis_url:
- redis_url = os.environ.get('REDIS_URL')
+ redis_url = os.environ.get('REDIS_URL', '')
self.redis = Redis.from_url(redis_url)
def get(self):
|
Default redis_url to empty string, not None
|
diff --git a/uproot/_connect/to_pandas.py b/uproot/_connect/to_pandas.py
index <HASH>..<HASH> 100644
--- a/uproot/_connect/to_pandas.py
+++ b/uproot/_connect/to_pandas.py
@@ -137,7 +137,7 @@ def futures2df(futures, outputtype, entrystart, entrystop, flatten, flatname, aw
index = array.index
else:
if starts is not array.starts and not awkward.numpy.array_equal(starts, array.starts):
- raise ValueError("cannot use flatten=True on branches with different jagged structure; explicitly select compatible branches (and pandas.merge if you want to combine different jagged structure)")
+ raise ValueError("cannot use flatten=True on branches with different jagged structure, such as electrons and muons (different, variable number of each per event); either explicitly select compatible branches, such as [\"MET_*\", \"Muon_*\"] (scalar and variable per event is okay), or set flatten=False")
array = array.content
needbroadcasts.append(False)
|
try to improve error message for common TTree.pandas.df() failure
|
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,9 +1,14 @@
-require "coveralls"
-Coveralls.wear!
-
require "bundler"
Bundler.setup(:default, :development)
+require "simplecov"
+require "coveralls"
+
+SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+SimpleCov.start do
+ add_filter "spec"
+end
+
require "savon"
require "rspec"
|
tell coverall to ignore spec support files
|
diff --git a/src/Services/Database.php b/src/Services/Database.php
index <HASH>..<HASH> 100644
--- a/src/Services/Database.php
+++ b/src/Services/Database.php
@@ -19,7 +19,7 @@ class Database extends BaseService {
/**
* @var array
*/
- protected $configurations;
+ protected $configurations = [];
/**
* @var \Doctrine\DBAL\Connection[]
@@ -48,7 +48,10 @@ class Database extends BaseService {
* @return self
*/
public function readConfigurations() {
- $this->setConfigurations(require(service('path')->getConfigurationsPath() . '/database.php'));
+ $configurationFile = service('path')->getConfigurationsPath() . '/database.php';
+ if (file_exists($configurationFile)) {
+ $this->setConfigurations(require($configurationFile));
+ }
return $this;
}
|
Fix database service for reading configuration file when it is not exist
|
diff --git a/source/Parser.php b/source/Parser.php
index <HASH>..<HASH> 100755
--- a/source/Parser.php
+++ b/source/Parser.php
@@ -15,7 +15,7 @@ define(
class Parser
{
- private $macro = [];
+ private $macros = [];
private $compilers = [];
public function addMacro($macro)
|
Fix typeo in Parser
discovered by @phpstan
Fixes #<I>
|
diff --git a/flask_oidc/__init__.py b/flask_oidc/__init__.py
index <HASH>..<HASH> 100644
--- a/flask_oidc/__init__.py
+++ b/flask_oidc/__init__.py
@@ -254,11 +254,15 @@ class OpenIDConnect(object):
def _get_cookie_id_token(self):
try:
- id_token_cookie = request.cookies[current_app.config[
- 'OIDC_ID_TOKEN_COOKIE_NAME']]
+ id_token_cookie = request.cookies.get(current_app.config[
+ 'OIDC_ID_TOKEN_COOKIE_NAME'])
+ if not id_token_cookie:
+ # Do not error if we were unable to get the cookie.
+ # The user can debug this themselves.
+ return None
return self.cookie_serializer.loads(id_token_cookie)
- except (KeyError, SignatureExpired):
- logger.debug("Missing or invalid ID token cookie", exc_info=True)
+ except SignatureExpired:
+ logger.debug("Invalid ID token cookie", exc_info=True)
return None
def set_cookie_id_token(self, id_token):
|
Do not complain if the user has no cookie
|
diff --git a/lib/audited/auditor.rb b/lib/audited/auditor.rb
index <HASH>..<HASH> 100644
--- a/lib/audited/auditor.rb
+++ b/lib/audited/auditor.rb
@@ -175,12 +175,13 @@ module Audited
private
def audited_changes
+ all_changes = respond_to?(:attributes_in_database) ? attributes_in_database : changed_attributes
collection =
if audited_options[:only]
audited_columns = self.class.audited_columns.map(&:name)
- changed_attributes.slice(*audited_columns)
+ all_changes.slice(*audited_columns)
else
- changed_attributes.except(*non_audited_columns)
+ all_changes.except(*non_audited_columns)
end
collection.inject({}) do |changes, (attr, old_value)|
|
Use updated AR::Dirty API to find changed attributes
|
diff --git a/packages/teraslice/lib/storage/assets.js b/packages/teraslice/lib/storage/assets.js
index <HASH>..<HASH> 100644
--- a/packages/teraslice/lib/storage/assets.js
+++ b/packages/teraslice/lib/storage/assets.js
@@ -234,7 +234,7 @@ module.exports = async function assetsStore(context) {
logger.info(`autoloading asset ${asset}...`);
const assetPath = path.join(autoloadDir, asset);
try {
- const result = await save(await fse.readFile(assetPath), true);
+ const result = await save(await fse.readFile(assetPath), false);
if (result.created) {
logger.debug(`autoloaded asset ${asset}`);
} else {
|
Don't block in the asset save now
|
diff --git a/lib/engine.go b/lib/engine.go
index <HASH>..<HASH> 100644
--- a/lib/engine.go
+++ b/lib/engine.go
@@ -72,6 +72,7 @@ loop:
e.Status.Running = false
e.Status.VUs = 0
e.Status.Pooled = 0
+ e.reportInternalStats()
return nil
}
|
[fix] Stopped tests should report 0/0 VUs
|
diff --git a/tests/integration/modules/config.py b/tests/integration/modules/config.py
index <HASH>..<HASH> 100644
--- a/tests/integration/modules/config.py
+++ b/tests/integration/modules/config.py
@@ -32,7 +32,7 @@ class ConfigTest(integration.ModuleCase):
# interpereter is breaking it for remote calls
self.assertEqual(self.run_function('config.manage_mode', ['775']), '775')
self.assertEqual(self.run_function('config.manage_mode', ['1775']), '1775')
- self.assertEqual(self.run_function('config.manage_mode', ['0775']), '775')
+ #self.assertEqual(self.run_function('config.manage_mode', ['0775']), '775')
def test_option(self):
'''
|
Disable failing config.manage_mode test, we will need to clean this
|
diff --git a/ezp/Persistence/Content/Type/Interfaces/Handler.php b/ezp/Persistence/Content/Type/Interfaces/Handler.php
index <HASH>..<HASH> 100644
--- a/ezp/Persistence/Content/Type/Interfaces/Handler.php
+++ b/ezp/Persistence/Content/Type/Interfaces/Handler.php
@@ -84,12 +84,22 @@ interface Handler
public function copy( $userId, $contentTypeId );
/**
- * @param int $groupId
- * @param int $contentTypeId
+ * Unlink a content type group from a content type
+ *
+ * @param mixed $groupId
+ * @param mixed $contentTypeId
*/
public function unlink( $groupId, $contentTypeId );
/**
+ * Link a content type group with a content type
+ *
+ * @param mixed $groupId
+ * @param mixed $contentTypeId
+ */
+ public function link( $groupId, $contentTypeId );
+
+ /**
* @param int $contentTypeId
* @param int $groupId
*/
|
Added link method
Added a link method to make it possible to associate groups with content
types.
|
diff --git a/lib/combine_pdf/renderer.rb b/lib/combine_pdf/renderer.rb
index <HASH>..<HASH> 100644
--- a/lib/combine_pdf/renderer.rb
+++ b/lib/combine_pdf/renderer.rb
@@ -107,7 +107,7 @@ module CombinePDF
end
end
# remove extra page references.
- object[:Contents].delete(is_reference_only: true, referenced_object: { indirect_reference_id: 0, raw_stream_content: '' }) if object[:Type] == :Page && object[:Contents]
+ object[:Contents].delete(is_reference_only: true, referenced_object: { indirect_reference_id: 0, raw_stream_content: '' }) if object[:Type] == :Page && object[:Contents].is_a?(Array)
# correct stream length, if the object is a stream.
object[:Length] = object[:raw_stream_content].bytesize if object[:raw_stream_content]
|
object[:Contents] needs to be an Array
This line is used to remove "empty" edits to PDF pages. This means that pages were expected to have data added to them but where eventually left alone (or the data added was another PDF page instead of a text object).
|
diff --git a/src/PhpPact/Standalone/Runner/ProcessRunner.php b/src/PhpPact/Standalone/Runner/ProcessRunner.php
index <HASH>..<HASH> 100644
--- a/src/PhpPact/Standalone/Runner/ProcessRunner.php
+++ b/src/PhpPact/Standalone/Runner/ProcessRunner.php
@@ -193,27 +193,17 @@ class ProcessRunner
*/
public function stop(): bool
{
- if (!$this->process->isRunning()) {
- return true;
- }
$pid = $this->process->getPid();
print "\nStopping Process Id: {$pid}\n";
if ('\\' === \DIRECTORY_SEPARATOR) {
- \exec(\sprintf('taskkill /F /T /PID %d /fi "STATUS eq RUNNING" 2>&1', $pid), $output, $exitCode);
- if ($exitCode) {
- throw new ProcessException(\sprintf('Unable to kill the process (%s).', \implode(' ', $output)));
- }
+ \exec(\sprintf('taskkill /F /T /PID %d 2>&1', $pid), $output, $exitCode);
}
$this->process->kill();
- if ($this->process->isRunning()) {
- throw new ProcessException(\sprintf('Error while killing process "%s".', $pid));
- }
-
return true;
}
|
fix: simplify ProcessRunner::stop() to work on windows systems
|
diff --git a/filterpy/__init__.py b/filterpy/__init__.py
index <HASH>..<HASH> 100644
--- a/filterpy/__init__.py
+++ b/filterpy/__init__.py
@@ -14,4 +14,4 @@ This is licensed under an MIT license. See the readme.MD file
for more information.
"""
-__version__ = "1.2.0"
+__version__ = "1.2.1"
diff --git a/filterpy/common/kinematic.py b/filterpy/common/kinematic.py
index <HASH>..<HASH> 100644
--- a/filterpy/common/kinematic.py
+++ b/filterpy/common/kinematic.py
@@ -18,7 +18,7 @@ for more information.
import math
import numpy as np
import scipy as sp
-from kalman import KalmanFilter
+from filterpy.kalman import KalmanFilter
def kinematic_state_transition(order, dt):
|
Fixed import error
For some reason I was trying to do an absolute import
for kalman.
|
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
@@ -15,6 +15,10 @@ class User
def send_create_notification; end
end
+class ActionView::TestCase::TestController
+ include Rails.application.routes.url_helpers
+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}
|
Allow stand-alone running of view specs
|
diff --git a/bokeh/core/compat/bokeh_renderer.py b/bokeh/core/compat/bokeh_renderer.py
index <HASH>..<HASH> 100644
--- a/bokeh/core/compat/bokeh_renderer.py
+++ b/bokeh/core/compat/bokeh_renderer.py
@@ -402,7 +402,8 @@ class BokehRenderer(Renderer):
widths = get_props_cycled(col, col.get_linewidth())
multiline.line_color = source.add(colors)
multiline.line_width = source.add(widths)
- multiline.line_alpha = col.get_alpha()
+ if col.get_alpha() is not None:
+ multiline.line_alpha = col.get_alpha()
offset = col.get_linestyle()[0][0]
if not col.get_linestyle()[0][1]:
on_off = []
@@ -421,8 +422,9 @@ class BokehRenderer(Renderer):
patches.line_color = source.add(edge_colors)
widths = get_props_cycled(col, col.get_linewidth())
patches.line_width = source.add(widths)
- patches.line_alpha = col.get_alpha()
- patches.fill_alpha = col.get_alpha()
+ if col.get_alpha() is not None:
+ patches.line_alpha = col.get_alpha()
+ patches.fill_alpha = col.get_alpha()
offset = col.get_linestyle()[0][0]
if not col.get_linestyle()[0][1]:
on_off = []
|
don't set colors and alphas to None explicity! (use default instead)
|
diff --git a/falafel/mappers/multinode.py b/falafel/mappers/multinode.py
index <HASH>..<HASH> 100644
--- a/falafel/mappers/multinode.py
+++ b/falafel/mappers/multinode.py
@@ -8,7 +8,12 @@ def _metadata(context, product_filter=None):
md = marshalling.unmarshal("\n".join(context.content))
product = md["product"]
if "links" in md:
+ # Parent metadata.json won't have "links" as a top level key
product += "Child"
+ elif "systems" not in md:
+ # This case is for single-node systems that have a
+ # metadata.json
+ return
return globals()[product](md)
except:
pass
|
Ensure multinode mappers don't fire on single-node metadata.json
|
diff --git a/lib/ticket_evolution/version.rb b/lib/ticket_evolution/version.rb
index <HASH>..<HASH> 100644
--- a/lib/ticket_evolution/version.rb
+++ b/lib/ticket_evolution/version.rb
@@ -1,3 +1,3 @@
module TicketEvolution
- VERSION = '0.7.12'
+ VERSION = '0.7.13'
end
|
Bump minor version for ShippingSettings endpoint addition
|
diff --git a/test/test_platform.rb b/test/test_platform.rb
index <HASH>..<HASH> 100644
--- a/test/test_platform.rb
+++ b/test/test_platform.rb
@@ -43,14 +43,14 @@ class TestPlatform < Test::Unit::TestCase
end
def test_copy_command_windows
- Boom::Platform.stubs(:windows?).returns(true)
- Boom::Platform.stubs(:darwin?).returns(false)
+ Boom::Platform.stubs(:darwin?).returns(true)
+ Boom::Platform.stubs(:windows?).returns(false)
assert_equal Boom::Platform.copy_command, 'clip'
end
- def test_copy_command_darwin
- Boom::Platform.stubs(:darwin?).returns(false)
+ def test_copy_command_linux
Boom::Platform.stubs(:darwin?).returns(false)
+ Boom::Platform.stubs(:windows?).returns(false)
assert_equal Boom::Platform.copy_command, 'xclip -selection clipboard'
end
|
fixed error in test_platform.rb
|
diff --git a/src/Pagination/Paginator.php b/src/Pagination/Paginator.php
index <HASH>..<HASH> 100644
--- a/src/Pagination/Paginator.php
+++ b/src/Pagination/Paginator.php
@@ -128,6 +128,7 @@ class Paginator extends AbstractSettablePaginator
protected function getPagesCount()
{
$query = $this->getQueryBuilder()->getQuery();
+ $query->useResultCache($this->useCache, $this->cacheLifetime);
$hasGroupBy = 0 < count($this->getQueryBuilder()->getDQLPart('groupBy'));
|
Use ResultCache for count too
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.