diff stringlengths 65 26.7k | message stringlengths 7 9.92k |
|---|---|
diff --git a/checks.py b/checks.py
index <HASH>..<HASH> 100644
--- a/checks.py
+++ b/checks.py
@@ -424,7 +424,9 @@ def check_main_entries_in_the_name_table(fb, font, fullpath):
FAMILY_WITH_SPACES_EXCEPTIONS = {'VT323': 'VT323',
'PressStart2P': 'Press Start 2P',
'AmaticSC': 'Amatic SC',
- 'AmaticaSC': 'Amatica SC'}
+ 'AmaticaSC': 'Amatica SC',
+ 'PatrickHandSC': 'Patrick Hand SC',
+ 'CormorantSC': 'Cormorant SC'}
if value in FAMILY_WITH_SPACES_EXCEPTIONS.keys():
return FAMILY_WITH_SPACES_EXCEPTIONS[value]
result = '' | add a few more exceptions to name table rules, such as:
Cormorant SC, Amatica SC, etc...
(issue #<I>) |
diff --git a/treeherder/model/models.py b/treeherder/model/models.py
index <HASH>..<HASH> 100644
--- a/treeherder/model/models.py
+++ b/treeherder/model/models.py
@@ -815,8 +815,9 @@ class JobNote(models.Model):
return
for bug_number in add_bugs:
- classification, _ = text_log_error.set_classification("ManualDetector",
- bug_number=bug_number)
+ classification, _ = ClassifiedFailure.objects.get_or_create(bug_number=bug_number)
+ classification, _ = text_log_error.set_classification("ManualDetector", classification)
+
if len(add_bugs) == 1 and not existing_bugs:
text_log_error.mark_best_classification_verified(classification)
@@ -1193,13 +1194,9 @@ class TextLogError(models.Model):
.first())
@transaction.atomic
- def set_classification(self, matcher_name, classification=None, bug_number=None):
+ def set_classification(self, matcher_name, classification):
if classification is None:
- if bug_number:
- classification, _ = ClassifiedFailure.objects.get_or_create(
- bug_number=bug_number)
- else:
- classification = ClassifiedFailure.objects.create()
+ classification = ClassifiedFailure.objects.create()
match = TextLogErrorMatch.objects.create(
text_log_error=self, | Create ClassifiedFailures from bugs only where necessary
Since ClassifiedFailures are only created from a bug number in one place
we can make set_classification more specific by pulling that
functionality out to where the bug numbers are handled. |
diff --git a/client/lxd_cluster.go b/client/lxd_cluster.go
index <HASH>..<HASH> 100644
--- a/client/lxd_cluster.go
+++ b/client/lxd_cluster.go
@@ -55,7 +55,7 @@ func (r *ProtocolLXD) DeleteClusterMember(name string, force bool) error {
params += "?force=1"
}
- _, err := r.queryStruct("DELETE", fmt.Sprintf("/cluster/members/%s%s", name, params), nil, "", nil)
+ _, _, err := r.query("DELETE", fmt.Sprintf("/cluster/members/%s%s", name, params), nil, "")
if err != nil {
return err
} | client/lxd/cluster: No reason to use queryStruct in DeleteClusterMember |
diff --git a/xwiki-commons-core/xwiki-commons-xml/src/main/java/org/htmlcleaner/XWikiDOMSerializer.java b/xwiki-commons-core/xwiki-commons-xml/src/main/java/org/htmlcleaner/XWikiDOMSerializer.java
index <HASH>..<HASH> 100644
--- a/xwiki-commons-core/xwiki-commons-xml/src/main/java/org/htmlcleaner/XWikiDOMSerializer.java
+++ b/xwiki-commons-core/xwiki-commons-xml/src/main/java/org/htmlcleaner/XWikiDOMSerializer.java
@@ -136,7 +136,7 @@ public class XWikiDOMSerializer
// While the qualified name is "HTML" for some DocTypes, we want the actual document root name to be "html".
// See bug #116
//
- if (qualifiedName.equals("HTML")) {
+ if ("HTML".equals(qualifiedName)) {
qualifiedName = HTML_TAG_NAME;
}
document = impl.createDocument(rootNode.getNamespaceURIOnPath(""), qualifiedName, documentType); | [Misc] Move the "HTML" string literal on the left side of string comparison |
diff --git a/spec/aws/signers/version_4_spec.rb b/spec/aws/signers/version_4_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/aws/signers/version_4_spec.rb
+++ b/spec/aws/signers/version_4_spec.rb
@@ -25,7 +25,9 @@ module Aws
let(:signer) { Version4.new(credentials, service_name, region) }
let(:sign) { signer.sign(http_request) }
let(:http_request) do
- Seahorse::Client::Http::Request.new(endpoint: endpoint)
+ req = Seahorse::Client::Http::Request.new(endpoint: endpoint)
+ req.headers.delete('User-Agent')
+ req
end
context '#sign' do | Removing the user-agent from the sigv4 spec headers.
The default user-agent now contains a Seahorse::VERSION which changes
over time. To prevent the tests from breaking with each update of
Seahorse, I opted to delete them from the headers hash instead. |
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ setup(
package_dir={'': 'src'},
install_requires=[
"pyop >= 3.0.1",
- "pysaml2",
+ "pysaml2 >= 5.0.0",
"pycryptodomex",
"requests",
"PyYAML", | Set minimum pysaml2 version
PySAML2 had a recent vulnerability report. Setting the minimum version
to the fixed release will make sure we always get a safe version.
See, CVE-<I>-<I> on XML Signature Wrapping (XSW) vulnerability. |
diff --git a/tests/utils/tasks/test_check_task.py b/tests/utils/tasks/test_check_task.py
index <HASH>..<HASH> 100644
--- a/tests/utils/tasks/test_check_task.py
+++ b/tests/utils/tasks/test_check_task.py
@@ -18,7 +18,7 @@ def test_utils_retry_task(mock_requests_get, mock_check_task):
mock_check_task.side_effect = ValueError
with pytest.raises(SpinnakerTaskInconclusiveError):
check_task(taskid, timeout=2, wait=1)
- assert mock_check_task.call_count == 2
+ assert mock_check_task.call_count == 2
@mock.patch('foremast.utils.tasks.requests') | tests: Asserts outside the exception context |
diff --git a/runtests.py b/runtests.py
index <HASH>..<HASH> 100644
--- a/runtests.py
+++ b/runtests.py
@@ -24,10 +24,11 @@ def runtests():
"threads",
"events",
"managers",
+ "farnswiki",
"workshift",
"elections",
"rooms",
- ])
+ ])
sys.exit(bool(failures))
if __name__ == "__main__": | Added farnswiki to list of modules |
diff --git a/runtests.py b/runtests.py
index <HASH>..<HASH> 100755
--- a/runtests.py
+++ b/runtests.py
@@ -23,7 +23,11 @@ def run_django_tests():
from django.conf import settings
if not settings.configured:
settings.configure(
- DATABASE_ENGINE='sqlite3',
+ DATABASES={
+ 'default': {
+ 'ENGINE': 'django.db.backends.sqlite3',
+ },
+ },
SITE_ID=1,
INSTALLED_APPS=[
'django.contrib.auth',
@@ -40,11 +44,12 @@ def run_django_tests():
settings.MICAWBER_PROVIDERS = providers
settings.MICAWBER_TEMPLATE_EXTENSIONS = extensions
- from django.test.simple import run_tests
+ from django.test.simple import DjangoTestSuiteRunner
parent = os.path.dirname(os.path.abspath(__file__))
sys.path.insert(0, parent)
- return run_tests(['mcdjango_tests'], verbosity=1, interactive=True)
-
+ return DjangoTestSuiteRunner(
+ verbosity=1, interactive=True).run_tests(['mcdjango_tests'])
+
def runtests(*test_args):
print "Running micawber tests" | Update runtests.py for Django <I> compatibility. |
diff --git a/webpack.js b/webpack.js
index <HASH>..<HASH> 100644
--- a/webpack.js
+++ b/webpack.js
@@ -57,11 +57,16 @@ module.exports = function makeConfig(config) {
delete cfg.jquery;
}
+ const babelPolyfillEntry = 'babel-polyfill';
const webpackEntry = 'webpack-hot-middleware/client';
- const entry = _.isArray(cfg.entry) ? [webpackEntry].concat(cfg.entry) : [
- webpackEntry,
- _.isString(cfg.entry) ? cfg.entry : './src/index',
- ];
+ const appEntry = () => {
+ if (_.isArray(cfg.entry)) {
+ return cfg.entry;
+ }
+ return _.isString(cfg.entry) ? cfg.entry : './src/index';
+ };
+ const entry = [babelPolyfillEntry, webpackEntry].concat(appEntry());
+
if (cfg.entry) {
delete cfg.entry;
} | add babel-polyfill to entry points |
diff --git a/Sniffs/PHP/RemovedExtensionsSniff.php b/Sniffs/PHP/RemovedExtensionsSniff.php
index <HASH>..<HASH> 100644
--- a/Sniffs/PHP/RemovedExtensionsSniff.php
+++ b/Sniffs/PHP/RemovedExtensionsSniff.php
@@ -382,13 +382,17 @@ class PHPCompatibility_Sniffs_PHP_RemovedExtensionsSniff extends PHPCompatibilit
if (strpos(strtolower($tokens[$stackPtr]['content']), strtolower($extension)) === 0) {
$error = '';
$isErrored = false;
+ $isDeprecated = false;
foreach ($versionList as $version => $status) {
if ($version != 'alternative') {
if ($status == -1 || $status == 0) {
if ($this->supportsAbove($version)) {
switch ($status) {
case -1:
- $error .= 'deprecated since PHP ' . $version . ' and ';
+ if($isDeprecated === false ) {
+ $error .= 'deprecated since PHP ' . $version . ' and ';
+ $isDeprecated = true;
+ }
break;
case 0:
$isErrored = true; | Fix duplicate deprecated message.
If an extension was deprecated for a number of version, the message would say for instance _"Extension 'mysql_' is *deprecated since PHP <I> and deprecated since PHP <I>* and removed since PHP <I> - use mysqli instead."_
This PR removes the duplication of the deprecation notice from the message. |
diff --git a/core/src/main/java/hudson/model/UpdateSite.java b/core/src/main/java/hudson/model/UpdateSite.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/hudson/model/UpdateSite.java
+++ b/core/src/main/java/hudson/model/UpdateSite.java
@@ -1049,11 +1049,12 @@ public class UpdateSite {
/**
* Returns true if the plugin and its dependencies are fully compatible with the current installation
- * This is set to restricted for now, since it is only being used by Jenkins UI at the moment.
+ * This is set to restricted for now, since it is only being used by Jenkins UI or Restful API at the moment.
*
* @since 2.175
*/
@Restricted(NoExternalUse.class)
+ @Exported
public boolean isCompatible() {
return isCompatible(new PluginManager.MetadataCache());
}
@@ -1136,7 +1137,7 @@ public class UpdateSite {
return deps;
}
-
+
public boolean isForNewerHudson() {
try {
return requiredCore!=null && new VersionNumber(requiredCore).isNewerThan( | Export whether plugin update is compatible (#<I>)
* Export if plugin update is compatible
* Remove the erorr usage of Exported annoation
* Remove unclear export annotation |
diff --git a/spec/standalone_migrations_spec.rb b/spec/standalone_migrations_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/standalone_migrations_spec.rb
+++ b/spec/standalone_migrations_spec.rb
@@ -87,6 +87,7 @@ end
end
before do
+ StandaloneMigrations::Configurator.instance_variable_set(:@env_config, nil)
`rm -rf spec/tmp` if File.exist?('spec/tmp')
`mkdir spec/tmp`
write_rakefile
@@ -98,6 +99,9 @@ development:
test:
adapter: sqlite3
database: db/test.sql
+production:
+ adapter: sqlite3
+ database: db/production.sql
TXT
end
@@ -121,7 +125,7 @@ test:
describe 'callbacks' do
it 'runs the callbacks' do
- expect(StandaloneMigrations::Tasks).to receive(:configure)
+ expect(StandaloneMigrations::Tasks).to receive(:configure).and_call_original
connection_established = false
expect(ActiveRecord::Base).to receive(:establish_connection) do | Unset class level config var in specs and allow configure to rerun to
pick up production config block |
diff --git a/tests/test_content.py b/tests/test_content.py
index <HASH>..<HASH> 100644
--- a/tests/test_content.py
+++ b/tests/test_content.py
@@ -271,7 +271,7 @@ class MockTestEndpoint(object):
self.td_error = td_error
self.found_tiers = []
- def _tier_test(self, err, xpi):
+ def _tier_test(self, err, xpi, name):
"A simulated test case for tier errors"
print "Generating subpackage tier error..."
self.found_tiers.append(err.tier)
diff --git a/validator/testcases/content.py b/validator/testcases/content.py
index <HASH>..<HASH> 100644
--- a/validator/testcases/content.py
+++ b/validator/testcases/content.py
@@ -146,7 +146,7 @@ def test_packed_packages(err, xpi_package=None):
# There are no expected types for packages within a multi-
# item package.
- testendpoint_validator.test_package(err, name)
+ testendpoint_validator.test_package(err, package, name)
package.close()
err.pop_state() | Fix for content problem caused by merge. FML. |
diff --git a/system/modules/generalDriver/DcGeneral/DataDefinition/AbstractConditionChain.php b/system/modules/generalDriver/DcGeneral/DataDefinition/AbstractConditionChain.php
index <HASH>..<HASH> 100644
--- a/system/modules/generalDriver/DcGeneral/DataDefinition/AbstractConditionChain.php
+++ b/system/modules/generalDriver/DcGeneral/DataDefinition/AbstractConditionChain.php
@@ -141,9 +141,11 @@ abstract class AbstractConditionChain implements ConditionChainInterface
public function __clone()
{
$conditions = array();
- foreach ($conditions as $index => $condition)
+ foreach ($this->conditions as $condition)
{
- $conditions[$index] = clone $condition;
+ $bobaFett = clone $condition;
+
+ $conditions[spl_object_hash($bobaFett)] = $bobaFett;
}
$this->conditions = $conditions;
} | Bugfix: correctly clone sub conditions in condition chains. |
diff --git a/docs/scripts/phenomic.browser.js b/docs/scripts/phenomic.browser.js
index <HASH>..<HASH> 100644
--- a/docs/scripts/phenomic.browser.js
+++ b/docs/scripts/phenomic.browser.js
@@ -10,7 +10,7 @@ import store from "../src/store.js"
import phenomicClient from "phenomic/lib/client"
phenomicClient({ metadata, routes, store })
-// md files processed via phenomic-loader to JSON && generate collection
+// md files processed via phenomic-loader to JSON & generate collection
let mdContext = require.context("../content", true, /\.md$/)
mdContext.keys().forEach(mdContext)
@@ -25,6 +25,7 @@ if (module.hot) {
mdContext.keys().forEach(requireUpdate)
})
+ // hot load app
module.hot.accept(
[ "../src/metadata.js", "../src/routes.js", "../src/store.js" ],
() => phenomicClient({ metadata, routes, store }) | Sync comment of docs/phenomic.browser with base theme |
diff --git a/nion/swift/FacadeQueued.py b/nion/swift/FacadeQueued.py
index <HASH>..<HASH> 100644
--- a/nion/swift/FacadeQueued.py
+++ b/nion/swift/FacadeQueued.py
@@ -2,6 +2,7 @@ import threading
all_classes = {
+ "API",
"Application",
"DataGroup",
"DataItem", | Fix Facade method calls on API. |
diff --git a/shared/base/collection.js b/shared/base/collection.js
index <HASH>..<HASH> 100644
--- a/shared/base/collection.js
+++ b/shared/base/collection.js
@@ -12,6 +12,8 @@ if (!isServer) {
var BaseCollection = Super.extend({
model: BaseModel,
+ params: undefined,
+ meta: undefined,
/**
* Provide the ability to set default params for every 'fetch' call. | creating undefined attribuets for params and meta. this is a performance tweak that effects every instance of a collection. |
diff --git a/apollo-api-impl/src/main/java/com/spotify/apollo/request/TrackedOngoingRequestImpl.java b/apollo-api-impl/src/main/java/com/spotify/apollo/request/TrackedOngoingRequestImpl.java
index <HASH>..<HASH> 100644
--- a/apollo-api-impl/src/main/java/com/spotify/apollo/request/TrackedOngoingRequestImpl.java
+++ b/apollo-api-impl/src/main/java/com/spotify/apollo/request/TrackedOngoingRequestImpl.java
@@ -45,10 +45,7 @@ class TrackedOngoingRequestImpl
if (removed) {
super.reply(message);
}
- // TODO: how to log this?
-// else {
-// logRequest("DROPPED");
-// }
+
return removed;
}
} | remove comment about logging dropped requests
It's the job of the delegate OngoingRequest implementation to log in an
appropriate way when the message is dropped |
diff --git a/source/BrowserAgentInfosByDanielGP.php b/source/BrowserAgentInfosByDanielGP.php
index <HASH>..<HASH> 100644
--- a/source/BrowserAgentInfosByDanielGP.php
+++ b/source/BrowserAgentInfosByDanielGP.php
@@ -157,7 +157,7 @@ trait BrowserAgentInfosByDanielGP
$userAgent = $_SERVER['HTTP_USER_AGENT'];
}
$dd = new \DeviceDetector\DeviceDetector($userAgent);
- $dd->setCache(new \Doctrine\Common\Cache\PhpFileCache(ini_get('upload_tmp_dir') . 'DoctrineCache/'));
+ $dd->setCache(new \Doctrine\Common\Cache\PhpFileCache('../tmp/DoctrineCache/'));
$dd->discardBotInformation();
$dd->parse();
if ($dd->isBot()) { | local temporary folder for Doctrine Cache to be able to use it in shared hosting environments |
diff --git a/pkg/kubectl/resource_printer.go b/pkg/kubectl/resource_printer.go
index <HASH>..<HASH> 100644
--- a/pkg/kubectl/resource_printer.go
+++ b/pkg/kubectl/resource_printer.go
@@ -109,6 +109,9 @@ func NewVersionedPrinter(printer ResourcePrinter, convertor runtime.ObjectConver
// PrintObj implements ResourcePrinter
func (p *VersionedPrinter) PrintObj(obj runtime.Object, w io.Writer) error {
+ if len(p.version) == 0 {
+ return fmt.Errorf("no version specified, object cannot be converted")
+ }
converted, err := p.convertor.ConvertToVersion(obj, p.version)
if err != nil {
return err | Prevent internal conversion in the printer directly (as per implicit contract) |
diff --git a/source/class/qx/tool/cli/commands/Compile.js b/source/class/qx/tool/cli/commands/Compile.js
index <HASH>..<HASH> 100644
--- a/source/class/qx/tool/cli/commands/Compile.js
+++ b/source/class/qx/tool/cli/commands/Compile.js
@@ -43,6 +43,10 @@ qx.Class.define("qx.tool.cli.commands.Compile", {
requiresArg: true,
type: "string"
},
+ "output-path-prefix": {
+ describe: "Sets a prefix for the output path of the target - used to compile a version into a non-standard directory",
+ type: "string"
+ },
"download": {
alias: "d",
describe: "Whether to automatically download missing libraries",
@@ -642,6 +646,9 @@ qx.Class.define("qx.tool.cli.commands.Compile", {
}
var outputPath = targetConfig.outputPath;
+ if (this.argv.outputPathPrefix) {
+ outputPath = path.join(this.argv.outputPathPrefix, outputPath);
+ }
if (!outputPath) {
throw new qx.tool.utils.Utils.UserError("Missing output-path for target " + targetConfig.type);
} | adds `--output-path-prefix` to `qx compile` (needed for deployment) (#<I>)
* adds `--output-path-prefix` to `qx compile` (needed for deployment)
* lint
Thanks @johnspackman ! |
diff --git a/condorpy/htcondor_object_base.py b/condorpy/htcondor_object_base.py
index <HASH>..<HASH> 100644
--- a/condorpy/htcondor_object_base.py
+++ b/condorpy/htcondor_object_base.py
@@ -56,7 +56,7 @@ class HTCondorObjectBase(object):
@property
def num_jobs(self):
- return 0
+ return 1
@property
def scheduler(self): | Default num_jobs to 1 instead of 0. |
diff --git a/charmhelpers/contrib/network/ip.py b/charmhelpers/contrib/network/ip.py
index <HASH>..<HASH> 100644
--- a/charmhelpers/contrib/network/ip.py
+++ b/charmhelpers/contrib/network/ip.py
@@ -405,10 +405,10 @@ def is_ip(address):
Returns True if address is a valid IP address.
"""
try:
- # Test to see if already an IPv4 address
- socket.inet_aton(address)
+ # Test to see if already an IPv4/IPv6 address
+ address = netaddr.IPAddress(address)
return True
- except socket.error:
+ except netaddr.AddrFormatError:
return False
diff --git a/tests/contrib/network/test_ip.py b/tests/contrib/network/test_ip.py
index <HASH>..<HASH> 100644
--- a/tests/contrib/network/test_ip.py
+++ b/tests/contrib/network/test_ip.py
@@ -590,6 +590,7 @@ class IPTest(unittest.TestCase):
def test_is_ip(self):
self.assertTrue(net_ip.is_ip('10.0.0.1'))
+ self.assertTrue(net_ip.is_ip('2001:db8:1:0:2918:3444:852:5b8a'))
self.assertFalse(net_ip.is_ip('www.ubuntu.com'))
@patch('charmhelpers.contrib.network.ip.apt_install') | Ensure is_ip detects IPv4 and IPv6 addresses
Switch underlying implementation to use netaddr to detect both
types of IP address, rather than inet_aton which only supports
IPv4. |
diff --git a/server.js b/server.js
index <HASH>..<HASH> 100644
--- a/server.js
+++ b/server.js
@@ -839,8 +839,9 @@ cache(function(data, match, sendBadge, request) {
}
}
}
-
- badgeText = unstableVersion;
+
+ var vdata = versionColor(unstableVersion);
+ badgeText = vdata.version;
badgeColor = 'orange';
}
break; | Packagist unstable version display & cleanup
Part of #<I> |
diff --git a/gwpy/plotter/timeseries.py b/gwpy/plotter/timeseries.py
index <HASH>..<HASH> 100644
--- a/gwpy/plotter/timeseries.py
+++ b/gwpy/plotter/timeseries.py
@@ -451,14 +451,12 @@ class TimeSeriesPlot(Plot):
"'bottom'.")
segax = divider.append_axes(location, height, pad=pad,
axes_class=SegmentAxes, sharex=ax)
- segax.set_xscale(ax.get_xscale())
+ segax.set_xlim(*ax.get_xlim())
+ segax.set_xlabel(ax.get_xlabel())
+ ax.set_xlabel("")
- # plot segments and set axes properties
+ # plot segments
segax.plot(segments, **plotargs)
segax.grid(b=False, which='both', axis='y')
segax.autoscale(axis='y', tight=True)
- # set ticks and label
- segax.set_xlabel(ax.get_xlabel())
- ax.set_xlabel("")
- segax.set_xlim(*ax.get_xlim())
return segax | TimeSeriesPlot.add_state_segments: simplified segax scaling
new axes inherits scaling and limits from the original data axes, so we don't need to set_epoch or set_xscale |
diff --git a/src/peltak/commands/test.py b/src/peltak/commands/test.py
index <HASH>..<HASH> 100644
--- a/src/peltak/commands/test.py
+++ b/src/peltak/commands/test.py
@@ -9,11 +9,6 @@ from . import cli, click
@cli.command()
@click.argument('tests_type', metavar='<type>', type=str, default='default')
@click.option(
- '--no-sugar',
- is_flag=True,
- help="Disable py-test sugar."
-)
-@click.option(
'-v', '--verbose',
count=True,
help=("Be verbose. Can specify multiple times for more verbosity. This "
@@ -48,8 +43,7 @@ from . import cli, click
"will be enabled.")
)
def test(
- tests_type, no_sugar, verbose, junit, no_locals,
- no_coverage, plugins, allow_empty
+ tests_type, verbose, junit, no_locals, no_coverage, plugins, allow_empty
):
""" Run tests against the current python version.
@@ -138,9 +132,6 @@ def test(
elif django_settings is not None:
args += ['--ds {}'.format(django_settings)]
- if no_sugar:
- args += ['-p no:sugar']
-
if verbose >= 1:
args += ['-v']
if verbose >= 2: | Remove —no-sugar option
The same can be achieved with —plugins=-sugar |
diff --git a/src/Pool.php b/src/Pool.php
index <HASH>..<HASH> 100644
--- a/src/Pool.php
+++ b/src/Pool.php
@@ -50,9 +50,6 @@ class Pool implements PromisorInterface
$opts = [];
}
- // Add a delay by default to ensure resolving on future tick.
- $opts['delay'] = true;
-
$iterable = \GuzzleHttp\Promise\iter_for($requests);
$requests = function () use ($iterable, $client, $opts) {
foreach ($iterable as $rfn) { | Delay of true is no longer necessary |
diff --git a/Kwc/Directories/List/ViewMap/MarkersController.php b/Kwc/Directories/List/ViewMap/MarkersController.php
index <HASH>..<HASH> 100644
--- a/Kwc/Directories/List/ViewMap/MarkersController.php
+++ b/Kwc/Directories/List/ViewMap/MarkersController.php
@@ -76,4 +76,9 @@ class Kwc_Directories_List_ViewMap_MarkersController extends Kwf_Controller_Acti
protected function _validateSessionToken()
{
}
+
+ protected function _isAllowedComponent()
+ {
+ return true;
+ }
} | MapView: Controller has to be public for frontend |
diff --git a/src/main/resources/execute_asciidoctor.rb b/src/main/resources/execute_asciidoctor.rb
index <HASH>..<HASH> 100644
--- a/src/main/resources/execute_asciidoctor.rb
+++ b/src/main/resources/execute_asciidoctor.rb
@@ -1,9 +1,9 @@
+require 'bundler/setup'
require 'asciidoctor'
-require 'find'
-Find.find($srcDir) do |path|
+Dir.glob("#{$srcDir}/**/*.a*").each do |path|
if path =~ /.*\.a((sc(iidoc)?)|d(oc)?)$/
- Asciidoctor.render_file({path, :in_place => true, :safe => Asciidoctor::SafeMode::UNSAFE,
- :base_dir => $srcDir, :backend => $backend})
+ Asciidoctor.render_file(path, {:in_place => false, :safe => Asciidoctor::SafeMode::UNSAFE,
+ :attributes => {'backend' => $backend}, :to_dir => $outputDir})
end
end | Updating to the new <I> and bundler |
diff --git a/src/main/java/com/smbtec/xo/tinkerpop/blueprints/impl/TinkerPopPropertyManager.java b/src/main/java/com/smbtec/xo/tinkerpop/blueprints/impl/TinkerPopPropertyManager.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/smbtec/xo/tinkerpop/blueprints/impl/TinkerPopPropertyManager.java
+++ b/src/main/java/com/smbtec/xo/tinkerpop/blueprints/impl/TinkerPopPropertyManager.java
@@ -110,6 +110,7 @@ public class TinkerPopPropertyManager implements DatastorePropertyManager<Vertex
@Override
public Iterable<Edge> getRelations(final Vertex source, final RelationTypeMetadata<EdgeMetadata> metadata, final RelationTypeMetadata.Direction direction) {
+ final String label = metadata.getDatastoreMetadata().getDiscriminator();
VertexQuery query = source.query();
switch (direction) {
case TO:
@@ -121,7 +122,7 @@ public class TinkerPopPropertyManager implements DatastorePropertyManager<Vertex
default:
throw new XOException("Unknown direction '" + direction.name() + "'.");
}
- return query.edges();
+ return query.labels(label).edges();
}
@Override | - only return edges with the given label |
diff --git a/superset/__init__.py b/superset/__init__.py
index <HASH>..<HASH> 100644
--- a/superset/__init__.py
+++ b/superset/__init__.py
@@ -195,13 +195,14 @@ if not issubclass(custom_sm, SupersetSecurityManager):
not FAB's security manager.
See [4565] in UPDATING.md""")
-appbuilder = AppBuilder(
- app,
- db.session,
- base_template='superset/base.html',
- indexview=MyIndexView,
- security_manager_class=custom_sm,
-)
+with app.app_context():
+ appbuilder = AppBuilder(
+ app,
+ db.session,
+ base_template='superset/base.html',
+ indexview=MyIndexView,
+ security_manager_class=custom_sm,
+ )
security_manager = appbuilder.sm | Quick fix to address deadlock issue (#<I>) |
diff --git a/src/Geometry/MultiPolygon.php b/src/Geometry/MultiPolygon.php
index <HASH>..<HASH> 100644
--- a/src/Geometry/MultiPolygon.php
+++ b/src/Geometry/MultiPolygon.php
@@ -29,5 +29,10 @@
return $points;
}
+
+ public function add(Polygon $polygon)
+ {
+ $this->coordinates[] = $polygon;
+ }
}
?> | Include add method in Geometry\MultiPolygon
Adds new Polygons |
diff --git a/packages/ember/tests/acceptance/sentry-performance-test.js b/packages/ember/tests/acceptance/sentry-performance-test.js
index <HASH>..<HASH> 100644
--- a/packages/ember/tests/acceptance/sentry-performance-test.js
+++ b/packages/ember/tests/acceptance/sentry-performance-test.js
@@ -23,7 +23,11 @@ function assertSentryCall(assert, callNumber, options) {
}
if (options.spans) {
assert.deepEqual(
- event.spans.map(s => `${s.op} | ${s.description}`),
+ event.spans.map(s => {
+ // Normalize span descriptions for internal components so tests work on either side of updated Ember versions
+ const normalizedDescription = s.description === 'component:-link-to' ? 'component:link-to' : s.description;
+ return `${s.op} | ${normalizedDescription}`;
+ }),
options.spans,
`Has correct spans`,
); | ref(ember): Fix tests to be forward compatible with component changes (#<I>)
* ref(ember): Fix tests to be forward compatible with component changes
One of the frameworks provided components, link-to, had a change to it's internal name. It's not really relevant to the test, so normalizing the description should work across the version changes. |
diff --git a/tasks/version-check-grunt.js b/tasks/version-check-grunt.js
index <HASH>..<HASH> 100644
--- a/tasks/version-check-grunt.js
+++ b/tasks/version-check-grunt.js
@@ -59,7 +59,7 @@ function bowerCallback(dependency) {
callback(null, _.merge({
latest : latest,
- upToDate : semver.satisfies(latest, version)
+ upToDate : semver.satisfies(latest, dependency.version)
}, dependency));
});
};
@@ -74,7 +74,7 @@ function npmCallback(dependency) {
callback(null, _.merge({
latest : latest,
- upToDate : semver.satisfies(latest, version)
+ upToDate : semver.satisfies(latest, dependency.version)
}, dependency));
});
}; | Fixed issue introduced by code refactoring. |
diff --git a/pandas/core/nanops.py b/pandas/core/nanops.py
index <HASH>..<HASH> 100644
--- a/pandas/core/nanops.py
+++ b/pandas/core/nanops.py
@@ -12,7 +12,10 @@ except ImportError: # pragma: no cover
_USE_BOTTLENECK = False
def _bottleneck_switch(bn_name, alt, **kwargs):
- bn_func = getattr(bn, bn_name)
+ try:
+ bn_func = getattr(bn, bn_name)
+ except NameError:
+ bn_func = None
def f(values, axis=None, skipna=True):
try:
if _USE_BOTTLENECK and skipna: | BUG: wrap getting bottleneck function in try/catch, GH #<I> |
diff --git a/src/dawguk/GarminConnect.php b/src/dawguk/GarminConnect.php
index <HASH>..<HASH> 100755
--- a/src/dawguk/GarminConnect.php
+++ b/src/dawguk/GarminConnect.php
@@ -89,7 +89,7 @@ class GarminConnect {
* @return bool
*/
private function checkCookieAuth($strUsername) {
- if (strlen($this->getUsername()) == 0 || $strUsername != $this->getUsername()) {
+ if (strlen($this->getUsername()) == 0) {
$this->objConnector->clearCookie();
return FALSE;
} else { | - Removed username check, as the username != the email address! |
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
@@ -8,7 +8,6 @@ Bundler.require(:development)
SimpleCov.start
-require 'pulse_meter_core'
require 'pulse_meter_cli'
PulseMeter.redis = MockRedis.new | removed unneccessary require |
diff --git a/src/rest/APIRouter.js b/src/rest/APIRouter.js
index <HASH>..<HASH> 100644
--- a/src/rest/APIRouter.js
+++ b/src/rest/APIRouter.js
@@ -22,6 +22,7 @@ function buildRoute(manager) {
versioned: manager.versioned,
route: route.map((r, i) => {
if (/\d{16,19}/g.test(r)) return /channels|guilds/.test(route[i - 1]) ? r : ':id';
+ if (route[i - 1] === 'reactions') return ':reaction';
return r;
}).join('/'),
}, options)).catch(error => {
diff --git a/src/rest/RequestHandler.js b/src/rest/RequestHandler.js
index <HASH>..<HASH> 100644
--- a/src/rest/RequestHandler.js
+++ b/src/rest/RequestHandler.js
@@ -131,7 +131,7 @@ class RequestHandler {
// https://github.com/discordapp/discord-api-docs/issues/182
if (item.request.route.includes('reactions')) {
- this.reset = Date.now() + getAPIOffset(serverDate) + 250;
+ this.reset = new Date(serverDate).getTime() - getAPIOffset(serverDate) + 250;
}
} | fix: reactions ratelimits (#<I>)
* each reaction doesn't have it's own ratelimit
* fix hard-coded reset for reacting |
diff --git a/src/components/AuthRoute.js b/src/components/AuthRoute.js
index <HASH>..<HASH> 100644
--- a/src/components/AuthRoute.js
+++ b/src/components/AuthRoute.js
@@ -51,6 +51,11 @@ class AuthRoute extends React.Component<AuthRouteDefaultProps, AuthRouteProps, A
this.state = {
user: null,
};
+ }
+
+ state: AuthRouteState;
+
+ componentDidMount() {
AuthUtils.getLoggedInUserInfo((userInfo: any) => {
this.setState({
user: userInfo,
@@ -58,8 +63,6 @@ class AuthRoute extends React.Component<AuthRouteDefaultProps, AuthRouteProps, A
});
}
- state: AuthRouteState;
-
render() {
// If the user is logged in and has permission for this
// route, then just render the route. | PLAT-<I>: Move the call to the did mount method to avoid waring about setting state in contructor |
diff --git a/lib/fastlane/actions/actions_helper.rb b/lib/fastlane/actions/actions_helper.rb
index <HASH>..<HASH> 100644
--- a/lib/fastlane/actions/actions_helper.rb
+++ b/lib/fastlane/actions/actions_helper.rb
@@ -30,6 +30,8 @@ module Fastlane
# Is the required gem installed on the current machine
def self.gem_available?(name)
+ return true if Helper.is_test?
+
Gem::Specification.find_by_name(name)
rescue Gem::LoadError
false
diff --git a/lib/fastlane/actions/deliver.rb b/lib/fastlane/actions/deliver.rb
index <HASH>..<HASH> 100644
--- a/lib/fastlane/actions/deliver.rb
+++ b/lib/fastlane/actions/deliver.rb
@@ -1,8 +1,15 @@
module Fastlane
module Actions
def self.deliver(params)
+ need_gem!'deliver'
+
+ require 'deliver'
ENV["DELIVER_SCREENSHOTS_PATH"] = self.snapshot_screenshots_folder
- sh "deliver --force"
+
+ force = false
+ force = true if params.first == :force
+
+ Deliver::Deliverer.new(Deliver::Deliverfile::Deliverfile::FILE_NAME, force: force)
end
end
end
\ No newline at end of file | Added native deliver integratoin with :force flag |
diff --git a/ArgusCore/src/main/java/com/salesforce/dva/argus/service/monitor/DataLagMonitor.java b/ArgusCore/src/main/java/com/salesforce/dva/argus/service/monitor/DataLagMonitor.java
index <HASH>..<HASH> 100644
--- a/ArgusCore/src/main/java/com/salesforce/dva/argus/service/monitor/DataLagMonitor.java
+++ b/ArgusCore/src/main/java/com/salesforce/dva/argus/service/monitor/DataLagMonitor.java
@@ -66,7 +66,10 @@ public class DataLagMonitor extends Thread{
Metric currMetric = metrics.get(0);
if(currMetric.getDatapoints()==null || currMetric.getDatapoints().size()==0) {
_logger.info("Data lag detected as data point list is empty");
- isDataLagging=true;
+ if(!isDataLagging) {
+ isDataLagging=true;
+ sendDataLagEmailNotification();
+ }
continue;
}else {
long lastDataPointTime = 0L; | Made a change to send email notification in case of data lag |
diff --git a/plugin/forward/fuzz.go b/plugin/forward/fuzz.go
index <HASH>..<HASH> 100644
--- a/plugin/forward/fuzz.go
+++ b/plugin/forward/fuzz.go
@@ -16,8 +16,8 @@ var f *Forward
func init() {
f = New()
s := dnstest.NewServer(r{}.reflectHandler)
- f.proxies = append(f.proxies, NewProxy(s.Addr, "tcp"))
- f.proxies = append(f.proxies, NewProxy(s.Addr, "udp"))
+ f.SetProxy(NewProxy(s.Addr, "tcp"))
+ f.SetProxy(NewProxy(s.Addr, "udp"))
}
// Fuzz fuzzes forward. | Fix plugin forward fuzz target (#<I>)
using new method to start proxies |
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -14,11 +14,17 @@ ESLine configuration is below. Here is what the numbers mean:
module.exports = (function createParser () {
var xpath = require('xpath')
- var jsdom = require('jsdom').jsdom
+ var jsdom = require('jsdom')
var xmlser = require('xmlserializer')
var dom = require('xmldom').DOMParser
var transformations = require('./transformations')
+ jsdom.defaultDocumentFeatures = {
+ FetchExternalResources: false,
+ ProcessExternalResources: false,
+ MutationEvents: false
+ }
+
return {
parse: parse
}
@@ -32,7 +38,7 @@ module.exports = (function createParser () {
transformations[attrname] = externalTransformations[attrname]
}
- var document = jsdom(html.toString())
+ var document = jsdom.jsdom(html.toString())
var xhtml = xmlser.serializeToString(document)
xhtml = xhtml.replace(' xmlns="http://www.w3.org/1999/xhtml"', '') // Ugly hack, for now
var doc = new dom().parseFromString(xhtml) | Prevent running scripts or loading external resources |
diff --git a/bigquery/tests/unit/test_table.py b/bigquery/tests/unit/test_table.py
index <HASH>..<HASH> 100644
--- a/bigquery/tests/unit/test_table.py
+++ b/bigquery/tests/unit/test_table.py
@@ -124,7 +124,9 @@ class TestTable(unittest.TestCase, _SchemaBase):
if 'view' in resource:
self.assertEqual(table.view_query, resource['view']['query'])
- self.assertEqual(table.view_use_legacy_sql, resource['view'].get('useLegacySql'))
+ self.assertEqual(
+ table.view_use_legacy_sql,
+ resource['view'].get('useLegacySql'))
else:
self.assertIsNone(table.view_query)
self.assertIsNone(table.view_use_legacy_sql) | Fixing "long line" lint violation in BigQuery unit tests. (#<I>) |
diff --git a/PheanstalkProducer.php b/PheanstalkProducer.php
index <HASH>..<HASH> 100644
--- a/PheanstalkProducer.php
+++ b/PheanstalkProducer.php
@@ -7,6 +7,7 @@ namespace Enqueue\Pheanstalk;
use Interop\Queue\Destination;
use Interop\Queue\Exception\InvalidDestinationException;
use Interop\Queue\Exception\InvalidMessageException;
+use Interop\Queue\Exception\PriorityNotSupportedException;
use Interop\Queue\Message;
use Interop\Queue\Producer;
use Pheanstalk\Pheanstalk;
@@ -75,7 +76,7 @@ class PheanstalkProducer implements Producer
return $this;
}
- throw new \LogicException('Not implemented');
+ throw PriorityNotSupportedException::providerDoestNotSupportIt();
}
public function getPriority(): ?int | Fix wrong exceptions in transports
The `setPriority` method have to throw a PriorityNotSupportedException
if the feature is not supported. |
diff --git a/manifest.php b/manifest.php
index <HASH>..<HASH> 100755
--- a/manifest.php
+++ b/manifest.php
@@ -54,7 +54,7 @@ return array(
'label' => 'TAO Base',
'description' => 'TAO meta-extension',
'license' => 'GPL-2.0',
- 'version' => '40.6.0',
+ 'version' => '40.6.1',
'author' => 'Open Assessment Technologies, CRP Henri Tudor',
'requires' => array(
'generis' => '>=12.5.0',
diff --git a/scripts/update/Updater.php b/scripts/update/Updater.php
index <HASH>..<HASH> 100755
--- a/scripts/update/Updater.php
+++ b/scripts/update/Updater.php
@@ -1288,6 +1288,6 @@ class Updater extends \common_ext_ExtensionUpdater {
$this->setVersion('40.3.4');
}
- $this->skip('40.3.4', '40.6.0');
+ $this->skip('40.3.4', '40.6.1');
}
} | Bumped tao-core version |
diff --git a/teslajsonpy/controller.py b/teslajsonpy/controller.py
index <HASH>..<HASH> 100644
--- a/teslajsonpy/controller.py
+++ b/teslajsonpy/controller.py
@@ -256,7 +256,7 @@ class Controller:
)
if not result:
if retries < 5:
- await asyncio.sleep(sleep_delay ** (retries + 2))
+ await asyncio.sleep(15 + sleep_delay ** (retries + 2))
retries += 1
continue
inst.car_online[inst._id_to_vin(car_id)] = False
@@ -272,7 +272,7 @@ class Controller:
kwargs,
)
while not valid_result(result):
- await asyncio.sleep(sleep_delay ** (retries + 1))
+ await asyncio.sleep(15 + sleep_delay ** (retries + 1))
try:
result = await func(*args, **kwargs)
_LOGGER.debug( | fix: increase minimum retry delay to <I> seconds |
diff --git a/lib/napybara/version.rb b/lib/napybara/version.rb
index <HASH>..<HASH> 100644
--- a/lib/napybara/version.rb
+++ b/lib/napybara/version.rb
@@ -1,3 +1,3 @@
module Napybara
- VERSION = "0.4.1"
+ VERSION = "0.5.0"
end | Bump to <I>. |
diff --git a/lib/types/AbstractBuilder.js b/lib/types/AbstractBuilder.js
index <HASH>..<HASH> 100644
--- a/lib/types/AbstractBuilder.js
+++ b/lib/types/AbstractBuilder.js
@@ -154,7 +154,8 @@ class AbstractBuilder {
this.taskLog.addWork(allTasksCount);
let taskChain = Promise.resolve();
- for (const taskName in this.tasks) {
+ for (let i = 0; i < this.taskExecutionOrder.length; i++) {
+ const taskName = this.taskExecutionOrder[i];
if (this.tasks.hasOwnProperty(taskName) && tasksToRun.includes(taskName)) {
const taskFunction = this.tasks[taskName]; | [INTERNAL] AbstractBuilder: Obey given task execution order |
diff --git a/tests/unit/modules/test_cmdmod.py b/tests/unit/modules/test_cmdmod.py
index <HASH>..<HASH> 100644
--- a/tests/unit/modules/test_cmdmod.py
+++ b/tests/unit/modules/test_cmdmod.py
@@ -324,7 +324,8 @@ class CMDMODTestCase(TestCase, LoaderModuleMockMixin):
self.assertEqual(environment, environment2)
- getpwnam_mock.assert_called_with('foobar')
+ if not salt.utils.platform.is_darwin():
+ getpwnam_mock.assert_called_with('foobar')
def test_run_cwd_doesnt_exist_issue_7154(self):
''' | skip getpwnam check on mac in unit test_cmdmod |
diff --git a/src/Column/Link.php b/src/Column/Link.php
index <HASH>..<HASH> 100644
--- a/src/Column/Link.php
+++ b/src/Column/Link.php
@@ -11,7 +11,11 @@ class Link extends Generic
public function __construct($page = [])
{
- $this->page = $page[0];
+ if (!is_array($page)) {
+ $this->page = $page;
+ } elseif (isset($page[0]) {
+ $this->page = $page[0];
+ }
}
/** | constructor now supports passing page as string |
diff --git a/tests/test_wrappers.py b/tests/test_wrappers.py
index <HASH>..<HASH> 100644
--- a/tests/test_wrappers.py
+++ b/tests/test_wrappers.py
@@ -489,3 +489,7 @@ def test_storage_classes():
assert type(req.cookies) is ImmutableTypeConversionDict
assert req.cookies == {'foo': 'bar'}
assert type(req.access_route) is ImmutableList
+
+ MyRequest.list_storage_class = tuple
+ req = Request.from_values()
+ assert type(req.access_route) is tuple | Added another boring test case to test the buildbot. |
diff --git a/upload/system/library/cart.php b/upload/system/library/cart.php
index <HASH>..<HASH> 100644
--- a/upload/system/library/cart.php
+++ b/upload/system/library/cart.php
@@ -309,16 +309,14 @@ class Cart {
}
public function add($product_id, $qty = 1, $option = array(), $profile_id = 0) {
- $key = (int)$product_id . ':';
-
- if ($option) {
- $key .= base64_encode(serialize($option)) . ':';
+ if (!$option) {
+ $key .= (int)$product_id;
} else {
- $key .= ':';
+ $key .= (int)$product_id . ':' . base64_encode(serialize($option));
}
if ($profile_id) {
- $key .= (int)$profile_id;
+ $key .= ':' . (int)$profile_id;
}
if ((int)$qty && ((int)$qty > 0)) { | updated James Allsup's poor coding choices |
diff --git a/src/Aimeos/Shop/ShopServiceProvider.php b/src/Aimeos/Shop/ShopServiceProvider.php
index <HASH>..<HASH> 100644
--- a/src/Aimeos/Shop/ShopServiceProvider.php
+++ b/src/Aimeos/Shop/ShopServiceProvider.php
@@ -44,11 +44,11 @@ class ShopServiceProvider extends ServiceProvider {
), 'migrations');
$this->publishes(array(
- $basedir.'views' => base_path('resources/views/vendor/aimeos/shop'),
+ $basedir.'views' => base_path('resources/views/vendor/shop'),
), 'views');
$this->publishes(array(
- dirname($basedir).DIRECTORY_SEPARATOR.'public' => public_path('packages/aimeos/shop'),
+ dirname($basedir).DIRECTORY_SEPARATOR.'public' => public_path('packages/shop'),
), 'public'); | Fixed paths for overwriting views and storing assets |
diff --git a/ncclient/operations/retrieve.py b/ncclient/operations/retrieve.py
index <HASH>..<HASH> 100644
--- a/ncclient/operations/retrieve.py
+++ b/ncclient/operations/retrieve.py
@@ -46,6 +46,15 @@ class GetReply(RPCReply):
"Same as :attr:`data_ele`"
+class GetSchemaReply(GetReply):
+ """Reply for GetSchema called with specific parsing hook."""
+
+ def _parsing_hook(self, root):
+ self._data = None
+ if not self._errors:
+ self._data = root.find(qualify("data", NETCONF_MONITORING_NS)).text
+
+
class Get(RPC):
"The *get* RPC."
@@ -91,7 +100,7 @@ class GetSchema(RPC):
"""The *get-schema* RPC."""
- REPLY_CLS = GetReply
+ REPLY_CLS = GetSchemaReply
"""See :class:`GetReply`."""
def request(self, identifier, version=None, format=None): | Use specific reply class for GetSchema
This correctly extracts the YANG model from the reply unlike the generic
GetReply class which uses the wrong namespace. |
diff --git a/lib/web/handlers.js b/lib/web/handlers.js
index <HASH>..<HASH> 100644
--- a/lib/web/handlers.js
+++ b/lib/web/handlers.js
@@ -168,6 +168,7 @@ StreamingHandlers.prototype.streamLog = function(socket, log) {
if (!summary.finished) {
self._dreadnot.emitter.on(logPath, emit);
self._dreadnot.emitter.once(endPath, function(success) {
+ self._dreadnot.emitter.removeListener(logPath, emit);
socket.emit(endPath, success);
});
} else { | don't send log messages after a deployment ends |
diff --git a/src/puzzle/AreaManager.js b/src/puzzle/AreaManager.js
index <HASH>..<HASH> 100644
--- a/src/puzzle/AreaManager.js
+++ b/src/puzzle/AreaManager.js
@@ -157,12 +157,12 @@ pzpr.classmgr.makeCommon({
// roommgr.setTopOfRoom_combine() 部屋が繋がったとき、部屋のTOPを設定する
//--------------------------------------------------------------------------------
setTopOfRoom_combine : function(cell1,cell2){
- if(!cell1.room || !cell2.room){ return;}
+ if(!cell1.room || !cell2.room || cell1.room===cell2.room){ return;}
var merged, keep;
var tcell1 = cell1.room.top;
var tcell2 = cell2.room.top;
- if(cell1.bx>cell2.bx || (cell1.bx===cell2.bx && cell1.id>cell2.id)){ merged = tcell1; keep = tcell2;}
- else { merged = tcell2; keep = tcell1;}
+ if(tcell1.bx>tcell2.bx || (tcell1.bx===tcell2.bx && tcell1.by>tcell2.by)){ merged = tcell1; keep = tcell2;}
+ else { merged = tcell2; keep = tcell1;}
// 消える部屋のほうの数字を消す
if(merged.isNum()){ | AreaRoomGraph: Fix number in rooms moves wrong when two rooms are merged |
diff --git a/moco-core/src/main/java/com/github/dreamhead/moco/MocoRecorders.java b/moco-core/src/main/java/com/github/dreamhead/moco/MocoRecorders.java
index <HASH>..<HASH> 100644
--- a/moco-core/src/main/java/com/github/dreamhead/moco/MocoRecorders.java
+++ b/moco-core/src/main/java/com/github/dreamhead/moco/MocoRecorders.java
@@ -4,10 +4,9 @@ import com.github.dreamhead.moco.recorder.DynamicRecordHandler;
import com.github.dreamhead.moco.recorder.DynamicReplayHandler;
import com.github.dreamhead.moco.recorder.RecorderConfig;
import com.github.dreamhead.moco.recorder.RecorderConfigurations;
-import com.github.dreamhead.moco.recorder.MocoGroup;
import com.github.dreamhead.moco.recorder.RecorderIdentifier;
-import com.github.dreamhead.moco.recorder.ReplayModifier;
import com.github.dreamhead.moco.recorder.RecorderTape;
+import com.github.dreamhead.moco.recorder.ReplayModifier;
import com.github.dreamhead.moco.resource.ContentResource;
import static com.github.dreamhead.moco.Moco.and; | removed unused import in moco recorders |
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -164,6 +164,7 @@ Phantasma.prototype.open = function (url) {
if(!self.page) return reject('tried to open before page created');
self.page.open(url, function (status) {
+ if (status === 'fail') return reject(status);
resolve(status);
});
}).timeout(this.options.timeout); | handle open failure from Phantom's Web Page Module |
diff --git a/lib/swag_dev/project/tools/yardoc/file.rb b/lib/swag_dev/project/tools/yardoc/file.rb
index <HASH>..<HASH> 100644
--- a/lib/swag_dev/project/tools/yardoc/file.rb
+++ b/lib/swag_dev/project/tools/yardoc/file.rb
@@ -37,7 +37,7 @@ class SwagDev::Project::Tools::Yardoc::File
@glob
end
- def to_s_
+ def to_s
filepath
end | yardoc/file (tools) typo |
diff --git a/src/Billable.php b/src/Billable.php
index <HASH>..<HASH> 100644
--- a/src/Billable.php
+++ b/src/Billable.php
@@ -758,7 +758,7 @@ trait Billable
*/
public function createAsStripeCustomer(array $options = [])
{
- if (! $this->hasStripeId()) {
+ if ($this->hasStripeId()) {
throw CustomerAlreadyCreated::exists($this);
} | Fix bug with createAsStripeCustomer |
diff --git a/public_header.go b/public_header.go
index <HASH>..<HASH> 100644
--- a/public_header.go
+++ b/public_header.go
@@ -157,14 +157,19 @@ func ParsePublicHeader(b *bytes.Reader, packetSentBy protocol.Perspective) (*Pub
}
if packetSentBy == protocol.PerspectiveServer && publicFlagByte&0x04 > 0 {
- header.DiversificationNonce = make([]byte, 32)
- for i := 0; i < 32; i++ {
- var val byte
- val, err = b.ReadByte()
- if err != nil {
- return nil, err
+ // TODO: remove the if once the Google servers send the correct value
+ // assume that a packet doesn't contain a diversification nonce if the version flag or the reset flag is set, no matter what the public flag says
+ // see https://github.com/lucas-clemente/quic-go/issues/232
+ if !header.VersionFlag && !header.ResetFlag {
+ header.DiversificationNonce = make([]byte, 32)
+ for i := 0; i < 32; i++ {
+ var val byte
+ val, err = b.ReadByte()
+ if err != nil {
+ return nil, err
+ }
+ header.DiversificationNonce[i] = val
}
- header.DiversificationNonce[i] = val
}
} | add workaround for incorrect public flag values sent by Google servers |
diff --git a/packages/ad/src/utils/ad-init.js b/packages/ad/src/utils/ad-init.js
index <HASH>..<HASH> 100644
--- a/packages/ad/src/utils/ad-init.js
+++ b/packages/ad/src/utils/ad-init.js
@@ -38,7 +38,7 @@ export default ({ el, data, platform, eventCallback, window }) => {
localInitCalled = true;
window.initCalled = true;
- if (!data.bidInitialiser) {
+ if ((!data.bidInitialiser && isWeb) || !isWeb) {
this.loadScripts();
} | fix: ad native (#<I>) |
diff --git a/build.go b/build.go
index <HASH>..<HASH> 100644
--- a/build.go
+++ b/build.go
@@ -6,7 +6,6 @@ import (
"log"
"os"
"os/exec"
- "path"
"strconv"
)
@@ -16,8 +15,6 @@ type packagesConf struct {
Dependencies map[string]string
}
-// TODO Fetches packages via package manager, puts them in the packages dir
-
func bootDependencies() {
// TODO Inspect for errors
content, err := ioutil.ReadFile("packages.json")
@@ -39,8 +36,9 @@ func bootDependencies() {
for name := range conf.Dependencies {
p := strconv.Itoa(port + i)
log.Println("booting package", name, p)
- pth := path.Join("packages", name, name)
- cmd := exec.Command(pth, "-port", p)
+ // NOTE assumes packages are installed with go install ./...,
+ // matching Heroku's Go buildpack
+ cmd := exec.Command(name, "-port", p)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
if err = cmd.Start(); err != nil { | Dependencies load identically across Heroku, dev |
diff --git a/services/visual_recognition/v3.js b/services/visual_recognition/v3.js
index <HASH>..<HASH> 100644
--- a/services/visual_recognition/v3.js
+++ b/services/visual_recognition/v3.js
@@ -87,8 +87,7 @@ module.exports = function(RED) {
var f = config['image-feature'];
- if (msg.params && msg.params.detect_mode)
- {
+ if (msg.params && msg.params.detect_mode) {
if (msg.params.detect_mode in theOptions) {
f = theOptions[msg.params.detect_mode];
} else { | Allowed Detect Mode to be set in msg.params for Visual Recognition Node |
diff --git a/presto-main/src/main/java/com/facebook/presto/operator/aggregation/FloatingPointBitsConverterUtil.java b/presto-main/src/main/java/com/facebook/presto/operator/aggregation/FloatingPointBitsConverterUtil.java
index <HASH>..<HASH> 100644
--- a/presto-main/src/main/java/com/facebook/presto/operator/aggregation/FloatingPointBitsConverterUtil.java
+++ b/presto-main/src/main/java/com/facebook/presto/operator/aggregation/FloatingPointBitsConverterUtil.java
@@ -23,7 +23,7 @@ final class FloatingPointBitsConverterUtil
*/
public static long doubleToSortableLong(double value)
{
- long bits = Double.doubleToRawLongBits(value);
+ long bits = Double.doubleToLongBits(value);
return bits ^ (bits >> 63) & Long.MAX_VALUE;
} | Discard double NaN differentiation while sorting
NaNs are not comparable (NaN != NaN) and Java's Double.compare(double, double) returns 0 for all NaN representations, thus differentiation between NaNs should be discarded for sorting purposes. |
diff --git a/manager/dispatcher/dispatcher.go b/manager/dispatcher/dispatcher.go
index <HASH>..<HASH> 100644
--- a/manager/dispatcher/dispatcher.go
+++ b/manager/dispatcher/dispatcher.go
@@ -676,16 +676,20 @@ func (d *Dispatcher) Session(r *api.SessionRequest, stream api.Dispatcher_Sessio
}
log := log.G(ctx).WithFields(fields)
- nodeUpdates, cancel := state.Watch(d.store.WatchQueue(),
- state.EventUpdateNode{Node: &api.Node{ID: nodeID},
- Checks: []state.NodeCheckFunc{state.NodeCheckID}},
- )
- defer cancel()
-
var nodeObj *api.Node
- d.store.View(func(readTx store.ReadTx) {
+ nodeUpdates, cancel, err := store.ViewAndWatch(d.store, func(readTx store.ReadTx) error {
nodeObj = store.GetNode(readTx, nodeID)
- })
+ return nil
+ }, state.EventUpdateNode{Node: &api.Node{ID: nodeID},
+ Checks: []state.NodeCheckFunc{state.NodeCheckID}},
+ )
+ if cancel != nil {
+ defer cancel()
+ }
+
+ if err != nil {
+ log.WithError(err).Error("ViewAndWatch Node failed")
+ }
if _, err = d.nodes.GetWithSession(nodeID, sessionID); err != nil {
return err | dispatcher: Use an atomic ViewAndWatch for Node in Session. |
diff --git a/src/de/mrapp/android/preference/activity/PreferenceFragment.java b/src/de/mrapp/android/preference/activity/PreferenceFragment.java
index <HASH>..<HASH> 100644
--- a/src/de/mrapp/android/preference/activity/PreferenceFragment.java
+++ b/src/de/mrapp/android/preference/activity/PreferenceFragment.java
@@ -26,7 +26,6 @@ import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.Preference;
import android.preference.PreferenceGroup;
-import android.preference.PreferenceManager;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
@@ -287,8 +286,8 @@ public class PreferenceFragment extends android.preference.PreferenceFragment {
* the fragment.
*/
public final void restoreDefaults() {
- SharedPreferences sharedPreferences = PreferenceManager
- .getDefaultSharedPreferences(getActivity());
+ SharedPreferences sharedPreferences = getPreferenceManager()
+ .getSharedPreferences();
restoreDefaults(getPreferenceScreen(), sharedPreferences);
} | Changed the way, the shared preferences are retrieved. |
diff --git a/holoviews/plotting/bokeh/element.py b/holoviews/plotting/bokeh/element.py
index <HASH>..<HASH> 100644
--- a/holoviews/plotting/bokeh/element.py
+++ b/holoviews/plotting/bokeh/element.py
@@ -1380,6 +1380,9 @@ class ElementPlot(BokehPlot, GenericElementPlot):
for cb in self.callbacks:
cb.initialize()
+ if self.top_level:
+ self.init_links()
+
if not self.overlaid:
self._set_active_tools(plot)
self._process_legend() | Initialize links on ElementPlot when it is top-level |
diff --git a/pkg/ipam/ipam.go b/pkg/ipam/ipam.go
index <HASH>..<HASH> 100644
--- a/pkg/ipam/ipam.go
+++ b/pkg/ipam/ipam.go
@@ -104,6 +104,12 @@ func (ipam *IPAM) reserveLocalRoutes() {
continue
}
+ // ignore black hole route
+ if r.Src == nil && r.Gw == nil {
+ log.WithField("route", r).Debugf("Ignoring route: black hole")
+ continue
+ }
+
log.WithField("route", logfields.Repr(r)).Debug("Considering route")
if allocRange.Contains(r.Dst.IP) { | 1: fix when have black hole route container pod CIDR can cause postIpAMFailure range is full |
diff --git a/src/compiler/parsing/wasm/decoder.js b/src/compiler/parsing/wasm/decoder.js
index <HASH>..<HASH> 100644
--- a/src/compiler/parsing/wasm/decoder.js
+++ b/src/compiler/parsing/wasm/decoder.js
@@ -500,6 +500,9 @@ export function decode(ab: ArrayBuffer, printDump: boolean = false): Program {
id = func.id;
signature = func.signature;
+ } else if (exportTypes[typeIndex] === "Table") {
+ console.warn("Unsupported export type table");
+ return;
} else if (exportTypes[typeIndex] === "Mem") {
const memNode = state.memoriesInModule[index];
@@ -517,7 +520,8 @@ export function decode(ab: ArrayBuffer, printDump: boolean = false): Program {
signature = null;
} else {
- throw new CompileError("Unsupported export type: " + toHex(typeIndex));
+ console.warn("Unsupported export type: " + toHex(typeIndex));
+ return;
}
state.elementsInExportSection.push({ | fix(wasm): don't panic for unsupported table export |
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/rules/RulePriority.java b/sonar-plugin-api/src/main/java/org/sonar/api/rules/RulePriority.java
index <HASH>..<HASH> 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/rules/RulePriority.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/rules/RulePriority.java
@@ -37,7 +37,9 @@ public enum RulePriority {
*
* @param level an old priority level : Error or Warning
* @return the corresponding RulePriority
+ * @deprecated in 3.6
*/
+ @Deprecated
public static RulePriority valueOfString(String level) {
try {
return RulePriority.valueOf(level.toUpperCase()); | Deprecate RulePriority#valueOfString() used for upgrading to sonar <I> !! |
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/OCommandExecutorSQLCreateProperty.java b/core/src/main/java/com/orientechnologies/orient/core/sql/OCommandExecutorSQLCreateProperty.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/sql/OCommandExecutorSQLCreateProperty.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/sql/OCommandExecutorSQLCreateProperty.java
@@ -106,9 +106,11 @@ public class OCommandExecutorSQLCreateProperty extends OCommandExecutorSQLAbstra
case EMBEDDED:
case EMBEDDEDMAP:
case EMBEDDEDLIST:
+ case EMBEDDEDSET:
case LINK:
case LINKMAP:
case LINKLIST:
+ case LINKSET:
// See if the parsed word is a keyword if it is not, then we assume it to
// be the linked type/class.
// TODO handle escaped strings. | Added LINKEDSET and EMBEDDEDSET as types with linked class/types. |
diff --git a/src/tests/testsFoundations/testsDag.py b/src/tests/testsFoundations/testsDag.py
index <HASH>..<HASH> 100644
--- a/src/tests/testsFoundations/testsDag.py
+++ b/src/tests/testsFoundations/testsDag.py
@@ -106,6 +106,16 @@ class AbstractNodeTestCase(unittest.TestCase):
nodeB = AbstractNode()
self.assertEqual(nodeB.name, "Abstract{0}".format(nodeB.identity))
+ def testHash(self):
+ """
+ This method tests :class:`foundations.dag.AbstractNode` class hash consistency.
+ """
+
+ nodeA = AbstractNode("MyNodeA")
+ self.assertEqual(nodeA.identity, nodeA.__hash__())
+ nodeB = AbstractNode("MyNodeB")
+ dictionary = {nodeA : "MyNodeA", nodeB : "MyNodeB"}
+
def testGetNodeByIdentity(self):
"""
This method tests :meth:`foundations.dag.AbstractNode.getNodeByIdentity` method. | Add hash tests for "foundations.dag.AbstractNode" class. |
diff --git a/packages/babel-traverse/src/path/ancestry.js b/packages/babel-traverse/src/path/ancestry.js
index <HASH>..<HASH> 100644
--- a/packages/babel-traverse/src/path/ancestry.js
+++ b/packages/babel-traverse/src/path/ancestry.js
@@ -4,8 +4,10 @@ import * as t from "@babel/types";
import NodePath from "./index";
/**
- * Call the provided `callback` with the `NodePath`s of all the parents.
- * When the `callback` returns a truthy value, we return that node path.
+ * Starting at the parent path of the current `NodePath` and going up the
+ * tree, return the first `NodePath` that causes the provided `callback`
+ * to return a truthy value, or `null` if the `callback` never returns a
+ * truthy value.
*/
export function findParent(callback): ?NodePath {
@@ -18,7 +20,8 @@ export function findParent(callback): ?NodePath {
/**
* Starting at current `NodePath` and going up the tree, return the first
- * `NodePath` that causes the provided `callback` to return a truthy value.
+ * `NodePath` that causes the provided `callback` to return a truthy value,
+ * or `null` if the `callback` never returns a truthy value.
*/
export function find(callback): ?NodePath { | docs: updates docs of `findParent` and `find` (#<I>) [skip ci]
Makes the documentation of `findParent` and `find` consistent and documents their `null` cases. |
diff --git a/src/Core/Maintenance/System/Command/SystemInstallCommand.php b/src/Core/Maintenance/System/Command/SystemInstallCommand.php
index <HASH>..<HASH> 100644
--- a/src/Core/Maintenance/System/Command/SystemInstallCommand.php
+++ b/src/Core/Maintenance/System/Command/SystemInstallCommand.php
@@ -87,6 +87,12 @@ class SystemInstallCommand extends Command
[
'command' => 'dal:refresh:index',
],
+ [
+ 'command' => 'scheduled-task:register',
+ ],
+ [
+ 'command' => 'plugin:refresh',
+ ],
];
/** @var Application $application */ | NEXT-<I> - Add plugin:refresh and scheduled:task:register to system:install |
diff --git a/tests/_mock.py b/tests/_mock.py
index <HASH>..<HASH> 100644
--- a/tests/_mock.py
+++ b/tests/_mock.py
@@ -7,6 +7,7 @@ Markus Juenemann, 04-Feb-2016
import time
from gpsdshm.shm import MAXCHANNELS
+from gpsdshm import Satellite
class MockFix(object):
def __init__(self):
@@ -38,13 +39,14 @@ class MockDop(object):
self.gdop = 2.4342743978108503
-class MockSatellite(object):
+class MockSatellite(Satellite):
def __init__(self, prn):
- self.ss = 0.0
- self.prn = self.PRN = prn
- self.used = True
- self.elevation = prn
- self.azimuth = prn
+ super(MockSatellite, self).__init__(ss=0.0, used=True, prn=prn, elevation=prn, azimuth=prn)
+ #self.ss = 0.0
+ #self.prn = self.PRN = prn
+ #self.used = True
+ #self.elevation = prn
+ #self.azimuth = prn
class MockShm(object): | Add tests for Satellite() even when mocking. |
diff --git a/src/Interfaces/EncryptionInterface.php b/src/Interfaces/EncryptionInterface.php
index <HASH>..<HASH> 100644
--- a/src/Interfaces/EncryptionInterface.php
+++ b/src/Interfaces/EncryptionInterface.php
@@ -16,13 +16,9 @@ interface EncryptionInterface
/**
* EncryptionInterface constructor.
*
- * @throws \PHPSess\Exception\UnknownEncryptionAlgorithmException
- * @throws \PHPSess\Exception\UnknownHashAlgorithmException
- * @param string $appKey Defines the App Key.
- * @param string $hashAlgorithm Defines the algorithm used to create hashes.
- * @param string $encryptionAlgorithm Defines the algorithm to encrypt/decrypt data.
+ * @param string $appKey The app-key that will make part of the encryption key and identifier hash.
*/
- public function __construct(string $appKey, string $hashAlgorithm, string $encryptionAlgorithm);
+ public function __construct(string $appKey);
/**
* Makes a session identifier based on the session id. | Remove hashAlgorithm and encryptionAlgorithm from EncryptionInterface constructor |
diff --git a/source/interface/getFile.js b/source/interface/getFile.js
index <HASH>..<HASH> 100644
--- a/source/interface/getFile.js
+++ b/source/interface/getFile.js
@@ -7,7 +7,7 @@ const fetch = require("../request.js").fetch;
function getFileContentsBuffer(filePath, options) {
return makeFileRequest(filePath, options).then(function(res) {
- return res.buffer();
+ return res.arrayBuffer();
});
}
diff --git a/test/specs/getFileContents.spec.js b/test/specs/getFileContents.spec.js
index <HASH>..<HASH> 100644
--- a/test/specs/getFileContents.spec.js
+++ b/test/specs/getFileContents.spec.js
@@ -1,5 +1,3 @@
-"use strict";
-
const path = require("path");
const fs = require("fs"); | Update .buffer to .arrayBuffer |
diff --git a/queue.go b/queue.go
index <HASH>..<HASH> 100644
--- a/queue.go
+++ b/queue.go
@@ -235,6 +235,8 @@ func (queue *redisQueue) AddBatchConsumer(tag string, batchSize int, consumer Ba
return queue.AddBatchConsumerWithTimeout(tag, batchSize, defaultBatchTimeout, consumer)
}
+// Timeout limits the amount of time waiting to fill an entire batch
+// The timer is only started when the first message in a batch is received
func (queue *redisQueue) AddBatchConsumerWithTimeout(tag string, batchSize int, timeout time.Duration, consumer BatchConsumer) string {
name := queue.addConsumer(tag)
go queue.consumerBatchConsume(batchSize, timeout, consumer) | Adding comment about batched timeout behaviour |
diff --git a/src/js/Menus/MenuButton.js b/src/js/Menus/MenuButton.js
index <HASH>..<HASH> 100644
--- a/src/js/Menus/MenuButton.js
+++ b/src/js/Menus/MenuButton.js
@@ -174,6 +174,8 @@ export default class MenuButton extends PureComponent {
buttonId,
menuStyle,
menuClassName,
+ listStyle,
+ listClassName,
buttonChildren,
children,
fullWidth,
@@ -185,6 +187,7 @@ export default class MenuButton extends PureComponent {
...props
} = this.props;
delete props.onClick;
+ delete props.onMenuToggle;
delete props.defaultOpen;
const toggle = (
@@ -204,6 +207,8 @@ export default class MenuButton extends PureComponent {
listId={listId}
style={menuStyle}
className={menuClassName}
+ listStyle={listStyle}
+ listClassName={listClassName}
toggle={toggle}
isOpen={isOpen}
onClose={this._closeMenu} | Updated MenuButton to pass correct props
The MenuButton was not actually passing the listStyle and listClassName
props correctly to the Menu. Also removed the onMenuToggle prop from the
remaining props passed to the button. Closes #<I> |
diff --git a/src/cmd/serial.js b/src/cmd/serial.js
index <HASH>..<HASH> 100644
--- a/src/cmd/serial.js
+++ b/src/cmd/serial.js
@@ -1559,7 +1559,7 @@ module.exports = class SerialCommand {
message: 'Which device did you mean?',
choices: devices.map((d) => {
return {
- name: d.port + ' - ' + d.type,
+ name: d.port + ' - ' + d.type + ' - ' + d.deviceId,
value: d
};
}) | Add Device ID to the serial identify command. |
diff --git a/spec/stream_spec.rb b/spec/stream_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/stream_spec.rb
+++ b/spec/stream_spec.rb
@@ -15,8 +15,8 @@ describe T::Stream do
context '--csv' do
before :each do
@stream.options = @stream.options.merge("csv" => true)
- @tweetstream_client.stub(:on_timeline_status)
- .and_yield(fixture("status.json"))
+ @tweetstream_client.stub(:on_timeline_status).
+ and_yield(fixture("status.json"))
end
it "should output in CSV format" do | fix build failure in Ruby <I> |
diff --git a/mode/go/go.js b/mode/go/go.js
index <HASH>..<HASH> 100644
--- a/mode/go/go.js
+++ b/mode/go/go.js
@@ -86,7 +86,7 @@ CodeMirror.defineMode("go", function(config) {
var escaped = false, next, end = false;
while ((next = stream.next()) != null) {
if (next == quote && !escaped) {end = true; break;}
- escaped = !escaped && next == "\\";
+ escaped = !escaped && quote != "`" && next == "\\";
}
if (end || !(escaped || quote == "`"))
state.tokenize = tokenBase; | [go mode] Better handle raw strings
Don't treat backslashes specially inside of them
Closes #<I> |
diff --git a/demos/s3server/s3server.py b/demos/s3server/s3server.py
index <HASH>..<HASH> 100644
--- a/demos/s3server/s3server.py
+++ b/demos/s3server/s3server.py
@@ -221,7 +221,7 @@ class ObjectHandler(BaseRequestHandler):
self.set_header("Content-Type", "application/unknown")
self.set_header("Last-Modified", datetime.datetime.utcfromtimestamp(
info.st_mtime))
- object_file = open(path, "r")
+ object_file = open(path, "rb")
try:
self.finish(object_file.read())
finally: | Fix s3server.py to stop truncating downloads of images and other non-text files |
diff --git a/io.go b/io.go
index <HASH>..<HASH> 100644
--- a/io.go
+++ b/io.go
@@ -36,20 +36,13 @@ func Cat(filenames ...string) Filter {
// for debugging.
func WriteLines(writer io.Writer) Filter {
return FilterFunc(func(arg Arg) error {
- b := bufio.NewWriter(writer)
for s := range arg.In {
- if _, err := b.Write([]byte(s)); err != nil {
- return err
- }
- if err := b.WriteByte('\n'); err != nil {
+ if _, err := writer.Write(append([]byte(s),'\n')); err != nil {
return err
}
arg.Out <- s
- if err := b.Flush(); err != nil {
- return err
- }
}
- return b.Flush()
+ return nil
})
} | Removed write buffer from WriteLines |
diff --git a/compose.go b/compose.go
index <HASH>..<HASH> 100644
--- a/compose.go
+++ b/compose.go
@@ -13,7 +13,7 @@ type ComposeTarget interface {
// ComposeMethod is a Porter-Duff composition method.
type ComposeMethod int
-// Here's the list of all available Porter-Duff composition methods. User ComposeOver for the basic
+// Here's the list of all available Porter-Duff composition methods. Use ComposeOver for the basic
// alpha blending.
const (
ComposeOver ComposeMethod = iota | fix type in ComposeMethod doc |
diff --git a/plugins/outputs/kafka/kafka.go b/plugins/outputs/kafka/kafka.go
index <HASH>..<HASH> 100644
--- a/plugins/outputs/kafka/kafka.go
+++ b/plugins/outputs/kafka/kafka.go
@@ -56,7 +56,7 @@ var sampleConfig = `
## Kafka topic for producer messages
topic = "telegraf"
## Telegraf tag to use as a routing key
- ## ie, if this tag exists, it's value will be used as the routing key
+ ## ie, if this tag exists, its value will be used as the routing key
routing_tag = "host"
## CompressionCodec represents the various compression codecs recognized by
@@ -93,7 +93,7 @@ var sampleConfig = `
# insecure_skip_verify = false
## Data format to output.
- ## Each data format has it's own unique set of configuration options, read
+ ## Each data format has its own unique set of configuration options, read
## more about them here:
## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
data_format = "influx" | it's -> its (#<I>) |
diff --git a/src/Bkwld/Decoy/Models/Base.php b/src/Bkwld/Decoy/Models/Base.php
index <HASH>..<HASH> 100644
--- a/src/Bkwld/Decoy/Models/Base.php
+++ b/src/Bkwld/Decoy/Models/Base.php
@@ -244,8 +244,7 @@ abstract class Base extends Eloquent {
* Find by the slug and fail if missing. Like "findOrFail()" but use the slug column instead
*/
static public function findBySlugOrFail($slug) {
- if ($row = self::findBySlug($slug)) return $row;
- throw new ModelNotFoundException(get_called_class().' model not found');
+ return static::where('slug', '=', $slug)->firstOrFail();
}
//--------------------------------------------------------------------------- | Making use of an Eloquent method for findBySlugOrFail |
diff --git a/examples/with-sentry/next.config.js b/examples/with-sentry/next.config.js
index <HASH>..<HASH> 100644
--- a/examples/with-sentry/next.config.js
+++ b/examples/with-sentry/next.config.js
@@ -21,6 +21,7 @@ const COMMIT_SHA =
VERCEL_BITBUCKET_COMMIT_SHA
process.env.SENTRY_DSN = SENTRY_DSN
+const basePath = ''
module.exports = withSourceMaps({
serverRuntimeConfig: {
@@ -63,12 +64,12 @@ module.exports = withSourceMaps({
include: '.next',
ignore: ['node_modules'],
stripPrefix: ['webpack://_N_E/'],
- urlPrefix: '~/_next',
+ urlPrefix: `~${basePath}/_next`,
release: COMMIT_SHA,
})
)
}
-
return config
},
+ basePath,
}) | basePath should also append in urlPrefix (#<I>)
Fix <URL> |
diff --git a/core/model/src/main/java/it/unibz/inf/ontop/iq/node/impl/LeftJoinNodeImpl.java b/core/model/src/main/java/it/unibz/inf/ontop/iq/node/impl/LeftJoinNodeImpl.java
index <HASH>..<HASH> 100644
--- a/core/model/src/main/java/it/unibz/inf/ontop/iq/node/impl/LeftJoinNodeImpl.java
+++ b/core/model/src/main/java/it/unibz/inf/ontop/iq/node/impl/LeftJoinNodeImpl.java
@@ -914,6 +914,18 @@ public class LeftJoinNodeImpl extends JoinLikeNodeImpl implements LeftJoinNode {
.map(s -> s.composeWith(ascendingSubstitution))
.orElse(ascendingSubstitution);
}
+
+ @Override
+ public boolean equals(Object o) {
+ if (!(o instanceof ChildLiftingState))
+ return false;
+
+ ChildLiftingState other = (ChildLiftingState) o;
+ return leftChild.isEquivalentTo(other.leftChild)
+ && rightChild.isEquivalentTo(other.rightChild)
+ && ljCondition.equals(other.ljCondition)
+ && ascendingSubstitution.equals(other.ascendingSubstitution);
+ }
}
/** | LeftJoin binding lift can now converge. |
diff --git a/Webpage/MenuEntry/MenuEntry.php b/Webpage/MenuEntry/MenuEntry.php
index <HASH>..<HASH> 100644
--- a/Webpage/MenuEntry/MenuEntry.php
+++ b/Webpage/MenuEntry/MenuEntry.php
@@ -9,7 +9,7 @@ use vxPHP\Webpage\MenuEntry\MenuEntryInterface;
* MenuEntry class
* manages a single menu entry
*
- * @version 0.3.1 2013-09-09
+ * @version 0.3.2 2013-09-12
*/
class MenuEntry implements MenuEntryInterface {
protected static $count = 1;
@@ -114,11 +114,16 @@ class MenuEntry implements MenuEntryInterface {
}
if($GLOBALS['config']->site->use_nice_uris == 1) {
- $script = basename($this->menu->getScript(), '.php') . '/';
- if($script == 'index') {
+
+ if(($script = basename($this->menu->getScript(), '.php')) == 'index') {
$script = '';
}
+
+ else {
+ $script .= '/';
+ }
}
+
else {
$script = $this->menu->getScript() . '/';
} | Bugfix: with nice URIs the script name was not filtered properly |
diff --git a/framework/messages/pt-PT/yii.php b/framework/messages/pt-PT/yii.php
index <HASH>..<HASH> 100644
--- a/framework/messages/pt-PT/yii.php
+++ b/framework/messages/pt-PT/yii.php
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* Message translations.
* | Removed U+FEFF character from pt-PT language file to fixe #<I> |
diff --git a/lib/devise/controllers/sign_in_out.rb b/lib/devise/controllers/sign_in_out.rb
index <HASH>..<HASH> 100644
--- a/lib/devise/controllers/sign_in_out.rb
+++ b/lib/devise/controllers/sign_in_out.rb
@@ -6,7 +6,10 @@ module Devise
# Included by default in all controllers.
module SignInOut
# Return true if the given scope is signed in session. If no scope given, return
- # true if any scope is signed in. Does not run authentication hooks.
+ # true if any scope is signed in. This will run authentication hooks, which may
+ # cause exceptions to be thrown from this method; if you simply want to check
+ # if a scope has already previously been authenticated without running
+ # authentication hooks, you can directly call `warden.authenticated?(scope: scope)`
def signed_in?(scope=nil)
[scope || Devise.mappings.keys].flatten.any? do |_scope|
warden.authenticate?(scope: _scope) | Fix `signed_in?` docs w.r.t. running auth hooks (#<I>)
Addresses #<I>
The docs previously mentioned that authentication hooks are not run when `signed_in?` is called, when in fact they are. This commit fixes the comment and suggests calling `authenticated?` on warden directly as an alternative for when you _don't_ want to run auth hooks. |
diff --git a/src/ol/format/IIIFInfo.js b/src/ol/format/IIIFInfo.js
index <HASH>..<HASH> 100644
--- a/src/ol/format/IIIFInfo.js
+++ b/src/ol/format/IIIFInfo.js
@@ -286,6 +286,7 @@ class IIIFInfo {
/**
* @param {Object|string} imageInfo Deserialized image information JSON response
* object or JSON response as string
+ * @api
*/
setImageInfo(imageInfo) {
if (typeof imageInfo == 'string') {
@@ -297,6 +298,7 @@ class IIIFInfo {
/**
* @returns {Versions} Major IIIF version.
+ * @api
*/
getImageApiVersion() {
if (this.imageInfo === undefined) {
@@ -395,6 +397,7 @@ class IIIFInfo {
/**
* @param {PreferredOptions} opt_preferredOptions Optional options for preferred format and quality.
* @returns {import("../source/IIIF.js").Options} IIIF tile source ready constructor options.
+ * @api
*/
getTileSourceOptions(opt_preferredOptions) {
const options = opt_preferredOptions || {}, | Expose IIIFInfo methods for doc |
diff --git a/spacy/__init__.py b/spacy/__init__.py
index <HASH>..<HASH> 100644
--- a/spacy/__init__.py
+++ b/spacy/__init__.py
@@ -30,6 +30,7 @@ def load(name, **overrides):
else:
model_path = util.ensure_path(overrides['path'])
data_path = model_path.parent
+ model_name = ''
meta = util.parse_package_meta(data_path, model_name, require=False)
lang = meta['lang'] if meta and 'lang' in meta else name
cls = util.get_lang_class(lang) | Set model name to empty string if path override exists
Required for parse_package_meta, which composes path of data_path and
model_name (needs to be fixed in the future) |
diff --git a/src/React/Widgets/AnnotationEditorWidget/index.js b/src/React/Widgets/AnnotationEditorWidget/index.js
index <HASH>..<HASH> 100644
--- a/src/React/Widgets/AnnotationEditorWidget/index.js
+++ b/src/React/Widgets/AnnotationEditorWidget/index.js
@@ -47,7 +47,7 @@ export default function annotationEditorWidget(props) {
};
const onAnnotationChange = (event) => {
- const value = event.target.value;
+ const value = (event.target.type === 'number') ? +event.target.value : event.target.value;
const name = event.target.name;
const type = event.type; | fix(AnnotationEditorWidget): convert 'weight' to number
Make sure the 'weight' parameter is coverted to a number,
by checking for input type==='number'. |
diff --git a/core/model.js b/core/model.js
index <HASH>..<HASH> 100644
--- a/core/model.js
+++ b/core/model.js
@@ -36,7 +36,7 @@ exports.ModelUpdate.prototype._find = function(index) {
if (index != 0)
throw new Error('invalid index ' + index)
- return { index: i - 1, offset: 0 }
+ return { index: i - 1, offset: range.length }
}
exports.ModelUpdate.prototype.reset = function(model) { | return real index and offset == length for last segment |
diff --git a/Kwf/User/Auth/PasswordFields.php b/Kwf/User/Auth/PasswordFields.php
index <HASH>..<HASH> 100644
--- a/Kwf/User/Auth/PasswordFields.php
+++ b/Kwf/User/Auth/PasswordFields.php
@@ -67,7 +67,6 @@ class Kwf_User_Auth_PasswordFields extends Kwf_User_Auth_Abstract implements Kwf
} else {
throw new Kwf_Exception_NotYetImplemented('hashing type not yet implemented');
}
- $row->activate_token = '';
return true;
} | Fix problem with password-auth-methods and activation-auth-method
password-auth-method resets activation_token. There is
clearActivationToken for this purpose. |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.