diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/tests/try_with.js b/tests/try_with.js
index <HASH>..<HASH> 100644
--- a/tests/try_with.js
+++ b/tests/try_with.js
@@ -45,4 +45,23 @@ describe('tryWith', function(){
},
function(reason){test_finished(reason ? reason : new Error('tryWith callback rejected!'));});
});
+
+ it('should immediately fail despite a retry strategy deciding to retry', function(testFinished) {
+ var testError = new Error('Test critical error');
+ testError.name = 'TestError';
+ testError.labels = {
+ critical: true
+ };
+
+ var errorLoader = function errorLoader(aggregateConstructor, aggregateID) {
+ return when.reject(testError);
+ };
+
+ tryWith(errorLoader, DummyAggregate, 'dummy-3', function(){}).done(function() {
+ testFinished(new Error('Unexpected success - tryWith() was supposed to reject'));
+ }, function(tryWithError) {
+ assert(tryWithError.name, 'TestError');
+ testFinished();
+ });
+ });
});
\ No newline at end of file
|
Added a test case which checks whether the newly-added critical error checking in tryWith works as expected (i.e. rejects despite the strategy's decision).
|
diff --git a/src/main/java/com/codeborne/selenide/impl/AbstractSelenideElement.java b/src/main/java/com/codeborne/selenide/impl/AbstractSelenideElement.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/codeborne/selenide/impl/AbstractSelenideElement.java
+++ b/src/main/java/com/codeborne/selenide/impl/AbstractSelenideElement.java
@@ -224,7 +224,7 @@ abstract class AbstractSelenideElement implements InvocationHandler {
return shouldNot(proxy, prefix, (Condition[]) args[0]);
}
- protected boolean isImage() {
+ protected Boolean isImage() {
WebElement img = getActualDelegate();
if (!"img".equalsIgnoreCase(img.getTagName())) {
throw new IllegalArgumentException("Method isImage() is only applicable for img elements");
|
make it compilable with Java 6
|
diff --git a/test/helper.rb b/test/helper.rb
index <HASH>..<HASH> 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -13,7 +13,7 @@ class TestSlim < MiniTest::Unit::TestCase
end
def teardown
- String.send(:remove_method, :html_safe?) if String.method_defined?(:html_safe?)
+ String.send(:undef_method, :html_safe?) if String.method_defined?(:html_safe?)
Slim::Filter::DEFAULT_OPTIONS.delete(:use_html_safe)
end
|
Undefine the method more cleanly.
|
diff --git a/src/consumer/runner.js b/src/consumer/runner.js
index <HASH>..<HASH> 100644
--- a/src/consumer/runner.js
+++ b/src/consumer/runner.js
@@ -113,6 +113,18 @@ module.exports = class Runner extends EventEmitter {
continue
}
+ if (e.type === 'UNKNOWN_MEMBER_ID') {
+ this.logger.error('The coordinator is not aware of this member, re-joining the group', {
+ groupId: this.consumerGroup.groupId,
+ memberId: this.consumerGroup.memberId,
+ error: e.message,
+ })
+
+ this.consumerGroup.memberId = null
+ await this.consumerGroup.joinAndSync()
+ continue
+ }
+
this.onCrash(e)
break
}
@@ -401,7 +413,11 @@ module.exports = class Runner extends EventEmitter {
return
}
- if (isRebalancing(e) || e.name === 'KafkaJSNotImplemented') {
+ if (
+ isRebalancing(e) ||
+ e.type === 'UNKNOWN_MEMBER_ID' ||
+ e.name === 'KafkaJSNotImplemented'
+ ) {
return bail(e)
}
|
fix: handle unknown_member_id from offsetCommit
|
diff --git a/tests/test_cli.py b/tests/test_cli.py
index <HASH>..<HASH> 100755
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -68,4 +68,11 @@ def test_convert_command(from_path, to_path, from_format, to_format):
mwtabfiles_study_ids_set = set(mwf.study_id for mwf in mwtabfiles_list)
mwtabfiles_analysis_ids_set = set(mwf.analysis_id for mwf in mwtabfiles_list)
assert mwtabfiles_study_ids_set.issubset({"ST000001", "ST000002"})
- assert mwtabfiles_analysis_ids_set.issubset({"AN000001", "AN000002"})
\ No newline at end of file
+ assert mwtabfiles_analysis_ids_set.issubset({"AN000001", "AN000002"})
+
+@pytest.mark.parametrize("input_value, args", [
+ ("AN000001", "tests/example_data/tmp")
+])
+def test_download_command(input_value, args):
+ command = "python-m mwtab download {} {}"
+ assert os.system(command) == 0
|
Begins adding unit test for download commandline method.
|
diff --git a/internal/client/client.go b/internal/client/client.go
index <HASH>..<HASH> 100644
--- a/internal/client/client.go
+++ b/internal/client/client.go
@@ -2,7 +2,6 @@
package client
import (
- "fmt"
"os"
"github.com/goreleaser/goreleaser/pkg/config"
@@ -31,5 +30,5 @@ func New(ctx *context.Context) (Client, error) {
if ctx.TokenType == context.TokenTypeGitLab {
return NewGitLab(ctx)
}
- return nil, fmt.Errorf("client is not yet implemented: %s", ctx.TokenType)
+ return nil, nil
}
|
Fixed token required if release is disabled #<I> (#<I>)
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python
+import os
import pypandoc
try:
@@ -9,14 +10,17 @@ except ImportError:
use_setuptools()
from setuptools import setup
-readme = pypandoc.convert_file('README.md', 'rst')
-changelog = pypandoc.convert_file('CHANGELOG.md', 'rst')
+long_description = 'This library provides the python client for the Packet API.'
+if os.path.isfile('README.md') and os.path.isfile('CHANGELOG.md'):
+ readme = pypandoc.convert_file('README.md', 'rst')
+ changelog = pypandoc.convert_file('CHANGELOG.md', 'rst')
+ long_description = readme + '\n' + changelog
setup(
name='packet-python',
version='1.36.0',
description='Packet API client',
- long_description=readme + '\n' + changelog,
+ long_description=long_description,
url='https://github.com/packethost/packet-python',
author='Packet Developers',
license='LGPL v3',
|
setup.py: handle missing readme/changelog files
This is the case when running tests under tox.
|
diff --git a/wurlitzer.py b/wurlitzer.py
index <HASH>..<HASH> 100644
--- a/wurlitzer.py
+++ b/wurlitzer.py
@@ -210,9 +210,9 @@ class Wurlitzer(object):
data = os.read(fd, 1024)
if not data:
# pipe closed, stop polling it
- os.close(fd)
pipes.remove(fd)
poller.unregister(fd)
+ os.close(fd)
else:
handler = getattr(self, '_handle_%s' % name)
handler(data)
|
closing socket descriptor after removing from array and unregistering from poller
|
diff --git a/app/controllers/securities_controller.py b/app/controllers/securities_controller.py
index <HASH>..<HASH> 100644
--- a/app/controllers/securities_controller.py
+++ b/app/controllers/securities_controller.py
@@ -115,10 +115,9 @@ def __get_model_for_details(
# Profit/loss
model.profit_loss = model.value - model.total_paid
- if abs(model.value) > abs(model.total_paid):
- model.profit_loss_perc = model.profit_loss * 100 / model.value
- else:
- model.profit_loss_perc = model.value * 100 / model.profit_loss
+ model.profit_loss_perc = abs(model.profit_loss) * 100 / model.total_paid
+ if abs(model.value) < abs(model.total_paid):
+ model.profit_loss_perc *= -1
# Income
model.income = sec_agg.get_income_total()
model.income_perc = model.income * 100 / model.total_paid
|
correcting the unrealized gains/loss % calc
|
diff --git a/pifpaf/drivers/gnocchi.py b/pifpaf/drivers/gnocchi.py
index <HASH>..<HASH> 100644
--- a/pifpaf/drivers/gnocchi.py
+++ b/pifpaf/drivers/gnocchi.py
@@ -87,7 +87,7 @@ url = %s""" % (self.tempdir, self.port, pg.url))
self.putenv("GNOCCHI_PORT", str(self.port))
self.putenv("URL", "gnocchi://localhost:%d" % self.port)
self.putenv("GNOCCHI_HTTP_URL", self.http_url)
- self.putenv("GNOCCHI_ENDPOINT", self.http_url)
- self.putenv("OS_AUTH_TYPE", "gnocchi-noauth")
- self.putenv("GNOCCHI_USER_ID", "admin")
- self.putenv("GNOCCHI_PROJECT_ID", "admin")
+ self.putenv("GNOCCHI_ENDPOINT", self.http_url, True)
+ self.putenv("OS_AUTH_TYPE", "gnocchi-noauth", True)
+ self.putenv("GNOCCHI_USER_ID", "admin", True)
+ self.putenv("GNOCCHI_PROJECT_ID", "admin", True)
|
gnocchi: fix a regression on variable names
These ones should not be prefixed.
|
diff --git a/core-bundle/src/Resources/contao/drivers/DC_Table.php b/core-bundle/src/Resources/contao/drivers/DC_Table.php
index <HASH>..<HASH> 100644
--- a/core-bundle/src/Resources/contao/drivers/DC_Table.php
+++ b/core-bundle/src/Resources/contao/drivers/DC_Table.php
@@ -4302,7 +4302,7 @@ Backend.makeParentViewSortable("ul_' . CURRENT_ID . '");
// call the panelLayout_callbacck
default:
- $arrCallback = $GLOBALS['TL_DCA'][$this->strTable]['list']['sorting']['panelLayout_callback'][$strSubPanelKey];
+ $arrCallback = $GLOBALS['TL_DCA'][$this->strTable]['list']['sorting']['panel_callback'][$strSubPanelKey];
if (is_array($arrCallback))
{
$this->import($arrCallback[0]);
|
[Core] the callback is now named "panel_callback"
|
diff --git a/marabunta/parser.py b/marabunta/parser.py
index <HASH>..<HASH> 100644
--- a/marabunta/parser.py
+++ b/marabunta/parser.py
@@ -14,7 +14,7 @@ YAML_EXAMPLE = u"""
migration:
options:
# --workers=0 --stop-after-init are automatically added
- install_command: odoo.py
+ install_command: odoo
install_args: --log-level=debug
versions:
- version: 0.0.1
@@ -24,7 +24,7 @@ migration:
post: # executed after 'addons'
- anthem songs::install
addons:
- upgrade: # executed as odoo.py --stop-after-init -i/-u ...
+ upgrade: # executed as odoo --stop-after-init -i/-u ...
- base
- document
# remove: # uninstalled with a python script
|
Update docstring to use odoo command instead of odoo.py
|
diff --git a/command/agent/config.go b/command/agent/config.go
index <HASH>..<HASH> 100644
--- a/command/agent/config.go
+++ b/command/agent/config.go
@@ -602,6 +602,9 @@ func (a *AdvertiseAddrs) Merge(b *AdvertiseAddrs) *AdvertiseAddrs {
if b.Serf != "" {
result.Serf = b.Serf
}
+ if b.HTTP != "" {
+ result.HTTP = b.HTTP
+ }
return &result
}
|
Merging the value of http advertise addr if user is providing one
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -48,7 +48,7 @@ setup(
],
license='License :: OSI Approved :: MIT License',
keywords='design-by-contract precondition postcondition validation',
- packages=find_packages(exclude=['tests']),
+ packages=find_packages(exclude=['tests*']),
install_requires=install_requires,
extras_require={
'dev': [
|
Excluded all tests from package (#<I>)
The test directories tests_* are erronously included in the package. With this patch they are excluded in the package building.
Fixes #<I>.
|
diff --git a/arthur/_version.py b/arthur/_version.py
index <HASH>..<HASH> 100644
--- a/arthur/_version.py
+++ b/arthur/_version.py
@@ -1,2 +1,2 @@
# Versions compliant with PEP 440 https://www.python.org/dev/peps/pep-0440
-__version__ = "0.1.0"
+__version__ = "0.1.1"
|
Update version number to <I>
|
diff --git a/tests/lib/screenshot-testing/support/diff-viewer.js b/tests/lib/screenshot-testing/support/diff-viewer.js
index <HASH>..<HASH> 100644
--- a/tests/lib/screenshot-testing/support/diff-viewer.js
+++ b/tests/lib/screenshot-testing/support/diff-viewer.js
@@ -69,7 +69,7 @@ DiffViewerGenerator.prototype.generate = function (callback) {
var expectedUrl = self.getUrlForPath(entry.expected),
screenshotRepo = options['screenshot-repo'] || 'piwik/piwik-ui-tests',
pathPrefix = options['screenshot-repo'] ? '/Test/UI' : '',
- expectedUrlGithub = 'https://raw.github.com/' + screenshotRepo + '/master' + pathPrefix
+ expectedUrlGithub = 'https://raw.githubusercontent.com/' + screenshotRepo + '/master' + pathPrefix
+ '/expected-ui-screenshots/' + entry.name + '.png';
var expectedHtml = '';
|
github changed their URLs to githubusercontent.com
|
diff --git a/fmn/lib/models.py b/fmn/lib/models.py
index <HASH>..<HASH> 100644
--- a/fmn/lib/models.py
+++ b/fmn/lib/models.py
@@ -350,7 +350,9 @@ class Preference(BASE):
batch_count = sa.Column(sa.Integer, nullable=True)
# Hold the state of start/stop commands to the irc bot and others.
- enabled = sa.Column(sa.Boolean, default=True, nullable=False)
+ # Disabled by default so that we can provide robust default filters without
+ # forcing new users into an opt-out situation.
+ enabled = sa.Column(sa.Boolean, default=False, nullable=False)
openid = sa.Column(
sa.Text,
|
Disable messaging out of the box.
|
diff --git a/django_extensions/management/commands/find_template.py b/django_extensions/management/commands/find_template.py
index <HASH>..<HASH> 100644
--- a/django_extensions/management/commands/find_template.py
+++ b/django_extensions/management/commands/find_template.py
@@ -19,4 +19,4 @@ class Command(LabelCommand):
except TemplateDoesNotExist:
sys.stderr.write("No template found\n")
else:
- print(template.name)
+ sys.stdout.write(self.style.SUCCESS((template.name)))
|
change print into self.stdout
|
diff --git a/lib/github3.js b/lib/github3.js
index <HASH>..<HASH> 100644
--- a/lib/github3.js
+++ b/lib/github3.js
@@ -235,5 +235,15 @@ github3.getForks = function (repo,name,callback) {
this._get('/repos/'+name+'/'+repo+'/forks',callback)
}
+/*
+ Repository Watchers
+ @class github3
+ @method getWatchers
+*/
+
+github3.getWatchers = function (repo,name,callback) {
+ this._get('/repos/'+name+'/'+repo+'/watchers',callback)
+}
+
/* EOF */
\ No newline at end of file
diff --git a/test/api.test.js b/test/api.test.js
index <HASH>..<HASH> 100644
--- a/test/api.test.js
+++ b/test/api.test.js
@@ -135,6 +135,17 @@ vows.describe('api tests').addBatch({
assert.equal(typeof(data), 'object');
}
},
+ // getWatchers
+ 'when making a call to getWatchers(github3,edwardhotchkiss,':{
+ topic:function(){
+ github3.getWatchers('github3','edwardhotchkiss', this.callback);
+ },
+ 'we should receive no errors, and data back':function(error, data) {
+ console.log(data);
+ assert.equal(error, null);
+ assert.equal(typeof(data), 'object');
+ }
+ },
}).export(module);
|
added method/test to retrieve list of people watching a repository
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -107,45 +107,8 @@ function start (params = {}) {
serverClose('SIGINT')
})
- /**
- * A list of promises which listen to different
- * events in the application which need to resolved
- * until the server is fully started.
- *
- * By adding a new promise in the list below the
- * <code>serverStartedPromise</code> will wait
- * for that promise (and the rest of the promises
- * in the array) to resolve.
- */
- var serverStartedPromise = Promise.all([
- createEventPromise('event:strategyInitialized')
- ])
-
- serverStartedPromise.then(function () {
- server.emit('event:serverStarted', 'true')
- })
return Promise.resolve()
}
-/**
- * Create an Promise which listen for a event.
- *
- * @param eventName - for the event that the promise will listen for
- * @returns {Promise} A Promise which will resolve when the event fires
- */
-function createEventPromise (eventName) {
- return new Promise(
- function (resolve, reject) {
- server.on(eventName, function (initialized) {
- if (initialized) {
- resolve()
- } else {
- reject()
- }
- })
- }
- )
-}
-
module.exports = server
module.exports.start = start
|
Removed code after discussion with Emil, we don’t believe this is used and it is a bit strange
|
diff --git a/storage/sql/config.go b/storage/sql/config.go
index <HASH>..<HASH> 100644
--- a/storage/sql/config.go
+++ b/storage/sql/config.go
@@ -242,6 +242,10 @@ func (s *MySQL) open(logger log.Logger) (*conn, error) {
if s.Host[0] != '/' {
cfg.Net = "tcp"
cfg.Addr = s.Host
+
+ if s.Port != 0 {
+ cfg.Addr = net.JoinHostPort(s.Host, strconv.Itoa(int(s.Port)))
+ }
} else {
cfg.Net = "unix"
cfg.Addr = s.Host
|
fix(storage/mysql): add missing port to the address
|
diff --git a/Auth.php b/Auth.php
index <HASH>..<HASH> 100644
--- a/Auth.php
+++ b/Auth.php
@@ -980,6 +980,14 @@ class Auth
return $return;
}
+ $zxcvbn = new Zxcvbn();
+
+ if ($zxcvbn->passwordStrength($password)['score'] < intval($this->config->password_min_score)) {
+ $return['message'] = $this->lang['password_weak'];
+
+ return $return;
+ }
+
if ($password !== $repeatpassword) {
// Passwords don't match
$return['message'] = $this->lang["newpassword_nomatch"];
|
Added a password strength check to resetPass
|
diff --git a/lxd/network/network.go b/lxd/network/network.go
index <HASH>..<HASH> 100644
--- a/lxd/network/network.go
+++ b/lxd/network/network.go
@@ -283,6 +283,20 @@ func (n *Network) setup(oldConfig map[string]string) error {
}
}
+ // Enable VLAN filtering for Linux bridges.
+ if n.config["bridge.driver"] != "openvswitch" {
+ err = BridgeVLANFilterSetStatus(n.name, "1")
+ if err != nil {
+ return err
+ }
+
+ // Set the default PVID for new ports to 1.
+ err = BridgeVLANSetDefaultPVID(n.name, "1")
+ if err != nil {
+ return err
+ }
+ }
+
// Bring it up
_, err = shared.RunCommand("ip", "link", "set", "dev", n.name, "up")
if err != nil {
|
lxd/network: Enable VLAN filtering for managed Linux bridges
Sets default PVID to 1.
|
diff --git a/bigtable-client-core-parent/bigtable-client-core/src/main/java/com/google/cloud/bigtable/grpc/async/BulkMutation.java b/bigtable-client-core-parent/bigtable-client-core/src/main/java/com/google/cloud/bigtable/grpc/async/BulkMutation.java
index <HASH>..<HASH> 100644
--- a/bigtable-client-core-parent/bigtable-client-core/src/main/java/com/google/cloud/bigtable/grpc/async/BulkMutation.java
+++ b/bigtable-client-core-parent/bigtable-client-core/src/main/java/com/google/cloud/bigtable/grpc/async/BulkMutation.java
@@ -72,7 +72,7 @@ public class BulkMutation {
@VisibleForTesting
static Logger LOG = new Logger(BulkMutation.class);
- public static final long MAX_RPC_WAIT_TIME_NANOS = TimeUnit.MINUTES.toNanos(5);
+ public static final long MAX_RPC_WAIT_TIME_NANOS = TimeUnit.MINUTES.toNanos(7);
private final AtomicLong batchIdGenerator = new AtomicLong();
private static StatusRuntimeException toException(Status status) {
|
Increasing the staleness timeout to 7 minutes. (#<I>)
|
diff --git a/salt/modules/iptables.py b/salt/modules/iptables.py
index <HASH>..<HASH> 100644
--- a/salt/modules/iptables.py
+++ b/salt/modules/iptables.py
@@ -116,6 +116,20 @@ def set_policy(table='filter', chain=None, policy=None):
return out
+def save(filename):
+ '''
+ Save the current in-memory rules to disk
+
+ CLI Example::
+
+ salt '*' iptables.save /etc/sysconfig/iptables
+ '''
+ os.makedirs(os.path.dirname(filename))
+ cmd = 'iptables-save > {0}'.format(filename)
+ out = __salt__['cmd.run'](cmd)
+ return out
+
+
def append(table='filter', rule=None):
'''
Append a rule to the specified table/chain.
|
Add the ability to save rules to disk
|
diff --git a/src/LaravelRepositoriesServiceProvider.php b/src/LaravelRepositoriesServiceProvider.php
index <HASH>..<HASH> 100644
--- a/src/LaravelRepositoriesServiceProvider.php
+++ b/src/LaravelRepositoriesServiceProvider.php
@@ -6,10 +6,19 @@ use Illuminate\Support\ServiceProvider;
use Saritasa\LaravelRepositories\Repositories\RepositoryFactory;
use Saritasa\LaravelRepositories\Contracts\IRepositoryFactory;
+/**
+ * Package providers. Registers package implementation in DI container.
+ * Make settings needed to correct work.
+ */
class LaravelRepositoriesServiceProvider extends ServiceProvider
{
+ /**
+ * Register package implementation in DI container.
+ *
+ * @return void
+ */
public function register(): void
{
- $this->app->bind(IRepositoryFactory::class, RepositoryFactory::class);
+ $this->app->singleton(IRepositoryFactory::class, RepositoryFactory::class);
}
}
|
Change type of implementation of IRepositoryFactory in DI container to singleton.
Improve package provider documentation.
|
diff --git a/cnxpublishing/tests/test_db.py b/cnxpublishing/tests/test_db.py
index <HASH>..<HASH> 100644
--- a/cnxpublishing/tests/test_db.py
+++ b/cnxpublishing/tests/test_db.py
@@ -1077,7 +1077,7 @@ INSERT INTO modules
VALUES
(1, 'Module', 'referenced module',
DEFAULT, DEFAULT, 1, 1,
- 0, 'admin', 'log', NULL, NULL, NULL,
+ 0, 'admin', 'log', DEFAULT, NULL, NULL,
'en', '{admin}', NULL, '{admin}',
DEFAULT, DEFAULT) RETURNING uuid || '@' || major_version""")
doc_ident_hash = cursor.fetchone()[0]
@@ -1450,7 +1450,7 @@ VALUES
(1, 'Module', 'm10000', %s, 'v1',
'1', DEFAULT,
DEFAULT, DEFAULT, 1, 1,
- 0, 'admin', 'log', NULL, NULL, NULL,
+ 0, 'admin', 'log', DEFAULT, NULL, NULL,
'en', '{admin}', NULL, '{admin}',
DEFAULT, DEFAULT),
(2, 'Module', 'm10000', %s, 'v2',
|
Change tests to insert DEFAULT stateid instead of NULL
|
diff --git a/test.js b/test.js
index <HASH>..<HASH> 100644
--- a/test.js
+++ b/test.js
@@ -115,10 +115,15 @@ describe('loads', function () {
/* istanbul ignore next */
.on('error', function (err) {
throw err;
+ })
+ /* istanbul ignore next */
+ .on('timeout', function (err) {
+ throw err;
});
- xhr.timeout = 200;
- loads(xhr, ee).emit('load');
+ xhr.timeout = 10;
+ loads(xhr, ee);
+ ee.emit('end');
});
it('emits a `stream` event when onload has data', function (next) {
|
[test] Test that everything is cleared on `end`
|
diff --git a/conftest.py b/conftest.py
index <HASH>..<HASH> 100644
--- a/conftest.py
+++ b/conftest.py
@@ -25,11 +25,18 @@ def client_token(client):
def clean_response(response):
"""Remove a few info from the response before writing cassettes."""
- if not isinstance(response, dict):
- return response
- response["headers"].pop("Set-Cookie", None)
- response["headers"].pop("Date", None)
- response["headers"].pop("P3P", None)
+ remove_headers = {"Set-Cookie", "Date", "P3P"}
+ if isinstance(response["headers"], dict):
+ # Normal client stores headers as dict
+ for header_name in remove_headers:
+ response["headers"].pop(header_name, None)
+ elif isinstance(response["headers"], list):
+ # Tornado client stores headers as a list of 2-tuples
+ response["headers"] = [
+ (name, value)
+ for name, value in response["headers"]
+ if name not in remove_headers
+ ]
return response
|
test: make clean response work with tornado client
|
diff --git a/src/js/boards.js b/src/js/boards.js
index <HASH>..<HASH> 100644
--- a/src/js/boards.js
+++ b/src/js/boards.js
@@ -130,11 +130,12 @@
if (e.isNew)
{
var DROP = 'drop';
+ var result;
if (setting.hasOwnProperty(DROP) && $.isFunction(setting[DROP]))
{
- setting[DROP](e);
+ result = setting[DROP](e);
}
- e.element.insertBefore(e.target);
+ if(result !== false) e.element.insertBefore(e.target);
}
},
finish: function()
|
* drop action can be cancel in board.
|
diff --git a/lib/plans.go b/lib/plans.go
index <HASH>..<HASH> 100644
--- a/lib/plans.go
+++ b/lib/plans.go
@@ -16,6 +16,8 @@ type Plan struct {
Disk string `json:"disk"`
Bandwidth string `json:"bandwidth"`
Price string `json:"price_per_month"`
+ PlanType string `json:"plan_type"`
+ Windows bool `json:"windows"`
Regions []int `json:"available_locations"`
}
|
Update plans.go
added PlanTypes and Windows to struct 'Plan' following Vultr's plan API response
<URL>
|
diff --git a/extensions/multibindings/src/com/google/inject/multibindings/Multibinder.java b/extensions/multibindings/src/com/google/inject/multibindings/Multibinder.java
index <HASH>..<HASH> 100644
--- a/extensions/multibindings/src/com/google/inject/multibindings/Multibinder.java
+++ b/extensions/multibindings/src/com/google/inject/multibindings/Multibinder.java
@@ -72,8 +72,8 @@ import java.util.Set;
* }</code></pre>
*
* <p>Contributing multibindings from different modules is supported. For
- * example, it is okay to have both {@code CandyModule} and {@code ChipsModule}
- * to both create their own {@code Multibinder<Snack>}, and to each contribute
+ * example, it is okay for both {@code CandyModule} and {@code ChipsModule}
+ * to create their own {@code Multibinder<Snack>}, and to each contribute
* bindings to the set of snacks. When that set is injected, it will contain
* elements from both modules.
*
|
Fix issue <I>, cleanup javadoc for Multibinder
Revision created by MOE tool push_codebase.
MOE_MIGRATION=<I>
|
diff --git a/impl/src/main/java/org/jboss/weld/bootstrap/events/BeanBuilderImpl.java b/impl/src/main/java/org/jboss/weld/bootstrap/events/BeanBuilderImpl.java
index <HASH>..<HASH> 100644
--- a/impl/src/main/java/org/jboss/weld/bootstrap/events/BeanBuilderImpl.java
+++ b/impl/src/main/java/org/jboss/weld/bootstrap/events/BeanBuilderImpl.java
@@ -153,11 +153,13 @@ public final class BeanBuilderImpl<T> extends BeanAttributesBuilder<T, BeanBuild
public BeanBuilder<T> addInjectionPoints(InjectionPoint... injectionPoints) {
checkArgumentNotNull(injectionPoints, ARG_INJECTION_POINTS);
+ Collections.addAll(this.injectionPoints, injectionPoints);
return this;
}
public BeanBuilder<T> addInjectionPoints(Set<InjectionPoint> injectionPoints) {
checkArgumentNotNull(injectionPoints, ARG_INJECTION_POINTS);
+ this.injectionPoints.addAll(injectionPoints);
return this;
}
|
Fix missing add of injection points in BeanBuilderImpl.
|
diff --git a/src/Phug/Formatter.php b/src/Phug/Formatter.php
index <HASH>..<HASH> 100644
--- a/src/Phug/Formatter.php
+++ b/src/Phug/Formatter.php
@@ -141,7 +141,7 @@ class Formatter implements ModuleContainerInterface
$error->getMessage(),
$error->getCode(),
$error,
- $node->getFile(), //TODO: getFile is not exported in NodeInterface
+ $node->getFile(),
$node->getLine(),
$node->getOffset()
);
|
getFile will be available on Parser next release
|
diff --git a/urbansim/utils/misc.py b/urbansim/utils/misc.py
index <HASH>..<HASH> 100644
--- a/urbansim/utils/misc.py
+++ b/urbansim/utils/misc.py
@@ -1,8 +1,6 @@
from __future__ import print_function
import os
-import yaml
-
import numpy as np
import pandas as pd
|
one more - no longer need to import yaml here
|
diff --git a/src/main/java/com/bitmechanic/barrister/Idl2Java.java b/src/main/java/com/bitmechanic/barrister/Idl2Java.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/bitmechanic/barrister/Idl2Java.java
+++ b/src/main/java/com/bitmechanic/barrister/Idl2Java.java
@@ -414,7 +414,7 @@ public class Idl2Java {
private void toFile(String pkgName, String className) throws Exception {
String dirName = mkdirForPackage(pkgName);
- String outfile = dirName + File.separator + className + ".java";
+ String outfile = (dirName + File.separator + className + ".java").replace("/", File.separator);
out("Writing file: " + outfile);
PrintWriter w = new PrintWriter(new FileWriter(outfile));
@@ -423,7 +423,7 @@ public class Idl2Java {
}
private String mkdirForPackage(String pkgName) {
- String dirName = outDir + File.separator + pkgName.replace('.', File.separatorChar);
+ String dirName = (outDir + File.separator + pkgName.replace('.', File.separatorChar)).replace("/", File.separator);
File dir = new File(dirName);
if (!dir.exists()) {
|
Ensure file/dir paths have correct separator
|
diff --git a/src/CoandaCMS/Coanda/Pages/Repositories/Eloquent/EloquentPageRepository.php b/src/CoandaCMS/Coanda/Pages/Repositories/Eloquent/EloquentPageRepository.php
index <HASH>..<HASH> 100644
--- a/src/CoandaCMS/Coanda/Pages/Repositories/Eloquent/EloquentPageRepository.php
+++ b/src/CoandaCMS/Coanda/Pages/Repositories/Eloquent/EloquentPageRepository.php
@@ -959,11 +959,11 @@ class EloquentPageRepository implements PageRepositoryInterface {
if ($permanent)
{
+ $this->logHistory('deleted', $page->id, ['page_name' => $page->name]);
+
$this->deleteSubPages($page, true);
$this->urls->delete('page', $page->id);
$page->delete();
-
- $this->logHistory('deleted', $page->id, ['page_name' => $page->name]);
}
else
{
|
When deleting a page, need to log the fact it was deleted first, otherwise the versions have gone and the name can't be generated.
|
diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index <HASH>..<HASH> 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -49,6 +49,20 @@ class WebDriverExpectedCondition {
}
/**
+ * An expectation for checking substring of a page Title.
+ *
+ * @param string title The expected substring of Title.
+ * @return bool True when in title, false otherwise.
+ */
+ public static function inTitle($title) {
+ return new WebDriverExpectedCondition(
+ function ($driver) use ($title) {
+ return strstr($driver->getTitle(),$title);
+ }
+ );
+ }
+
+ /**
* An expectation for checking that an element is present on the DOM of a
* page. This does not necessarily mean that the element is visible.
*
|
added expectation for substring of title.
|
diff --git a/app/lib/katello/concerns/base_template_scope_extensions.rb b/app/lib/katello/concerns/base_template_scope_extensions.rb
index <HASH>..<HASH> 100644
--- a/app/lib/katello/concerns/base_template_scope_extensions.rb
+++ b/app/lib/katello/concerns/base_template_scope_extensions.rb
@@ -161,7 +161,7 @@ module Katello
returns String, desc: 'Package version'
end
def host_latest_applicable_rpm_version(host, package)
- host.applicable_rpms.where(name: package).order(:version_sortable).limit(1).pluck(:nvra).first
+ ::Katello::Rpm.latest(host.applicable_rpms.where(name: package)).first.nvra
end
apipie :method, 'Loads Pool objects' do
|
Fixes #<I> - wrong latest kernel version in Registered Content Hosts report (#<I>)
|
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index <HASH>..<HASH> 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -218,7 +218,7 @@ func init() {
// Initialize the CLI app and start Geth
app.Action = geth
app.HideVersion = true // we have a command to print the version
- app.Copyright = "Copyright 2013-2020 The go-ethereum Authors"
+ app.Copyright = "Copyright 2013-2021 The go-ethereum Authors"
app.Commands = []cli.Command{
// See chaincmd.go:
initCommand,
|
cmd/geth: update copyright year (#<I>)
|
diff --git a/web/web.go b/web/web.go
index <HASH>..<HASH> 100644
--- a/web/web.go
+++ b/web/web.go
@@ -140,6 +140,10 @@ func formatEndpoint(v *registry.Value, r int) string {
return fmt.Sprintf(strings.Join(fparts, ""), vals...)
}
+func faviconHandler(w http.ResponseWriter, r *http.Request) {
+ return
+}
+
func indexHandler(w http.ResponseWriter, r *http.Request) {
services, err := (*cmd.DefaultOptions().Registry).ListServices()
if err != nil {
@@ -250,6 +254,7 @@ func run(ctx *cli.Context) {
s.HandleFunc("/registry", registryHandler)
s.HandleFunc("/rpc", handler.RPC)
s.HandleFunc("/query", queryHandler)
+ s.HandleFunc("/favicon.ico", faviconHandler)
s.PathPrefix("/{service:[a-zA-Z0-9]+}").Handler(s.proxy())
s.HandleFunc("/", indexHandler)
|
add cruft favicon.ico handler so it doesn't error
|
diff --git a/spec/cucumber/formatter/junit_spec.rb b/spec/cucumber/formatter/junit_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/cucumber/formatter/junit_spec.rb
+++ b/spec/cucumber/formatter/junit_spec.rb
@@ -66,6 +66,29 @@ module Cucumber
it { expect(@doc.xpath('//testsuite/testcase/system-out').first.content).to match(/\s+boo boo\s+/) }
end
+ describe 'is able to handle multiple encodings in pipe' do
+ before(:each) do
+ run_defined_feature
+ @doc = Nokogiri.XML(@formatter.written_files.values.first)
+ end
+
+ define_steps do
+ Given(/a passing ctrl scenario/) do
+ Kernel.puts "encoding"
+ Kernel.puts "pickle".encode("UTF-16")
+ end
+ end
+
+ define_feature "
+ Feature: One passing scenario, one failing scenario
+
+ Scenario: Passing
+ Given a passing ctrl scenario
+ "
+
+ it { expect(@doc.xpath('//testsuite/testcase/system-out').first.content).to match(/\s+encoding\npickle\s+/) }
+ end
+
describe 'a feature with no name' do
define_feature <<-FEATURE
Feature:
|
Add test for handling captured output encodings in junit
|
diff --git a/tests/xml/test_MultiPartyCallElement.py b/tests/xml/test_MultiPartyCallElement.py
index <HASH>..<HASH> 100644
--- a/tests/xml/test_MultiPartyCallElement.py
+++ b/tests/xml/test_MultiPartyCallElement.py
@@ -37,7 +37,8 @@ class MultiPartyCallElementTest(TestCase, PlivoXmlTestCase):
def test_validation_on_init(self):
expected_error = '["status_callback_events should be among (\'mpc-state-changes\', ' \
- '\'participant-state-changes\', \'participant-speak-events\'). ' \
+ '\'participant-state-changes\', \'participant-speak-events\', ' \
+ '\'participant-digit-input-events\', \'add-participant-api-events\'). ' \
'multiple values should be COMMA(,) separated (actual value: hostages-move)"]'
actual_error = ''
|
MultiPartyCallElementTest.test_validation_on_init: update expected error
this should probably not be hardcoded, but that looks like a bigger change across the test suite
|
diff --git a/lib/emitter.js b/lib/emitter.js
index <HASH>..<HASH> 100644
--- a/lib/emitter.js
+++ b/lib/emitter.js
@@ -61,6 +61,12 @@ class Emitter {
callback(params[0]);
} else if (paramsLength === 2) {
callback(params[0], params[1]);
+ } else if (paramsLength === 3) {
+ callback(params[0], params[1], params[2]);
+ } else if (paramsLength === 4) {
+ callback(params[0], params[1], params[2], params[3]);
+ } else if (paramsLength === 5) {
+ callback(params[0], params[1], params[2], params[3], params[4]);
} else {
callback.apply(undefined, params);
}
|
:arrow_up: Upgrade dist file
|
diff --git a/control/runner.go b/control/runner.go
index <HASH>..<HASH> 100644
--- a/control/runner.go
+++ b/control/runner.go
@@ -307,6 +307,12 @@ func (r *runner) Start() error {
// Stop handling, gracefully stop all plugins.
func (r *runner) Stop() []error {
var errs []error
+
+ // Stop the monitor
+ r.monitor.Stop()
+
+ // TODO: Actually stop the plugins
+
// For each delegate unregister needed handlers
for _, del := range r.delegates {
e := del.UnregisterHandler(HandlerRegistrationName)
|
Stop the monitor when runner.Stop() is called
|
diff --git a/test/commands/console_test.rb b/test/commands/console_test.rb
index <HASH>..<HASH> 100644
--- a/test/commands/console_test.rb
+++ b/test/commands/console_test.rb
@@ -183,9 +183,17 @@ describe Lotus::Commands::Console do
end
end
- it 'preloads application' do
- assert defined?(Frontend::Controllers::Sessions::New), "expected Frontend::Controllers::Sessions::New to be loaded"
- end
+ # This generates random failures due to the race condition.
+ #
+ # I feel confident to ship this change without activating this test.
+ # In an ideal world this shouldn't happen, but I want to ship soon 0.2.0
+ #
+ # Love,
+ # Luca
+ it 'preloads application'
+ # it 'preloads application' do
+ # assert defined?(Frontend::Controllers::Sessions::New), "expected Frontend::Controllers::Sessions::New to be loaded"
+ # end
end
describe 'when manually setting the environment file' do
|
Muted failing tests introduced by <I>ca<I>f9a<I>fd6c5d<I>f<I>ec. My apologies :crying_cat_face:
|
diff --git a/src/sos/utils.py b/src/sos/utils.py
index <HASH>..<HASH> 100644
--- a/src/sos/utils.py
+++ b/src/sos/utils.py
@@ -895,10 +895,6 @@ def sos_handle_parameter_(key, defvalue):
NOTE: parmeters will not be handled if it is already defined in
the environment. This makes the parameters variable.
'''
- if key in env.symbols:
- env.logger.warning(
- f'Parameter {key} overrides a Python or SoS keyword.')
-
env.parameter_vars.add(key)
if not env.sos_dict['__args__']:
if isinstance(defvalue, type):
@@ -910,6 +906,10 @@ def sos_handle_parameter_(key, defvalue):
if key in env.sos_dict['__args__']:
return env.sos_dict['__args__'][key]
#
+ if key in env.symbols:
+ env.logger.warning(
+ f'Parameter {key} overrides a Python or SoS keyword.')
+ #
parser = argparse.ArgumentParser()
# thre is a possibility that users specify --cut-off instead of --cut_off for parameter
# cut_off. It owuld be nice to allow both.
|
Reduce the occurance of warning message #<I>
|
diff --git a/nodejs/matrix/cost.js b/nodejs/matrix/cost.js
index <HASH>..<HASH> 100644
--- a/nodejs/matrix/cost.js
+++ b/nodejs/matrix/cost.js
@@ -81,6 +81,11 @@ function penalty_costs(penalty, bounds, prmname) {
if( bounds.LBDefined ) {
if( costs[0].lb !== bounds.LB ) {
costs[0].lb = bounds.LB;
+
+ // need to adjust the ub as well.
+ if( penalty.length >= 3 ) {
+ costs[0].ub = penalty[2][0];
+ }
if( LOCAL_DEBUG ) console.log(`${prmname}: s<0 && LB, setting k=0 lb to LB`);
updated = true;
}
|
adjusting ub when moving k=0 to physical lower bound
|
diff --git a/erizo_controller/common/semanticSdp/SimulcastInfo.js b/erizo_controller/common/semanticSdp/SimulcastInfo.js
index <HASH>..<HASH> 100755
--- a/erizo_controller/common/semanticSdp/SimulcastInfo.js
+++ b/erizo_controller/common/semanticSdp/SimulcastInfo.js
@@ -14,14 +14,14 @@ class SimulcastInfo {
sendStreams.forEach((sendStream) => {
alternatives.push(sendStream.clone());
});
- cloned.addSimulcastAlternativeStreams(alternatives);
+ cloned.addSimulcastAlternativeStreams(DirectionWay.SEND, alternatives);
});
this.recv.forEach((recvStreams) => {
const alternatives = [];
recvStreams.forEach((recvStream) => {
alternatives.push(recvStream.clone());
});
- cloned.addSimulcastAlternativeStreams(alternatives);
+ cloned.addSimulcastAlternativeStreams(DirectionWay.RECV, alternatives);
});
return cloned;
}
|
Fix cloning of SimulcastInfos (#<I>)
|
diff --git a/src/js/components/Diagram/diagram.stories.js b/src/js/components/Diagram/diagram.stories.js
index <HASH>..<HASH> 100644
--- a/src/js/components/Diagram/diagram.stories.js
+++ b/src/js/components/Diagram/diagram.stories.js
@@ -48,7 +48,7 @@ class SimpleDiagram extends React.Component {
const connections = [connection('1', '5', { color: 'accent-2' })];
if (topRow.length >= 2) {
connections.push(
- connection('4', '2', { color: 'accent-1', anchor: 'horizontal' }),
+ connection('1', '2', { color: 'accent-1', anchor: 'horizontal' }),
);
}
if (topRow.length >= 3) {
|
Changed diagram story to remove swastika (#<I>)
|
diff --git a/src/tokencontext.js b/src/tokencontext.js
index <HASH>..<HASH> 100644
--- a/src/tokencontext.js
+++ b/src/tokencontext.js
@@ -46,6 +46,8 @@ pp.braceIsBlock = function(prevType) {
return true
if (prevType == tt.braceL)
return this.curContext() === types.b_stat
+ if (prevType == tt._var || prevType == tt.name)
+ return false
return !this.exprAllowed
}
diff --git a/test/tests-harmony.js b/test/tests-harmony.js
index <HASH>..<HASH> 100644
--- a/test/tests-harmony.js
+++ b/test/tests-harmony.js
@@ -15666,6 +15666,10 @@ test("[...foo, bar = 1]", {}, {ecmaVersion: 6})
test("for (var a of /b/) {}", {}, {ecmaVersion: 6})
+test("for (var {a} of /b/) {}", {}, {ecmaVersion: 6})
+
+test("for (let {a} of /b/) {}", {}, {ecmaVersion: 6})
+
test("function* bar() { yield /re/ }", {}, {ecmaVersion: 6})
test("() => {}\n/re/", {}, {ecmaVersion: 6})
|
Fix token context for braces after let/var/const
Issue #<I>
|
diff --git a/lib/specjour/manager.rb b/lib/specjour/manager.rb
index <HASH>..<HASH> 100644
--- a/lib/specjour/manager.rb
+++ b/lib/specjour/manager.rb
@@ -61,11 +61,15 @@ module Specjour
def dispatch_loader
@loader_pid = fork do
# at_exit { exit! }
- exec_cmd = "specjour load --printer-uri #{dispatcher_uri} --workers #{worker_size} --task #{worker_task} --project-path #{project_path}"
+ exec_cmd = "load --printer-uri #{dispatcher_uri} --workers #{worker_size} --task #{worker_task} --project-path #{project_path}"
exec_cmd << " --preload-spec #{preload_spec}" if preload_spec
exec_cmd << " --preload-feature #{preload_feature}" if preload_feature
exec_cmd << " --log" if Specjour.log?
exec_cmd << " --quiet" if quiet?
+ exec_ruby = "Specjour::CLI.start(#{exec_cmd.split(' ').inspect})"
+ load_path = ''
+ $LOAD_PATH.each {|p| load_path << "-I#{p} "}
+ exec_cmd = "ruby #{load_path} -rspecjour -e '#{exec_ruby}'"
exec exec_cmd
end
Process.waitall
|
Run loader outside of bundler's environment
|
diff --git a/galpy/orbit_src/planarOrbit.py b/galpy/orbit_src/planarOrbit.py
index <HASH>..<HASH> 100644
--- a/galpy/orbit_src/planarOrbit.py
+++ b/galpy/orbit_src/planarOrbit.py
@@ -307,8 +307,8 @@ class planarOrbit(planarOrbitTop):
HISTORY:
2010-07-10 - Written - Bovy (NYU)
"""
- self.E= [evaluateplanarPotentials(self.orbit[ii,0],
- self.orbit[ii,3],pot)+
+ self.E= [evaluateplanarPotentials(self.orbit[ii,0],pot,
+ phi=self.orbit[ii,3])+
self.orbit[ii,1]**2./2.+self.orbit[ii,2]**2./2.
for ii in range(len(self.t))]
plot.bovy_plot(nu.array(self.t),nu.array(self.E)/self.E[0],
|
fix plotEt for planarOrbit
|
diff --git a/regions/core/attributes.py b/regions/core/attributes.py
index <HASH>..<HASH> 100644
--- a/regions/core/attributes.py
+++ b/regions/core/attributes.py
@@ -13,6 +13,10 @@ import numpy as np
from .core import PixelRegion, SkyRegion
from .pixcoord import PixCoord
+__all__ = ['RegionAttr', 'ScalarPix', 'OneDPix', 'ScalarLength',
+ 'ScalarSky', 'OneDSky', 'QuantityLength',
+ 'CompoundRegionPix', 'CompoundRegionSky']
+
class RegionAttr(abc.ABC):
"""Descriptor base class"""
|
Add __all__ to attributes
|
diff --git a/src/zoid/buttons/util.js b/src/zoid/buttons/util.js
index <HASH>..<HASH> 100644
--- a/src/zoid/buttons/util.js
+++ b/src/zoid/buttons/util.js
@@ -121,7 +121,7 @@ export function createNoPaylaterExperiment(fundingSource : ?$Values<typeof FUNDI
return;
}
- return createExperiment('disable_paylater', 10);
+ return createExperiment('disable_paylater', 0);
}
export function getNoPaylaterExperiment(fundingSource : ?$Values<typeof FUNDING>) : EligibilityExperiment {
|
turn off pay later experiment (#<I>)
|
diff --git a/consul/server_manager/server_manager.go b/consul/server_manager/server_manager.go
index <HASH>..<HASH> 100644
--- a/consul/server_manager/server_manager.go
+++ b/consul/server_manager/server_manager.go
@@ -173,15 +173,11 @@ func (sc *serverConfig) removeServerByKey(targetKey *server_details.Key) {
// shuffleServers shuffles the server list in place
func (sc *serverConfig) shuffleServers() {
- newServers := make([]*server_details.ServerDetails, len(sc.servers))
- copy(newServers, sc.servers)
-
// Shuffle server list
for i := len(sc.servers) - 1; i > 0; i-- {
j := rand.Int31n(int32(i + 1))
- newServers[i], newServers[j] = newServers[j], newServers[i]
+ sc.servers[i], sc.servers[j] = sc.servers[j], sc.servers[i]
}
- sc.servers = newServers
}
// FindServer takes out an internal "read lock" and searches through the list
|
Shuffle in place
Don't create a copy and save the copy, not necessary any more.
|
diff --git a/yapsydir/trunk/test/test_settings.py b/yapsydir/trunk/test/test_settings.py
index <HASH>..<HASH> 100644
--- a/yapsydir/trunk/test/test_settings.py
+++ b/yapsydir/trunk/test/test_settings.py
@@ -13,12 +13,12 @@ TEMP_CONFIG_FILE_NAME=os.path.join(
"tempconfig")
# set correct loading path for yapsy's files
-sys.path.append(
+sys.path.insert(0,
os.path.dirname(
os.path.dirname(
os.path.abspath(__file__))))
-sys.path.append(
+sys.path.insert(0,
os.path.dirname(
os.path.dirname(
os.path.dirname(
|
Make sure we actually import the version from trunk (and not the system
wide installed one ;) )
--HG--
extra : convert_revision : svn%3A3e6e<I>ca-<I>-<I>-a<I>-d<I>c<I>b3c<I>e%<I>
|
diff --git a/cachalot/utils.py b/cachalot/utils.py
index <HASH>..<HASH> 100644
--- a/cachalot/utils.py
+++ b/cachalot/utils.py
@@ -128,10 +128,9 @@ def _get_tables(query, db_alias):
tables = set(query.table_map)
tables.add(query.get_meta().db_table)
- children = query.where.children
- if DJANGO_LTE_1_8:
- children += query.having.children
- subquery_constraints = _find_subqueries(children)
+ subquery_constraints = _find_subqueries(
+ query.where.children + query.having.children if DJANGO_LTE_1_8
+ else query.where.children)
for subquery in subquery_constraints:
tables.update(_get_tables(subquery, db_alias))
if query.extra_select or hasattr(query, 'subquery') \
|
Fixes Django <I> compatibility.
|
diff --git a/sumo/plotting/dos_plotter.py b/sumo/plotting/dos_plotter.py
index <HASH>..<HASH> 100644
--- a/sumo/plotting/dos_plotter.py
+++ b/sumo/plotting/dos_plotter.py
@@ -287,6 +287,15 @@ class SDOSPlotter(object):
ax.plot(energies, densities, label=label,
color=line['colour'])
+ # draw line at Fermi level
+ if not zero_to_efermi:
+ xtick_color = matplotlib.rcParams['xtick.color']
+ ef = self._dos.efermi
+ ax.axvline(ef, color=xtick_color, linestyle='-.', alpha=0.3)
+ else:
+ xtick_color = matplotlib.rcParams['xtick.color']
+ ax.axvline(x=0, color=xtick_color, linestyle='-.', alpha=0.3)
+
ax.set_ylim(plot_data['ymin'], plot_data['ymax'])
ax.set_xlim(xmin, xmax)
|
draw Fermi level line to the dos diagram
|
diff --git a/packer/build.go b/packer/build.go
index <HASH>..<HASH> 100644
--- a/packer/build.go
+++ b/packer/build.go
@@ -312,10 +312,10 @@ PostProcessorRunSeqLoop:
}
keep := defaultKeep
- // When user has not set keep_input_artifuact
+ // When user has not set keep_input_artifact
// corePP.keepInputArtifact is nil.
// In this case, use the keepDefault provided by the postprocessor.
- // When user _has_ set keep_input_atifact, go with that instead.
+ // When user _has_ set keep_input_artifact, go with that instead.
// Exception: for postprocessors that will fail/become
// useless if keep isn't true, heed forceOverride and keep the
// input artifact regardless of user preference.
|
fix: mispelled variables names in packer/build.go (#<I>)
|
diff --git a/lib/vagrant/util/subprocess.rb b/lib/vagrant/util/subprocess.rb
index <HASH>..<HASH> 100644
--- a/lib/vagrant/util/subprocess.rb
+++ b/lib/vagrant/util/subprocess.rb
@@ -26,6 +26,11 @@ module Vagrant
def initialize(*command)
@options = command.last.is_a?(Hash) ? command.pop : {}
@command = command
+ if Platform.windows?
+ locations = `where #{command[0]}`
+ new_command = "#{locations.split("\n")[0]}"
+ @command[0] = new_command if $?.success? and File.exists?(new_command)
+ end
@logger = Log4r::Logger.new("vagrant::util::subprocess")
end
|
Fixes [GH-<I>] on Windows 8x<I> and Ruby <I>p<I>
Replaces the command with absolute path version if it exists.
|
diff --git a/bugwarrior/db.py b/bugwarrior/db.py
index <HASH>..<HASH> 100644
--- a/bugwarrior/db.py
+++ b/bugwarrior/db.py
@@ -234,10 +234,8 @@ def synchronize(issue_generator, conf):
else:
issue_updates['existing'].append(task)
issue_updates['closed'].remove(existing_uuid)
- except MultipleMatches:
- log.name('bugwarrior').error(
- "Multiple matches found for issue: %s" % issue
- )
+ except MultipleMatches as e:
+ log.name('bugwarrior').trace(e)
except NotFound:
issue_updates['new'].append(dict(issue))
|
Pass along details of the MultipleMatches exception.
|
diff --git a/spec/escher.spec.js b/spec/escher.spec.js
index <HASH>..<HASH> 100644
--- a/spec/escher.spec.js
+++ b/spec/escher.spec.js
@@ -229,20 +229,6 @@ describe('Escher', function() {
.toThrow('The request date is not within the accepted time range');
});
- it('should validate request using auth header', function() {
- var escherConfig = configForHeaderValidationWith(nearToGoodDate);
- var headers = [
- ['Date', goodDate.toUTCString()],
- ['Host', 'host.foo.com'],
- ['Authorization', goodAuthHeader()]
- ];
- var requestOptions = requestOptionsWithHeaders(headers);
-
- expect(function() {
- new Escher(escherConfig).authenticate(requestOptions, keyDB);
- }).not.toThrow();
- });
-
it('should not depend on the order of headers', function() {
var headers = [
['Host', 'host.foo.com'],
|
remove test we don't need, as we already have a JSON test for it: authenticate-valid-get-vanilla-empty-query
|
diff --git a/src/http/server/plugin/session.js b/src/http/server/plugin/session.js
index <HASH>..<HASH> 100644
--- a/src/http/server/plugin/session.js
+++ b/src/http/server/plugin/session.js
@@ -163,12 +163,12 @@ module.exports = class Session {
const decoded = await this.unsign(encoded);
if (!decoded) return this.unauthorized(context);
- const [ sid, expiration ] = decoded.split('.');
-
+ const [ identifier, expiration ] = decoded.split('.');
const now = Date.now();
+
if (expiration <= now) return this.unauthorized(context);
- const validate = await this.validate(context, sid);
+ const validate = await this.validate(context, identifier);
if (!validate || typeof validate !== 'object') {
throw new Error('Session - validate object required');
@@ -178,8 +178,6 @@ module.exports = class Session {
if (!validate.valid) return this.unauthorized(context);
context.set('credential', validate.credential);
-
}
-
}
|
renamed variable, removed line break
|
diff --git a/lib/jrubyfx_tasks.rb b/lib/jrubyfx_tasks.rb
index <HASH>..<HASH> 100644
--- a/lib/jrubyfx_tasks.rb
+++ b/lib/jrubyfx_tasks.rb
@@ -19,7 +19,6 @@ limitations under the License.
require 'open-uri'
require 'rake'
require 'tmpdir'
-require "ant"
require "pathname"
module JRubyFX
@@ -108,6 +107,9 @@ module JRubyFX
if ENV_JAVA["java.runtime.version"].match(/^1\.[0-7]{1}\..*/)
raise "You must install JDK 8 to use the native-bundle packaging tools. You can still create an executable jar, though."
end
+
+ # the native bundling uses ant
+ require "ant"
output_jar = Pathname.new(output_jar)
dist_dir = output_jar.parent
|
Moving ant deps to native packaging
|
diff --git a/test/fixtures/prepare.js b/test/fixtures/prepare.js
index <HASH>..<HASH> 100755
--- a/test/fixtures/prepare.js
+++ b/test/fixtures/prepare.js
@@ -5,7 +5,8 @@ var path = require('path')
var shell = require('shelljs')
var JAVA = 'java -Djava.awt.headless=true -jar'
-var PLANTUML_JAR = path.join(__dirname, '../../vendor/plantuml.jar')
+var INCLUDED_PLANTUML_JAR = path.join(__dirname, '../../vendor/plantuml.jar')
+var PLANTUML_JAR = process.env.PLANTUML_HOME || INCLUDED_PLANTUML_JAR
var TEST_PUML = path.join(__dirname, 'test.puml')
shell.exec(JAVA + ' ' + PLANTUML_JAR + ' ' + TEST_PUML)
|
Make prepareation of fixtures use PLANTUML_HOME
|
diff --git a/cli/src/main/java/org/jboss/as/cli/impl/ExtensionsLoader.java b/cli/src/main/java/org/jboss/as/cli/impl/ExtensionsLoader.java
index <HASH>..<HASH> 100644
--- a/cli/src/main/java/org/jboss/as/cli/impl/ExtensionsLoader.java
+++ b/cli/src/main/java/org/jboss/as/cli/impl/ExtensionsLoader.java
@@ -138,7 +138,7 @@ class ExtensionsLoader {
if(!module.isDefined()) {
addError("Extension " + ext.getName() + " is missing module attribute");
} else {
- final ModuleIdentifier moduleId = ModuleIdentifier.create(module.asString());
+ final ModuleIdentifier moduleId = ModuleIdentifier.fromString(module.asString());
ModuleClassLoader cl;
try {
cl = moduleLoader.loadModule(moduleId).getClassLoader();
|
[WFCORE-<I>] Use fromString instead of create when the text may include a slot
|
diff --git a/Rest/ContentUserGateway.php b/Rest/ContentUserGateway.php
index <HASH>..<HASH> 100644
--- a/Rest/ContentUserGateway.php
+++ b/Rest/ContentUserGateway.php
@@ -104,6 +104,7 @@ class ContentUserGateway implements EventSubscriberInterface
foreach ($requestHeaders as $headerName => $headerValue) {
$headers[$this->fixHeaderCase($headerName)] = implode('; ', $headerValue);
}
+ $headers['Url'] = $request->getPathInfo();
return new Message($headers, $request->getContent());
}
|
Added 'Url' expected header to ContentUserGateway Message
Some REST Input Parsers expect an Url as a header, that gets
mapped to __url in the message by the ParsingDispatcher.
The Gateway wasn't setting this index.
|
diff --git a/lib/knapsack/presenter.rb b/lib/knapsack/presenter.rb
index <HASH>..<HASH> 100644
--- a/lib/knapsack/presenter.rb
+++ b/lib/knapsack/presenter.rb
@@ -54,8 +54,7 @@ module Knapsack
Test on this CI node ran for longer than the max allowed node time execution.
Please regenerate your knapsack report.
-If that didn't help then split your slow test file into smaller test files
-or bump time_offset_in_seconds setting.
+If that doesn't help, you can split your slowest test files into smaller files, or bump up the time_offset_in_seconds setting.
You can also use knapsack_pro gem to automatically divide slow test files between parallel CI nodes.
https://knapsackpro.com/faq/question/how-to-auto-split-test-files-by-test-cases-on-parallel-jobs-ci-nodes?utm_source=knapsack_gem&utm_medium=knapsack_gem_output&utm_campaign=knapsack_gem_time_offset_warning
|
If that doesn't help, you can split your slowest test files into smaller files, or bump up the time_offset_in_seconds setting.
|
diff --git a/emoticons/__init__.py b/emoticons/__init__.py
index <HASH>..<HASH> 100644
--- a/emoticons/__init__.py
+++ b/emoticons/__init__.py
@@ -1,5 +1,5 @@
"""django-emoticons"""
-__version__ = '1.0.1'
+__version__ = '1.1'
__license__ = 'BSD License'
__author__ = 'Fantomas42'
|
Bumping to version <I>
|
diff --git a/caas/kubernetes/provider/bootstrap.go b/caas/kubernetes/provider/bootstrap.go
index <HASH>..<HASH> 100644
--- a/caas/kubernetes/provider/bootstrap.go
+++ b/caas/kubernetes/provider/bootstrap.go
@@ -72,7 +72,7 @@ var controllerServiceSpecs = map[string]*controllerServiceSpec{
ServiceType: core.ServiceTypeClusterIP,
},
caas.K8sCloudOpenStack: {
- ServiceType: core.ServiceTypeLoadBalancer, // TODO(caas): test and verify this.
+ ServiceType: core.ServiceTypeLoadBalancer,
},
caas.K8sCloudMAAS: {
ServiceType: core.ServiceTypeLoadBalancer, // TODO(caas): test and verify this.
|
Remove TODO because bootstrap to 8ks tested on openstack already
|
diff --git a/normalize-ice.js b/normalize-ice.js
index <HASH>..<HASH> 100644
--- a/normalize-ice.js
+++ b/normalize-ice.js
@@ -1,25 +1,20 @@
var detect = require('./detect');
-var match = require('./match');
var url = require('url');
-function useNewFormat() {
- return match('firefox') || match('chrome', '>=36');
-}
-
module.exports = function(server) {
var uri;
var auth;
// if we have a url parameter parse it
- if (server && server.url && useNewFormat()) {
+ if (server && server.url) {
uri = url.parse(server.url);
auth = (uri.auth || '').split(':');
return {
- url: uri.protocol + uri.host,
- urls: [ uri.protocol + uri.host ],
+ url: uri.protocol + uri.host + (uri.search || ''),
+ urls: [ uri.protocol + uri.host + (uri.search || '') ],
username: auth[0],
- credential: auth[1]
+ credential: server.credential || auth[1]
};
}
|
Preserve the query component of the ice server url
|
diff --git a/src/Multipart/index.js b/src/Multipart/index.js
index <HASH>..<HASH> 100644
--- a/src/Multipart/index.js
+++ b/src/Multipart/index.js
@@ -122,7 +122,7 @@ class Multipart {
/**
* No one wants to read this file, so simply advance it
*/
- if (!handler || !handler.callback) {
+ if (!handler || !handler.callback || !part.filename) {
return Promise.resolve()
}
|
fix(multipart): do not process file when filename is empty
|
diff --git a/quantecon/tests/test_mc_tools.py b/quantecon/tests/test_mc_tools.py
index <HASH>..<HASH> 100644
--- a/quantecon/tests/test_mc_tools.py
+++ b/quantecon/tests/test_mc_tools.py
@@ -106,6 +106,16 @@ def test_markovchain_pmatrices():
'period': 1,
'is_aperiodic': True,
},
+ # Reducible mc with a unique recurrent class,
+ # where n-1 is a transient state
+ {'P': np.array([[1, 0], [1, 0]]),
+ 'stationary_dists': np.array([[1, 0]]),
+ 'comm_classes': [np.array([0]), np.array([1])],
+ 'rec_classes': [np.array([0])],
+ 'is_irreducible': False,
+ 'period': 1,
+ 'is_aperiodic': True,
+ },
{'P': Q,
'stationary_dists': Q_stationary_dists,
'comm_classes': [np.array([0, 1]), np.array([2]), np.array([3, 4, 5])],
|
Add the same test case as in the Julia version
|
diff --git a/PgBulkInsert/pgbulkinsert-jpa/src/test/java/de/bytefish/pgbulkinsert/jpa/JpaMappingTests.java b/PgBulkInsert/pgbulkinsert-jpa/src/test/java/de/bytefish/pgbulkinsert/jpa/JpaMappingTests.java
index <HASH>..<HASH> 100644
--- a/PgBulkInsert/pgbulkinsert-jpa/src/test/java/de/bytefish/pgbulkinsert/jpa/JpaMappingTests.java
+++ b/PgBulkInsert/pgbulkinsert-jpa/src/test/java/de/bytefish/pgbulkinsert/jpa/JpaMappingTests.java
@@ -68,7 +68,7 @@ public class JpaMappingTests extends TransactionalTestBase {
}
@Test
- public void bulkInsertPersonDataTest() throws SQLException {
+ public void bulkImportSampleEntities() throws SQLException {
// Create a large list of People:
List<SampleEntity> personList = getSampleEntityList(100000);
// Create the JpaMapping:
|
Issue #<I> Rename Copy and Pasted Method
|
diff --git a/geomdl/linalg.py b/geomdl/linalg.py
index <HASH>..<HASH> 100644
--- a/geomdl/linalg.py
+++ b/geomdl/linalg.py
@@ -339,6 +339,19 @@ def point_mid(pt1, pt2):
return point_translate(pt1, half_dist_vector)
+@lru_cache(maxsize=os.environ['GEOMDL_CACHE_SIZE'] if "GEOMDL_CACHE_SIZE" in os.environ else 16)
+def matrix_identity(n):
+ """ Generates a NxN identity matrix.
+
+ :param n: size of the matrix
+ :type n: int
+ :return: identity matrix
+ :rtype: list
+ """
+ imat = [[1.0 if i == j else 0.0 for i in range(n)] for j in range(n)]
+ return imat
+
+
def matrix_transpose(m):
""" Transposes the input matrix.
|
Initial commit of matrix_identitiy
|
diff --git a/packages/browser/test/integration/common/init.js b/packages/browser/test/integration/common/init.js
index <HASH>..<HASH> 100644
--- a/packages/browser/test/integration/common/init.js
+++ b/packages/browser/test/integration/common/init.js
@@ -43,7 +43,7 @@ function initSDK() {
// One of the tests use manually created breadcrumb without eventId and we want to let it through
if (
- breadcrumb.category.indexOf("sentry" === 0) &&
+ breadcrumb.category.indexOf("sentry") === 0 &&
breadcrumb.event_id &&
!window.allowSentryBreadcrumbs
) {
|
fix: Act on allowSentryBreadcrumbs when appropriate (#<I>)
The included test, to check for a breadcrumb category starting with "sentry", was improperly written.
|
diff --git a/angr/sim_type.py b/angr/sim_type.py
index <HASH>..<HASH> 100644
--- a/angr/sim_type.py
+++ b/angr/sim_type.py
@@ -35,6 +35,8 @@ class SimType:
return False
for attr in self._fields:
+ if attr == 'size' and self._arch is None and other._arch is None:
+ continue
if getattr(self, attr) != getattr(other, attr):
return False
@@ -96,7 +98,7 @@ class SimType:
class SimTypeBottom(SimType):
"""
- SimTypeBottom basically repesents a type error.
+ SimTypeBottom basically represents a type error.
"""
def __repr__(self):
|
SimType: Do not crash during comparison if _arch is not set.
|
diff --git a/src/master/master.js b/src/master/master.js
index <HASH>..<HASH> 100644
--- a/src/master/master.js
+++ b/src/master/master.js
@@ -83,6 +83,18 @@ export const isActionFromAuthenticPlayer = (
};
/**
+ * Remove player credentials from action payload
+ */
+const stripCredentialsFromAction = action => {
+ if ('payload' in action && 'credentials' in action.payload) {
+ // eslint-disable-next-line no-unused-vars
+ const { credentials, ...payload } = action.payload;
+ action = { ...action, payload };
+ }
+ return action;
+};
+
+/**
* Master
*
* Class that runs the game and maintains the authoritative state.
@@ -136,6 +148,8 @@ export class Master {
return { error: 'unauthorized action' };
}
+ action = stripCredentialsFromAction(action);
+
const key = gameID;
let state;
|
fix(master): Remove credentials from action payloads after use (#<I>)
Credentials are only used to check if an action is authorized in the
master and should not then be passed on to the reducer etc.
This contributes towards #<I>, because now credentials should not leak
beyond the `Master.onUpdate` method and won’t end up for example in the
game log.
|
diff --git a/salt/modules/zypper.py b/salt/modules/zypper.py
index <HASH>..<HASH> 100644
--- a/salt/modules/zypper.py
+++ b/salt/modules/zypper.py
@@ -1166,8 +1166,10 @@ def install(name=None,
# Handle packages which report multiple new versions
# (affects only kernel packages at this point)
- for pkg in new:
- new[pkg] = new[pkg].split(',')[-1]
+ for pkg_name in new:
+ pkg_data = new[pkg_name]
+ if isinstance(pkg_data, str):
+ new[pkg_name] = pkg_data.split(',')[-1]
ret = salt.utils.compare_dicts(old, new)
|
Bugfix: handle multi-version package upgrades
|
diff --git a/patroni/__init__.py b/patroni/__init__.py
index <HASH>..<HASH> 100644
--- a/patroni/__init__.py
+++ b/patroni/__init__.py
@@ -30,7 +30,7 @@ class Patroni:
return Etcd(name, config['etcd'])
if 'zookeeper' in config:
return ZooKeeper(name, config['zookeeper'])
- raise Exception('Can not find sutable configuration of distributed configuration store')
+ raise Exception('Can not find suitable configuration of distributed configuration store')
def schedule_next_run(self):
self.next_run += self.nap_time
|
Fixed a typo in the error message.
|
diff --git a/private_storage/fields.py b/private_storage/fields.py
index <HASH>..<HASH> 100644
--- a/private_storage/fields.py
+++ b/private_storage/fields.py
@@ -85,9 +85,6 @@ class PrivateFileField(models.FileField):
# Support list, so joining can be done in a storage-specific manner.
path_parts.extend([self.storage.get_valid_name(dir) for dir in extra_dirs])
- if not path_parts:
- path_parts = [self.get_directory_name()]
-
path_parts.append(self._get_clean_filename(filename))
if django.VERSION >= (1, 10):
filename = posixpath.join(*path_parts)
|
Fixed Django <I> compatibility in the new generate_filename()
|
diff --git a/lib/conceptql/database.rb b/lib/conceptql/database.rb
index <HASH>..<HASH> 100644
--- a/lib/conceptql/database.rb
+++ b/lib/conceptql/database.rb
@@ -2,7 +2,7 @@ require 'facets/hash/revalue'
module ConceptQL
class Database
- attr :db
+ attr :db, :opts
def initialize(db, opts={})
@db = db
@@ -15,6 +15,7 @@ module ConceptQL
@opts = opts.revalue { |v| v ? v.to_sym : v }
@opts[:data_model] ||= :omopv4
@opts[:database_type] ||= db_type
+ @opts[:impala_mem_limit] ||= ENV['IMPALA_MEM_LIMIT'] if ENV['IMPALA_MEM_LIMIT']
end
def query(statement, opts={})
diff --git a/lib/conceptql/scope.rb b/lib/conceptql/scope.rb
index <HASH>..<HASH> 100644
--- a/lib/conceptql/scope.rb
+++ b/lib/conceptql/scope.rb
@@ -171,7 +171,7 @@ module ConceptQL
end
def mem_limit
- opts[:impala_mem_limit] || ENV['IMPALA_MEM_LIMIT']
+ opts[:impala_mem_limit]
end
end
end
|
Database#opts exposes options set on database
Also set MEM_LIMIT from environment variable in Database
|
diff --git a/actionview/lib/action_view/helpers/cache_helper.rb b/actionview/lib/action_view/helpers/cache_helper.rb
index <HASH>..<HASH> 100644
--- a/actionview/lib/action_view/helpers/cache_helper.rb
+++ b/actionview/lib/action_view/helpers/cache_helper.rb
@@ -241,8 +241,6 @@ module ActionView
end
def write_fragment_for(name, options)
- # VIEW TODO: Make #capture usable outside of ERB
- # This dance is needed because Builder can't use capture
pos = output_buffer.length
yield
output_safe = output_buffer.html_safe?
|
Remove unnecessary comments in cache_helper.rb [ci skip]
|
diff --git a/tests/unit/components/sl-menu-test.js b/tests/unit/components/sl-menu-test.js
index <HASH>..<HASH> 100755
--- a/tests/unit/components/sl-menu-test.js
+++ b/tests/unit/components/sl-menu-test.js
@@ -588,12 +588,12 @@ test( 'Stream action "hideAll" triggers hideAll()', function( assert ) {
items: testItems,
stream: mockStream
});
- const doActionSpy = sinon.spy( component, 'doAction' );
+ const hideAllSpy = sinon.spy( component, 'hideAll' );
- mockStream.actions[ 'doAction' ]();
+ mockStream.actions[ 'hideAll' ]();
assert.ok(
- doActionSpy.called,
- 'doAction method was called'
+ hideAllSpy.called,
+ 'hideAll method was called'
);
});
|
Closes softlayer/sl-ember-components#<I>
|
diff --git a/src/trumbowyg.js b/src/trumbowyg.js
index <HASH>..<HASH> 100644
--- a/src/trumbowyg.js
+++ b/src/trumbowyg.js
@@ -205,7 +205,6 @@ jQuery.trumbowyg = {
'|', 'btnGrp-lists',
'|', 'horizontalRule',
'|', 'removeformat',
-
'fullscreen'
],
btnsAdd: [],
@@ -299,7 +298,7 @@ jQuery.trumbowyg = {
tag: 'right'
},
justifyFull: {
- tag: 'jusitfy'
+ tag: 'justify'
},
unorderedList: {
@@ -800,6 +799,8 @@ jQuery.trumbowyg = {
);
}
+ t.$ed.off('dblclick', 'img');
+
t.$box.remove();
t.$c.removeData('trumbowyg');
$('body').removeClass(prefix + 'body-fullscreen');
|
fix: fix some typos on justify
|
diff --git a/packages/Sidenav/src/index.js b/packages/Sidenav/src/index.js
index <HASH>..<HASH> 100644
--- a/packages/Sidenav/src/index.js
+++ b/packages/Sidenav/src/index.js
@@ -45,6 +45,10 @@ const Overlay = styled.div`
export class Sidenav extends Component {
componentDidMount() {
+ if (this.props.opened && !this.props.permanent) {
+ document.body.style.overflow = 'hidden'
+ }
+
document.addEventListener('keydown', this.handleKeyDown)
}
|
:bug: Fixed small bug about scrolling
|
diff --git a/lib/graphql/schema/member/build_type.rb b/lib/graphql/schema/member/build_type.rb
index <HASH>..<HASH> 100644
--- a/lib/graphql/schema/member/build_type.rb
+++ b/lib/graphql/schema/member/build_type.rb
@@ -109,8 +109,8 @@ module GraphQL
return string unless string.include?("_")
camelized = string.split('_').map(&:capitalize).join
camelized[0] = camelized[0].downcase
- if string.start_with?("__")
- camelized = "__#{camelized}"
+ if (match_data = string.match(/\A(_+)/))
+ camelized = "#{match_data[0]}#{camelized}"
end
camelized
end
|
fix: when camelizing a string that starts with `_`, keep them
|
diff --git a/lib/searchkick/query.rb b/lib/searchkick/query.rb
index <HASH>..<HASH> 100644
--- a/lib/searchkick/query.rb
+++ b/lib/searchkick/query.rb
@@ -132,21 +132,23 @@ module Searchkick
pp options
puts
- puts "Model Search Data"
- begin
- pp klass.first(3).map { |r| {index: searchkick_index.record_data(r).merge(data: searchkick_index.send(:search_data, r))}}
- rescue => e
- puts "#{e.class.name}: #{e.message}"
- end
- puts
+ if searchkick_index
+ puts "Model Search Data"
+ begin
+ pp klass.first(3).map { |r| {index: searchkick_index.record_data(r).merge(data: searchkick_index.send(:search_data, r))}}
+ rescue => e
+ puts "#{e.class.name}: #{e.message}"
+ end
+ puts
- puts "Elasticsearch Mapping"
- puts JSON.pretty_generate(searchkick_index.mapping)
- puts
+ puts "Elasticsearch Mapping"
+ puts JSON.pretty_generate(searchkick_index.mapping)
+ puts
- puts "Elasticsearch Settings"
- puts JSON.pretty_generate(searchkick_index.settings)
- puts
+ puts "Elasticsearch Settings"
+ puts JSON.pretty_generate(searchkick_index.settings)
+ puts
+ end
puts "Elasticsearch Query"
puts to_curl
|
Fixed debug option with multiple models - #<I> [skip ci]
|
diff --git a/alot/db.py b/alot/db.py
index <HASH>..<HASH> 100644
--- a/alot/db.py
+++ b/alot/db.py
@@ -300,6 +300,17 @@ class Thread(object):
"""returns id of this thread"""
return self._id
+ def has_tag(self, tag):
+ """
+ Checks whether this thread is tagged with the given tag.
+
+ :param tag: tag to check
+ :type tag: string
+ :returns: True if this thread is tagged with the given tag, False otherwise.
+ :rtype: bool
+ """
+ return (tag in self._tags)
+
def get_tags(self):
"""
returns tagsstrings attached to this thread
|
Add helper to check mail thread for tag
This commit adds a method to Thread that allows to check whether the thread is
tagged with a given tag.
|
diff --git a/client/blocks/google-my-business-stats-nudge/index.js b/client/blocks/google-my-business-stats-nudge/index.js
index <HASH>..<HASH> 100644
--- a/client/blocks/google-my-business-stats-nudge/index.js
+++ b/client/blocks/google-my-business-stats-nudge/index.js
@@ -37,7 +37,7 @@ class GoogleMyBusinessStatsNudge extends Component {
};
componentDidMount() {
- if ( ! this.props.isDismissed ) {
+ if ( this.isVisible() ) {
this.props.recordTracksEvent( 'calypso_google_my_business_stats_nudge_view' );
}
}
@@ -51,8 +51,12 @@ class GoogleMyBusinessStatsNudge extends Component {
this.props.recordTracksEvent( 'calypso_google_my_business_stats_nudge_start_now_button_click' );
};
+ isVisible() {
+ return ! this.props.isDismissed && this.props.visible;
+ }
+
render() {
- if ( this.props.isDismissed || ! this.props.visible ) {
+ if ( ! this.isVisible() ) {
return null;
}
|
Make sure the calypso_google_my_business_stats_nudge_view event is only triggered when the nudge is visible
|
diff --git a/spyderlib/config.py b/spyderlib/config.py
index <HASH>..<HASH> 100644
--- a/spyderlib/config.py
+++ b/spyderlib/config.py
@@ -136,7 +136,7 @@ DEFAULTS = [
('console',
{
'shortcut': "Ctrl+Shift+C",
- 'max_line_count': 300,
+ 'max_line_count': 10000,
'font/family': MONOSPACE,
'font/size': MEDIUM,
'font/italic': False,
|
Console: increased default maximum line count (buffer depth) up to <I>,<I> lines (instead of only <I> lines)
|
diff --git a/src/main/java/org/sql2o/ResultSetIterator.java b/src/main/java/org/sql2o/ResultSetIterator.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/sql2o/ResultSetIterator.java
+++ b/src/main/java/org/sql2o/ResultSetIterator.java
@@ -92,12 +92,12 @@ public class ResultSetIterator<T> implements Iterator<T> {
try {
if (rs.next()) {
- // if we have a converter for this type, we want executeScalar with straight conversion
- if (this.converter != null) {
+ // if we have a converter and are selecting 1 column, we want executeScalar
+ if (this.converter != null && meta.getColumnCount() == 1) {
return (T)converter.convert(ResultSetUtils.getRSVal(rs, 1));
}
- // otherwise we want executeList with object mapping
+ // otherwise we want executeAndFetch with object mapping
Pojo pojo = new Pojo(metadata, isCaseSensitive);
for(int colIdx = 1; colIdx <= meta.getColumnCount(); colIdx++) {
|
only executeScalar if selecting one column
|
diff --git a/src/engine/sequencer.js b/src/engine/sequencer.js
index <HASH>..<HASH> 100644
--- a/src/engine/sequencer.js
+++ b/src/engine/sequencer.js
@@ -166,4 +166,14 @@ Sequencer.prototype.proceedThread = function (thread) {
}
};
+/**
+ * Retire a thread in the middle, without considering further blocks.
+ * @param {!Thread} thread Thread object to retire.
+ */
+Sequencer.prototype.retireThread = function (thread) {
+ thread.stack = [];
+ thread.stackFrame = [];
+ thread.setStatus(Thread.STATUS_DONE);
+};
+
module.exports = Sequencer;
|
Add `retireThread` to seqeuencer
|
diff --git a/Source/com/drew/imaging/tiff/TiffReader.java b/Source/com/drew/imaging/tiff/TiffReader.java
index <HASH>..<HASH> 100644
--- a/Source/com/drew/imaging/tiff/TiffReader.java
+++ b/Source/com/drew/imaging/tiff/TiffReader.java
@@ -135,6 +135,7 @@ public class TiffReader
//
// Handle each tag in this directory
//
+ int invalidTiffFormatCodeCount = 0;
for (int tagNumber = 0; tagNumber < dirTagCount; tagNumber++) {
final int tagOffset = calculateTagOffset(ifdOffset, tagNumber);
@@ -149,7 +150,12 @@ public class TiffReader
// This error suggests that we are processing at an incorrect index and will generate
// rubbish until we go out of bounds (which may be a while). Exit now.
handler.error("Invalid TIFF tag format code: " + formatCode);
- return;
+ // TODO specify threshold as a parameter, or provide some other external control over this behaviour
+ if (++invalidTiffFormatCodeCount > 5) {
+ handler.error("Stopping processing as too many errors seen in TIFF IFD");
+ return;
+ }
+ continue;
}
// 4 bytes dictate the number of components in this tag's data
|
Don't stop processing TIFF tags when encountering an invalid tag type.
In some cases it _may_ be possible to continue reading tags. The entries
are fixed width, so it's possible to jump directly to the next one,
having stored an error.
However if we have 'left' the IFD (or perhaps were not in one all along)
then we might happily produce hundreds of garbage tags. This implementation
tracks the number of such errors and stops after some threshold.
Relates to #<I>.
|
diff --git a/upload/admin/controller/sale/order.php b/upload/admin/controller/sale/order.php
index <HASH>..<HASH> 100644
--- a/upload/admin/controller/sale/order.php
+++ b/upload/admin/controller/sale/order.php
@@ -1765,7 +1765,7 @@ class ControllerSaleOrder extends Controller {
$products = $this->model_sale_order->getOrderProducts($order_id);
foreach ($products as $product) {
- $option_weight = '';
+ $option_weight = 0;
$product_info = $this->model_catalog_product->getProduct($product['product_id']);
|
Update order.php
it should be numberric
|
diff --git a/class/StateMachine/FlupdoGenericListing.php b/class/StateMachine/FlupdoGenericListing.php
index <HASH>..<HASH> 100644
--- a/class/StateMachine/FlupdoGenericListing.php
+++ b/class/StateMachine/FlupdoGenericListing.php
@@ -252,7 +252,7 @@ class FlupdoGenericListing implements IListing
} else {
// Check if operator is the last character of filter name
$operator = substr($property, -1);
- if (!preg_match('/^([^><!%~:]+)([><!%~:]+)$/', $property, $m)) {
+ if (!preg_match('/^([^><!%~:?]+)([><!%~:?]+)$/', $property, $m)) {
continue;
}
list(, $property, $operator) = $m;
@@ -278,6 +278,9 @@ class FlupdoGenericListing implements IListing
case '!':
$this->query->where("$p != ?", $value);
break;
+ case '?':
+ $this->query->where($value ? "$p IS NOT NULL" : "$p IS NULL");
+ break;
case ':':
if (is_array($value)) {
if (isset($value['min']) && isset($value['max'])) {
|
Add `IS NULL` filter
|
diff --git a/pyneuroml/analysis/NML2ChannelAnalysis.py b/pyneuroml/analysis/NML2ChannelAnalysis.py
index <HASH>..<HASH> 100644
--- a/pyneuroml/analysis/NML2ChannelAnalysis.py
+++ b/pyneuroml/analysis/NML2ChannelAnalysis.py
@@ -327,7 +327,7 @@ def process_channel_file(channel_file,a):
results = run_lems_file(new_lems_file,a.v)
if a.iv_curve:
- iv_data = compute_iv_curve(channel,(a.clamp_delay + a.clamp_duration),results)
+ iv_data = compute_iv_curve(channel,a,results)
else:
iv_data = None
@@ -466,11 +466,12 @@ def make_overview_dir():
return overview_dir
-def compute_iv_curve(channel,end_time_ms,results,grid=True):
+def compute_iv_curve(channel, a, results, grid=True):
# Based on work by Rayner Lucas here:
# https://github.com/openworm/
# BlueBrainProjectShowcase/blob/master/
- # Channelpedia/iv_analyse.py
+ # Channelpedia/iv_analyse.py
+ end_time_ms = (a.clamp_delay + a.clamp_duration)
dat_path = os.path.join(OUTPUT_DIR,
'%s.i_*.lems.dat' % channel.id)
file_names = glob.glob(dat_path)
|
Pass entire namespace to plotting function since other attributes besides the end time of the voltage pulse might be used in the future
|
diff --git a/server.js b/server.js
index <HASH>..<HASH> 100644
--- a/server.js
+++ b/server.js
@@ -195,7 +195,7 @@ function parseSummonerFactory(res) {
var temp;
var $ = cheerio.load(game);
game = {};
- game.type = stripNewLines($('.subType').contents().eq(0).text()).slice(0,-2);
+ game.type = stripNewLines($('.subType').contents().eq(0).text());
game.date = stripNewLines($('._timeago').data('data-datetime'));
game.mmr = parseInt(stripNewLines($('.mmr').text()).substring(11));
@@ -238,6 +238,7 @@ function parseSummonerFactory(res) {
var item = {};
item.name = stripNewLines($('.item32').attr('title'));
+ if (item.name) item.name = item.name.substring(item.name.indexOf(">")+1, item.name.indexOf('</b>'));
item.image = $('.item32 .img').css('display');
item.slot = j+1;
items.push(item);
|
Fixed item name and game type returns in summoner
|
diff --git a/lib/iron_mq/client.rb b/lib/iron_mq/client.rb
index <HASH>..<HASH> 100644
--- a/lib/iron_mq/client.rb
+++ b/lib/iron_mq/client.rb
@@ -1,9 +1,18 @@
+require 'yaml'
+
require 'iron_core'
module IronMQ
- # FIXME: read real version
+ @@version = nil
+
def self.version
- '2.0.0'
+ if @@version.nil?
+ v = YAML.load(File.read(File.dirname(__FILE__) + '/../../VERSION.yml'))
+ $stderr.puts v.inspect
+ @@version = [v[:major].to_s, v[:minor].to_s, v[:patch].to_s].join('.')
+ end
+
+ @@version
end
class Client < IronCore::Client
|
Porting to iron_core - version reading.
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.