diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/Branch-SDK/src/io/branch/referral/Branch.java b/Branch-SDK/src/io/branch/referral/Branch.java
index <HASH>..<HASH> 100644
--- a/Branch-SDK/src/io/branch/referral/Branch.java
+++ b/Branch-SDK/src/io/branch/referral/Branch.java
@@ -340,7 +340,7 @@ public class Branch {
debugHandler_ = new Handler();
debugStarted_ = false;
linkCache_ = new HashMap<BranchLinkData, String>();
- activityLifeCycleObserver_ = new BranchActivityLifeCycleObserver();
+
}
@@ -2610,6 +2610,7 @@ public class Branch {
@TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH)
private void setActivityLifeCycleObserver(Application application) {
try {
+ activityLifeCycleObserver_ = new BranchActivityLifeCycleObserver();
/* Set an observer for activity life cycle events. */
application.unregisterActivityLifecycleCallbacks(activityLifeCycleObserver_);
application.registerActivityLifecycleCallbacks(activityLifeCycleObserver_);
@@ -2645,7 +2646,9 @@ public class Branch {
@Override
public void onActivityResumed(Activity activity) {
//Set the activity for touch debug
- setTouchDebugInternal(activity);
+ if (prefHelper_.getTouchDebugging()) {
+ setTouchDebugInternal(activity);
+ }
}
@Override
|
Fixing sdks crashing when used below API level <I>
Hot fix for SDK crash on Api level <<I>
|
diff --git a/src/main/java/rx/lang/groovy/GroovyAdaptor.java b/src/main/java/rx/lang/groovy/GroovyAdaptor.java
index <HASH>..<HASH> 100644
--- a/src/main/java/rx/lang/groovy/GroovyAdaptor.java
+++ b/src/main/java/rx/lang/groovy/GroovyAdaptor.java
@@ -33,7 +33,7 @@ import rx.observables.Notification;
import rx.observables.Observable;
import rx.observables.Observer;
import rx.observables.Subscription;
-import rx.util.FunctionLanguageAdaptor;
+import rx.util.functions.FunctionLanguageAdaptor;
public class GroovyAdaptor implements FunctionLanguageAdaptor {
|
Refactoring towards performance improvements
- Convert operators to implement Func1 instead of extend Observable
- Change Observable to concete instead of abstract
- subscribe is now controlled by the concrete class so we can control the wrapping of a Func to be executed when subscribe is called
- removed most wrapping inside operators with AtomicObservable except for complex operators like Zip that appear to still need it
While doing these changes the util/function packages got moved a little as well to make more sense for where the Atomic* classes should go
|
diff --git a/pycm/pycm_util.py b/pycm/pycm_util.py
index <HASH>..<HASH> 100644
--- a/pycm/pycm_util.py
+++ b/pycm/pycm_util.py
@@ -1,4 +1,5 @@
# -*- coding: utf-8 -*-
+from __future__ import division
import sys
import numpy
|
fix : division from __future__ imported in pycm_util.py for Python <I>
|
diff --git a/packages/core/src/PlayerContextProvider.js b/packages/core/src/PlayerContextProvider.js
index <HASH>..<HASH> 100644
--- a/packages/core/src/PlayerContextProvider.js
+++ b/packages/core/src/PlayerContextProvider.js
@@ -107,7 +107,8 @@ function getGoToTrackState({
loop: shouldLoadAsNew ? false : prevState.loop,
shouldRequestPlayOnNextUpdate: Boolean(shouldPlay),
awaitingPlayAfterTrackLoad: Boolean(shouldPlay),
- awaitingForceLoad: Boolean(shouldForceLoad)
+ awaitingForceLoad: Boolean(shouldForceLoad),
+ maxKnownTime: shouldLoadAsNew ? 0 : prevState.maxKnownTime
};
}
|
Reset maxKnownTime on new track load.
|
diff --git a/packages/micro-journeys/src/micro-journeys-dropdown.schema.js b/packages/micro-journeys/src/micro-journeys-dropdown.schema.js
index <HASH>..<HASH> 100644
--- a/packages/micro-journeys/src/micro-journeys-dropdown.schema.js
+++ b/packages/micro-journeys/src/micro-journeys-dropdown.schema.js
@@ -20,7 +20,8 @@ module.exports = {
},
content: {
type: 'any',
- description: '**All of the items in the dropdown** -- generally works by including `@bolt-components-nav/nav.twig` with `links` array of objects containing `text` & `url`',
+ description:
+ '**All of the items in the dropdown** -- generally works by including `@bolt-components-nav/nav.twig` with `links` array of objects containing `text` & `url`',
},
iconBackgroundColor: {
type: 'string',
|
style(micro-journeys): eslinting
|
diff --git a/src/js/choropleth.js b/src/js/choropleth.js
index <HASH>..<HASH> 100644
--- a/src/js/choropleth.js
+++ b/src/js/choropleth.js
@@ -51,8 +51,6 @@ class Choropleth extends Geomap {
unit.select('title').text(`${text}\n\n${self.properties.column}: ${val}`);
}
-
-
// Make sure postUpdate function is run if set.
super.update();
}
diff --git a/src/js/geomap.js b/src/js/geomap.js
index <HASH>..<HASH> 100644
--- a/src/js/geomap.js
+++ b/src/js/geomap.js
@@ -39,7 +39,7 @@ class Geomap {
x = x0,
y = y0;
- if (d && this._.centered !== d) {
+ if (d && d.hasOwnProperty('geometry') && this._.centered !== d) {
let centroid = this.path.centroid(d);
x = centroid[0];
y = centroid[1];
@@ -48,7 +48,6 @@ class Geomap {
} else {
this._.centered = null;
}
-
this.svg.selectAll('path.unit')
.classed('active', this._.centered && ((d) => d === this._.centered));
|
Fixed zooming out when no unit was clicked.
|
diff --git a/lib/reform/form.rb b/lib/reform/form.rb
index <HASH>..<HASH> 100644
--- a/lib/reform/form.rb
+++ b/lib/reform/form.rb
@@ -78,6 +78,7 @@ module Reform
require 'reform/form/validate'
include Validate
+
require 'reform/form/multi_parameter_attributes'
include MultiParameterAttributes # TODO: make features dynamic.
@@ -220,17 +221,6 @@ module Reform
@options = options
end
- include Form::Validate
-
- # TODO: make valid?(errors) the only public method.
- def valid?
- res= validate_cardinality & validate_items
- end
-
- def errors
- @errors ||= Form::Errors.new(self)
- end
-
# this gives us each { to_hash }
include Representable::Hash::Collection
items :parse_strategy => :sync, :instance => true
|
remove more methods from Forms as this is all implemented with the recursive #validate!.
|
diff --git a/flask_boost/project/application/utils/assets.py b/flask_boost/project/application/utils/assets.py
index <HASH>..<HASH> 100644
--- a/flask_boost/project/application/utils/assets.py
+++ b/flask_boost/project/application/utils/assets.py
@@ -92,14 +92,15 @@ def build_js(app):
Include libs.js and page.js.
"""
static_path = app.static_folder
- libs_path = G.js_config['libs']
+ libs = G.js_config['libs']
layout = G.js_config['layout']
page_root_path = G.js_config['page']
# Build libs.js
libs_js_string = ""
- for lib_path in libs_path:
- with open(os.path.join(static_path, lib_path)) as js_file:
+ for lib in libs:
+ lib_path = os.path.join(static_path, lib)
+ with open(lib_path) as js_file:
file_content = js_file.read()
# Rewrite relative path to absolute path
file_content = _rewrite_relative_url(file_content, lib_path, static_path)
|
Fix a bug in build_js.
|
diff --git a/lib/supervisor.js b/lib/supervisor.js
index <HASH>..<HASH> 100644
--- a/lib/supervisor.js
+++ b/lib/supervisor.js
@@ -26,7 +26,7 @@ function run(
// Only print any results if we're ready - that is, nextResultToPrint
// is no longer null. (BEGIN changes it from null to 0.)
if (nextResultToPrint !== null) {
- var result = results[String(nextResultToPrint)];
+ var result = results[nextResultToPrint];
while (
// If there are no more results to print, then we're done.
@@ -36,7 +36,7 @@ function run(
) {
printResult(format, result);
nextResultToPrint++;
- result = results[String(nextResultToPrint)];
+ result = results[nextResultToPrint];
}
}
}
|
Don't call String unnecessarily.
|
diff --git a/core/selection.js b/core/selection.js
index <HASH>..<HASH> 100644
--- a/core/selection.js
+++ b/core/selection.js
@@ -92,18 +92,16 @@ class Selection {
}
handleDragging() {
- let mouseCount = 0;
+ this.isMouseDown = false;
this.emitter.listenDOM('mousedown', document.body, () => {
- mouseCount += 1;
+ this.isMouseDown = true;
});
this.emitter.listenDOM('mouseup', document.body, () => {
- mouseCount -= 1;
- if (mouseCount === 0) {
- this.update(Emitter.sources.USER);
- }
+ this.isMouseDown = false;
+ this.update(Emitter.sources.USER);
});
this.emitter.listenDOM('selectionchange', document, () => {
- if (mouseCount === 0) {
+ if (!this.isMouseDown) {
setTimeout(this.update.bind(this, Emitter.sources.USER), 1);
}
});
|
change to boolean, fixes #<I>
|
diff --git a/worker.js b/worker.js
index <HASH>..<HASH> 100644
--- a/worker.js
+++ b/worker.js
@@ -105,7 +105,6 @@ function test(ctx, cb) {
check({url:"http://localhost:"+HTTP_PORT+"/", log:log}, function(err) {
if (err) {
- clearInterval(intervalId)
return cb(1)
}
serverUp()
|
don't need to clear interval in error path anymore.
|
diff --git a/test/Elastica/ClientTest.php b/test/Elastica/ClientTest.php
index <HASH>..<HASH> 100644
--- a/test/Elastica/ClientTest.php
+++ b/test/Elastica/ClientTest.php
@@ -33,6 +33,36 @@ class ClientTest extends BaseTest
/**
* @group functional
+ * @expectedException Elastica\Exception\Connection\HttpException
+ */
+ public function testConnectionErrors()
+ {
+ $client = $this->_getClient(['host' => 'foo.bar', 'port' => '9201']);
+ $client->getVersion();
+ }
+
+ /**
+ * @group functional
+ * @expectedException Elastica\Exception\Connection\HttpException
+ */
+ public function testClientBadHost()
+ {
+ $client = $this->_getClient(['host' => 'localhost', 'port' => '9201']);
+ $client->getVersion();
+ }
+
+ /**
+ * @group functional
+ * @expectedException Elastica\Exception\Connection\HttpException
+ */
+ public function testClientBadHostWithtimeout()
+ {
+ $client = $this->_getClient(['host' => 'foo.bar', 'timeout' => 10]);
+ $client->getVersion();
+ }
+
+ /**
+ * @group functional
*/
public function testGetVersion()
{
|
test connection error (#<I>)
|
diff --git a/pmxbot/core.py b/pmxbot/core.py
index <HASH>..<HASH> 100644
--- a/pmxbot/core.py
+++ b/pmxbot/core.py
@@ -49,6 +49,14 @@ class WarnHistory(dict):
def _expired(self, last, now):
return now - last > self.warn_every
+ def warn(self, nick, connection):
+ if not self.needs_warning(nick):
+ return
+ msg = self.warn_message.format(
+ logged_channels_string=', '.join(pmxbot.config.log_channels))
+ for line in msg.splitlines():
+ connection.notice(nick, line)
+
class AugmentableMessage(six.text_type):
"""
@@ -264,12 +272,7 @@ class LoggingCommandBot(irc.bot.SingleServerIRCBot):
return
if nick == self._nickname:
return
- if not self.warn_history.needs_warning(nick):
- return
- msg = self.warn_history.warn_message.format(
- logged_channels_string=', '.join(pmxbot.config.log_channels))
- for line in msg.splitlines():
- connection.notice(nick, line)
+ self.warn_history.warn(nick, connection)
def on_leave(self, connection, event):
nick = event.source.nick
|
Move transmission of warning to WarnHistory for better encapsulation.
|
diff --git a/lib/parser.js b/lib/parser.js
index <HASH>..<HASH> 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -226,7 +226,7 @@ module.exports = function schemaFilesParser (schemaFiles) {
// TEMPORARY FIX
// TODO: What if there's no primary key defined, but it does already use an ID column? Use that? Add a different named UUID column?
- if (columns.id) {
+ if (columns.id && columns.id.dataType === 'uuid') {
columns.id = {
array: false,
dataType: 'uuid',
|
a better kind-of fix for the uuid issue
|
diff --git a/core/src/main/java/com/google/bitcoin/core/Peer.java b/core/src/main/java/com/google/bitcoin/core/Peer.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/com/google/bitcoin/core/Peer.java
+++ b/core/src/main/java/com/google/bitcoin/core/Peer.java
@@ -729,7 +729,7 @@ public class Peer {
* @return various version numbers claimed by peer.
*/
public VersionMessage getVersionMessage() {
- return versionMessage;
+ return conn.getVersionMessage();
}
/**
|
Expose correct version message.
Resolve issue <I>.
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -16,6 +16,7 @@ Resizer.prototype.attach = function (preset) {
if (!preset instanceof Preset) throw "Resizer expects a Preset";
this.generateRoute(preset);
+ this.addHelper(preset);
};
diff --git a/preset.js b/preset.js
index <HASH>..<HASH> 100644
--- a/preset.js
+++ b/preset.js
@@ -14,12 +14,13 @@ Preset.prototype.from = function (from) {
return this;
};
-Preset.prototype.write = function (target) {
+Preset.prototype.to = function (target) {
this.targets.push(target);
this.tasks.push({
type: "write",
target: target
});
+ Object.freeze(this);
return this;
};
|
freeze ojbect when write is called
|
diff --git a/store/src/main/java/com/buschmais/jqassistant/core/store/impl/AbstractGraphStore.java b/store/src/main/java/com/buschmais/jqassistant/core/store/impl/AbstractGraphStore.java
index <HASH>..<HASH> 100644
--- a/store/src/main/java/com/buschmais/jqassistant/core/store/impl/AbstractGraphStore.java
+++ b/store/src/main/java/com/buschmais/jqassistant/core/store/impl/AbstractGraphStore.java
@@ -198,7 +198,7 @@ public abstract class AbstractGraphStore implements Store {
public void reset() {
LOGGER.info("Resetting store.");
Map<String, Object> params = new HashMap<>();
- params.put("batchSize", 100000);
+ params.put("batchSize", 65536);
long totalNodes = 0;
long nodes;
Instant start = Instant.now();
@@ -208,8 +208,9 @@ public abstract class AbstractGraphStore implements Store {
"OPTIONAL MATCH (n)-[r]-() " + //
"WITH n, r " + //
"LIMIT $batchSize " + //
+ "WITH distinct n " + //
"DETACH DELETE n " + //
- "RETURN count(distinct n) as nodes", params).getSingleResult();
+ "RETURN count(n) as nodes", params).getSingleResult();
nodes = result.get("nodes", Long.class);
totalNodes = totalNodes + nodes;
commitTransaction();
|
- optimized query used for resetting the store.
|
diff --git a/src/ValidationResultSet.php b/src/ValidationResultSet.php
index <HASH>..<HASH> 100644
--- a/src/ValidationResultSet.php
+++ b/src/ValidationResultSet.php
@@ -35,7 +35,7 @@ class ValidationResultSet implements \Iterator, \Countable {
*
* @var ValidationResult[]
*/
- private $entries = array();
+ protected $entries = array();
/**
* Internal Iterator index
diff --git a/src/Validator/SanitorMatch.php b/src/Validator/SanitorMatch.php
index <HASH>..<HASH> 100644
--- a/src/Validator/SanitorMatch.php
+++ b/src/Validator/SanitorMatch.php
@@ -41,7 +41,7 @@ class SanitorMatch implements ValidatorInterface {
*
* @var type
*/
- private $sanitizable;
+ protected $sanitizable;
/**
* Constructor
|
changed private properties to protected to allow easier extension
|
diff --git a/ontrack-model/src/main/java/net/nemerosa/ontrack/model/support/JobConfigProperties.java b/ontrack-model/src/main/java/net/nemerosa/ontrack/model/support/JobConfigProperties.java
index <HASH>..<HASH> 100644
--- a/ontrack-model/src/main/java/net/nemerosa/ontrack/model/support/JobConfigProperties.java
+++ b/ontrack-model/src/main/java/net/nemerosa/ontrack/model/support/JobConfigProperties.java
@@ -24,7 +24,7 @@ public class JobConfigProperties {
/**
* Using scattering of jobs
*/
- private boolean scattering = false;
+ private boolean scattering = true;
/**
* Scattering ratio (must be between 0.0 and 1.0 inclusive).
|
#<I> Scattering by default
|
diff --git a/ToolkitApi/ToolkitServiceXML.php b/ToolkitApi/ToolkitServiceXML.php
index <HASH>..<HASH> 100644
--- a/ToolkitApi/ToolkitServiceXML.php
+++ b/ToolkitApi/ToolkitServiceXML.php
@@ -34,7 +34,7 @@ class XMLWrapper
* @param string $options
* @param ToolkitService $ToolkitSrvObj
*/
- public function __construct($options ='', ToolkitService $ToolkitSrvObj = null)
+ public function __construct($options ='', $ToolkitSrvObj = null)
{
if (is_string($options)) {
// $options is a string so it must be encoding (assumption for backwards compatibility)
|
Removed type hint for ToolkitService in ToolkitServiceXML since ToolkitService cannot be namespaced at this point.
|
diff --git a/benchexec/tablegenerator/columns.py b/benchexec/tablegenerator/columns.py
index <HASH>..<HASH> 100644
--- a/benchexec/tablegenerator/columns.py
+++ b/benchexec/tablegenerator/columns.py
@@ -417,7 +417,7 @@ def _format_number(
# Cut the 0 in front of the decimal point for values < 1.
# Example: 0.002 => .002
- if _is_to_cut(formatted_value, format_target, isToAlign):
+ if _is_to_cut(formatted_value, format_target):
assert formatted_value.startswith("0.")
formatted_value = formatted_value[1:]
@@ -429,11 +429,8 @@ def _format_number(
return formatted_value
-def _is_to_cut(value, format_target, is_to_align):
- correct_target = format_target == "html_cell" or (
- format_target == "csv" and is_to_align
- )
-
+def _is_to_cut(value, format_target):
+ correct_target = format_target == "html_cell"
return correct_target and "." in value and 1 > Decimal(value) >= 0
|
Remove weird unused case in tablegenerator
We trimmed the leading 0 of values like <I> in format_number
either if the value is to be printed in a cell of the HTML tables,
or in CSV tables with alignment.
Such CSV tables are not even produced by tablegenerator,
and it is not clear why alignment should have an effect on whether to
trim leading zeros.
|
diff --git a/core/src/main/java/lucee/runtime/config/XMLConfigAdmin.java b/core/src/main/java/lucee/runtime/config/XMLConfigAdmin.java
index <HASH>..<HASH> 100755
--- a/core/src/main/java/lucee/runtime/config/XMLConfigAdmin.java
+++ b/core/src/main/java/lucee/runtime/config/XMLConfigAdmin.java
@@ -6666,7 +6666,9 @@ public final class XMLConfigAdmin {
if(extensions[i].hasAttribute("start-bundles")) continue;
// this will load the data from the .lex file
try {
- Manifest mf = RHExtension.getManifestFromFile(config, RHExtension.toResource(config, extensions[i]));
+
+ Resource res = RHExtension.toResource(config, extensions[i],null);
+ Manifest mf = (res==null) ? null : RHExtension.getManifestFromFile(config, res);
if(mf!=null) {
RHExtension.populate(extensions[i],mf);
fixed=true;
|
when extension does not exist ignore it in fix
|
diff --git a/lib/webaccount.py b/lib/webaccount.py
index <HASH>..<HASH> 100644
--- a/lib/webaccount.py
+++ b/lib/webaccount.py
@@ -63,7 +63,7 @@ def perform_youradminactivities(uid, ln):
your_admin_activities.append(action)
if "superadmin" in your_roles:
- for action in ["cfgbibformat", "cfgbibrank", "cfgbibindex", "cfgwebaccess", "cfgwebsearch", "cfgwebsubmit"]:
+ for action in ["cfgbibformat", "cfgbibharvest", "cfgbibrank", "cfgbibindex", "cfgwebaccess", "cfgwebsearch", "cfgwebsubmit"]:
if action not in your_admin_activities:
your_admin_activities.append(action)
|
Added "cfgbibharvest" to the list of superadmin activities.
|
diff --git a/test/WireMock/Client/WireMockTest.php b/test/WireMock/Client/WireMockTest.php
index <HASH>..<HASH> 100644
--- a/test/WireMock/Client/WireMockTest.php
+++ b/test/WireMock/Client/WireMockTest.php
@@ -57,6 +57,8 @@ class WireMockTest extends \PHPUnit_Framework_TestCase
/** @var MappingBuilder $mockMappingBuilder */
$mockMappingBuilder = mock('WireMock\Client\MappingBuilder');
when($mockMappingBuilder->build())->return($mockStubMapping);
+ when($this->_mockCurl->post('http://localhost:8080/__admin/mappings', $stubMappingArray))
+ ->return(json_encode(array('id' => 'some-long-guid')));
// when
$this->_wireMock->stubFor($mockMappingBuilder);
|
Stub out WireMock stubbing result in unit test
This test passes locally, but fails on Travis, oddly! Hopefully this
will fix it.
|
diff --git a/core/optimization/src/test/java/it/unibz/inf/ontop/iq/executor/FunctionalDependencyTest.java b/core/optimization/src/test/java/it/unibz/inf/ontop/iq/executor/FunctionalDependencyTest.java
index <HASH>..<HASH> 100644
--- a/core/optimization/src/test/java/it/unibz/inf/ontop/iq/executor/FunctionalDependencyTest.java
+++ b/core/optimization/src/test/java/it/unibz/inf/ontop/iq/executor/FunctionalDependencyTest.java
@@ -1045,6 +1045,7 @@ public class FunctionalDependencyTest {
optimizeAndCompare(query, expectedQuery);
}
+ @Ignore("TODO: optimize the redundant self-lj (no variable on the right is used")
@Test
public void testLJRedundantSelfLeftJoin1() throws EmptyQueryException {
DistinctVariableOnlyDataAtom projectionAtom = ATOM_FACTORY.getDistinctVariableOnlyDataAtom(ANS1_PREDICATE_AR_3, X, Y, Z);
|
One test re-disabled in FunctionalDependencyTest (not for this opt).
|
diff --git a/src/DataObjects/AbstractCmisObject.php b/src/DataObjects/AbstractCmisObject.php
index <HASH>..<HASH> 100644
--- a/src/DataObjects/AbstractCmisObject.php
+++ b/src/DataObjects/AbstractCmisObject.php
@@ -459,12 +459,12 @@ abstract class AbstractCmisObject implements CmisObjectInterface
*/
public function getBaseTypeId()
{
- $baseType = $this->getProperty(PropertyIds::BASE_TYPE_ID);
- if ($baseType === null) {
+ $baseTypeProperty = $this->getProperty(PropertyIds::BASE_TYPE_ID);
+ if ($baseTypeProperty === null) {
return null;
}
- return BaseTypeId::cast($baseType);
+ return BaseTypeId::cast($baseTypeProperty->getFirstValue());
}
/**
|
Fix bug in AbstractCmisObject::getBaseTypeId
Summary:
In `AbstractCmisObject::getBaseTypeId` the property object
has been passed to the `BaseTypeId` enumeration and not the expected
string value of the property.
Reviewers: dkd-ebert, #forgetit-dev
Reviewed By: dkd-ebert, #forgetit-dev
Differential Revision: <URL>
|
diff --git a/src/SearchApi.js b/src/SearchApi.js
index <HASH>..<HASH> 100644
--- a/src/SearchApi.js
+++ b/src/SearchApi.js
@@ -62,8 +62,6 @@ export class SubscribableSearchApi {
const search = this._createSearch()
if (Array.isArray(fieldNamesOrIndexFunction)) {
- // TODO Document the requirement that all resources have an :id attribute
- // TODO Document the requirement that all resources must be Objects or Records (with getters)
if (resources.forEach instanceof Function) {
resources.forEach(resource => {
fieldNamesOrIndexFunction.forEach(field => {
|
Removed TODOs since they have been addressed by documentation
|
diff --git a/src/index.js b/src/index.js
index <HASH>..<HASH> 100644
--- a/src/index.js
+++ b/src/index.js
@@ -53,9 +53,9 @@ class Service {
return Proto.extend(obj, this)
}
- extractIdsFromString (id) {
+ extractIds (id) {
+ if (typeof id === 'object') { return Object.values(id) }
if (id[0] === '[' && id[id.length - 1] === ']') { return JSON.parse(id) }
-
if (id[0] === '{' && id[id.length - 1] === '}') { return Object.values(JSON.parse(id)) }
return id.split(this.idSeparator)
@@ -69,7 +69,7 @@ class Service {
let ids = id
if (id && !Array.isArray(id)) {
- ids = this.extractIdsFromString(id.toString())
+ ids = this.extractIds(id)
}
this.id.forEach((idKey, index) => {
|
Added support for passing an object type as `id` in internal call
|
diff --git a/gwpy/plotter/histogram.py b/gwpy/plotter/histogram.py
index <HASH>..<HASH> 100644
--- a/gwpy/plotter/histogram.py
+++ b/gwpy/plotter/histogram.py
@@ -83,7 +83,7 @@ class HistogramAxes(Axes):
return self.hist(table[column], **kwargs)
def hist(self, x, **kwargs): # pylint: disable=arguments-differ
- if iterable(x) and not x:
+ if iterable(x) and not numpy.size(x):
x = numpy.ndarray((0,))
logbins = kwargs.pop('logbins', False)
bins = kwargs.get('bins', 30)
|
plotter.histogram: fixed bug in 'not x'
numpy arrays can't handle it
|
diff --git a/etcdserver/metrics.go b/etcdserver/metrics.go
index <HASH>..<HASH> 100644
--- a/etcdserver/metrics.go
+++ b/etcdserver/metrics.go
@@ -47,7 +47,7 @@ var (
fileDescriptorUsed = prometheus.NewGauge(prometheus.GaugeOpts{
Namespace: "etcd",
Subsystem: "server",
- Name: "file_descriptors_used_totol",
+ Name: "file_descriptors_used_total",
Help: "The total number of file descriptors used.",
})
)
|
etcdserver: fix typo in metrics.go
|
diff --git a/test.js b/test.js
index <HASH>..<HASH> 100644
--- a/test.js
+++ b/test.js
@@ -1,4 +1,5 @@
/* global it, beforeEach, afterEach */
+'use strict'
const assert = require('assert')
const fs = require('fs')
@@ -67,8 +68,8 @@ function processCss (outputTree) {
let content = fs.readFileSync(path.join(builder.outputPath, 'output.css'), 'utf8')
let sourceMap = JSON.parse(fs.readFileSync(path.join(builder.outputPath, 'output.css.map'), 'utf8'))
- assert.strictEqual(content.trim(), 'body {\n color: rgb(102, 51, 153)\n}')
- assert.strictEqual(sourceMap.mappings, 'AAAA;EACE,wBAAoB;CACrB')
+ assert.strictEqual(content.trim(), 'body {\n color: #639\n}')
+ assert.strictEqual(sourceMap.mappings, 'AAAA;EACE,WAAoB;CACrB')
assert.deepEqual(warnings, [])
})
}
|
update tests with new css for rebeccapurple
|
diff --git a/src/stream/filter.js b/src/stream/filter.js
index <HASH>..<HASH> 100644
--- a/src/stream/filter.js
+++ b/src/stream/filter.js
@@ -20,7 +20,7 @@ var
* Filter stream
*
* @param {Function} filter filter function
- * @constructor gpf.stream.BufferedRead
+ * @constructor gpf.stream.Filter
* @implements {gpf.interfaces.IReadableStream}
* @implements {gpf.interfaces.IWritableStream}
* @implements {gpf.interfaces.IFlushableStream}
|
Documentation (#<I>)
|
diff --git a/src/main/python/rlbot/utils/game_state_util.py b/src/main/python/rlbot/utils/game_state_util.py
index <HASH>..<HASH> 100644
--- a/src/main/python/rlbot/utils/game_state_util.py
+++ b/src/main/python/rlbot/utils/game_state_util.py
@@ -151,7 +151,7 @@ class GameState:
self.boosts = boosts
def convert_to_flat(self, builder=None):
- if self.ball is None and self.cars is None:
+ if self.ball is None and self.cars is None and self.boosts is None:
return None
if builder is None:
|
new DLL and fixed state not sending at some times
|
diff --git a/src/main/java/org/primefaces/extensions/component/waypoint/WaypointRenderer.java b/src/main/java/org/primefaces/extensions/component/waypoint/WaypointRenderer.java
index <HASH>..<HASH> 100755
--- a/src/main/java/org/primefaces/extensions/component/waypoint/WaypointRenderer.java
+++ b/src/main/java/org/primefaces/extensions/component/waypoint/WaypointRenderer.java
@@ -25,7 +25,6 @@ import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import java.io.IOException;
-import org.primefaces.expression.SearchExpressionHint;
/**
* WaypointRenderer.
@@ -49,7 +48,7 @@ public class WaypointRenderer extends CoreRenderer {
// try to get context (which scrollable element the waypoint belongs to and acts within)
String context = SearchExpressionFacade.resolveClientIds(fc, waypoint, waypoint.getForContext());
- String target = SearchExpressionFacade.resolveClientIds(fc, waypoint, waypoint.getFor(), SearchExpressionHint.PARENT_FALLBACK);
+ String target = SearchExpressionFacade.resolveClientIds(fc, waypoint, waypoint.getFor(), SearchExpressionFacade.Options.PARENT_FALLBACK);
final String widgetVar = waypoint.resolveWidgetVar();
|
Fixed SearchExpressionHint.PARENT_FALLBACK to SearchExpressionFacade.Options.PARENT_FALLBACK based on PF <I> changes
|
diff --git a/classes/Gems/Tracker/Model/FieldMaintenanceModel.php b/classes/Gems/Tracker/Model/FieldMaintenanceModel.php
index <HASH>..<HASH> 100644
--- a/classes/Gems/Tracker/Model/FieldMaintenanceModel.php
+++ b/classes/Gems/Tracker/Model/FieldMaintenanceModel.php
@@ -237,7 +237,7 @@ class FieldMaintenanceModel extends \MUtil_Model_UnionModel
);
$this->set('htmlUse',
- 'elementClass', 'Exhibitor',
+ 'elementClass', 'Exhibitor', 'nohidden', true,
'value', \MUtil_Html::create('h3', $this->_('Field use'))
);
$this->set('gtf_to_track_info', 'label', $this->_('In description'),
@@ -260,7 +260,7 @@ class FieldMaintenanceModel extends \MUtil_Model_UnionModel
);
$this->set('htmlCalc',
- 'elementClass', 'None',
+ 'elementClass', 'None', 'nohidden', true,
'value', \MUtil_Html::create('h3', $this->_('Field calculation'))
);
|
#<I> Fixed h3 labels after changing the field type
|
diff --git a/tests/tests/kernel/classes/clusterfilehandlers/ezdbfilehandler_test.php b/tests/tests/kernel/classes/clusterfilehandlers/ezdbfilehandler_test.php
index <HASH>..<HASH> 100644
--- a/tests/tests/kernel/classes/clusterfilehandlers/ezdbfilehandler_test.php
+++ b/tests/tests/kernel/classes/clusterfilehandlers/ezdbfilehandler_test.php
@@ -39,10 +39,6 @@ class eZDBFileHandlerTest extends eZDBBasedClusterFileHandlerAbstractTest
$backend = 'eZDBFileHandlerMysqliBackend';
break;
- case 'postgresql':
- $backend = 'eZDBFileHandlerPostgresqlBackend';
- break;
-
default:
$this->markTestSkipped( "Unsupported database type '{$dsn['phptype']}'" );
}
|
Fixed eZDBFileHandlerTest to not run against postgresql
|
diff --git a/salt/states/pip_state.py b/salt/states/pip_state.py
index <HASH>..<HASH> 100644
--- a/salt/states/pip_state.py
+++ b/salt/states/pip_state.py
@@ -339,7 +339,7 @@ def installed(name,
__env__=__env__
)
- if pip_install_call and (pip_install_call['retcode'] == 0):
+ if pip_install_call and (pip_install_call.get('retcode', 1) == 0):
ret['result'] = True
if requirements or editable:
@@ -375,8 +375,11 @@ def installed(name,
ret['comment'] = 'Package was successfully installed'
elif pip_install_call:
ret['result'] = False
- error = 'Error: {0} {1}'.format(pip_install_call['stdout'],
- pip_install_call['stderr'])
+ if 'stdout' in pip_install_call:
+ error = 'Error: {0} {1}'.format(pip_install_call['stdout'],
+ pip_install_call['stderr'])
+ else:
+ error = 'Error: {0}'.format(pip_install_call['comment'])
if requirements or editable:
comments = []
|
Properly handle requirements files not found.
If a requirements file is not found, the `pip` salt module does not even execute the `cmd` call, so, there's not `retcode`, `stdout` or `stderr`.
|
diff --git a/openTSNE/tsne.py b/openTSNE/tsne.py
index <HASH>..<HASH> 100644
--- a/openTSNE/tsne.py
+++ b/openTSNE/tsne.py
@@ -1154,18 +1154,6 @@ class TSNE(BaseEstimator):
self.random_state = random_state
self.verbose = verbose
- @property
- def neighbors_method(self):
- import warnings
-
- warnings.warn(
- f"The `neighbors_method` attribute has been deprecated and will be "
- f"removed in future versions. Please use the new `neighbors` "
- f"attribute",
- category=FutureWarning,
- )
- return self.neighbors
-
def fit(self, X=None, affinities=None, initialization=None):
"""Fit a t-SNE embedding for a given data set.
|
Remove deprecated neighbors_method property
|
diff --git a/zappa/handler.py b/zappa/handler.py
index <HASH>..<HASH> 100644
--- a/zappa/handler.py
+++ b/zappa/handler.py
@@ -291,6 +291,12 @@ class LambdaHandler(object):
arn = None
if 'Sns' in record:
+ try:
+ message = json.loads(record['Sns']['Message'])
+ if message.get('command'):
+ return message['command']
+ except ValueError:
+ pass
arn = record['Sns'].get('TopicArn')
elif 'dynamodb' in record or 'kinesis' in record:
arn = record.get('eventSourceARN')
|
Run command if receive one in an SNS event
|
diff --git a/lib/gemstash/api_key_authorization.rb b/lib/gemstash/api_key_authorization.rb
index <HASH>..<HASH> 100644
--- a/lib/gemstash/api_key_authorization.rb
+++ b/lib/gemstash/api_key_authorization.rb
@@ -8,7 +8,7 @@ module Gemstash
end
def self.protect(app, &block)
- key = app.request.env["HTTP_AUTHORIZATION"]
+ key = parse_authorization(app.request.env)
app.auth = new(key)
yield
rescue Gemstash::NotAuthorizedError => e
@@ -16,6 +16,12 @@ module Gemstash
app.halt 401, e.message
end
+ def self.parse_authorization(request_env)
+ http_auth = Rack::Auth::Basic::Request.new(request_env)
+ return http_auth.credentials.first if http_auth.provided? && http_auth.basic?
+ request_env["HTTP_AUTHORIZATION"]
+ end
+
def check(permission)
Gemstash::Authorization.check(@key, permission)
end
|
parse http basic auth for private gems
|
diff --git a/views/js/qtiCreator/widgets/helpers/modalFeedbackRule.js b/views/js/qtiCreator/widgets/helpers/modalFeedbackRule.js
index <HASH>..<HASH> 100644
--- a/views/js/qtiCreator/widgets/helpers/modalFeedbackRule.js
+++ b/views/js/qtiCreator/widgets/helpers/modalFeedbackRule.js
@@ -75,6 +75,9 @@ define([
name : 'choices',
label : __('choices'),
init : function initChoice(fbRule, $select){
+
+ $select.siblings('.feedbackRule-compared-value').hide();
+
var condition = this.name;
//@TODO : create the choice selecter
@@ -92,7 +95,7 @@ define([
cSelector.on('change', function(){
//on change, assign selected choices (identifiers)
- var selectedChoices = ['choice_1', 'choice_3', 'choice_ABC'];
+ var selectedChoices = ['choice_1', 'choice_3', 'choice_2'];
response.setCondition(fbRule, condition, selectedChoices);
}).trigger('change');
|
fixed compared score input visibility in the match choices mode
|
diff --git a/framework/Mvc/Renderers/TwigExtensions.php b/framework/Mvc/Renderers/TwigExtensions.php
index <HASH>..<HASH> 100644
--- a/framework/Mvc/Renderers/TwigExtensions.php
+++ b/framework/Mvc/Renderers/TwigExtensions.php
@@ -63,6 +63,7 @@ class TwigExtensions
{
return [
new \Twig_SimpleFilter('repeat', 'str_repeat'),
+ new \Twig_SimpleFilter('unique', 'array_unique'),
new \Twig_SimpleFilter('count', 'count'),
new \Twig_SimpleFilter('sum', function ($val) {return is_array($val) ? array_sum($val) : 0;}),
new \Twig_SimpleFilter('basename', 'basename'),
|
+ 'unique' filter is added
|
diff --git a/lib/restclient/exceptions.rb b/lib/restclient/exceptions.rb
index <HASH>..<HASH> 100644
--- a/lib/restclient/exceptions.rb
+++ b/lib/restclient/exceptions.rb
@@ -107,6 +107,10 @@ module RestClient
end
end
+ def http_headers
+ @response.headers if @response
+ end
+
def http_body
@response.body if @response
end
|
Add Exception#http_headers for parallelism.
This closely matches the behavior of `#http_body`. Though I suspect we
have a documentation problem if people aren't aware of `#response`.
|
diff --git a/lib/guard/jekyll-plus.rb b/lib/guard/jekyll-plus.rb
index <HASH>..<HASH> 100755
--- a/lib/guard/jekyll-plus.rb
+++ b/lib/guard/jekyll-plus.rb
@@ -4,14 +4,13 @@ require 'guard'
require 'guard/guard'
require 'jekyll'
-begin
- require 'rack'
- @use_rack = true
-rescue LoadError
-end
-
module Guard
class Jekyllplus < Guard
+ begin
+ require 'rack'
+ @@use_rack = true
+ rescue LoadError
+ end
def initialize (watchers=[], options={})
super
@@ -57,7 +56,7 @@ module Guard
# Create a Jekyll site
#
@site = ::Jekyll::Site.new @config
- @rack = ::Rack::Server.new(rack_config(@destination)) if @use_rack
+ @rack = ::Rack::Server.new(rack_config(@destination)) if @@use_rack
end
|
Correct scoping issue with rack usage detection.
|
diff --git a/tests/Unit/CachedBuilderTest.php b/tests/Unit/CachedBuilderTest.php
index <HASH>..<HASH> 100644
--- a/tests/Unit/CachedBuilderTest.php
+++ b/tests/Unit/CachedBuilderTest.php
@@ -618,4 +618,25 @@ class CachedBuilderTest extends TestCase
$this->assertTrue($cachedResults->contains($author));
$this->assertTrue($liveResults->contains($author));
}
+
+ public function testRelationshipQueriesAreCached()
+ {
+ $books = (new Author)
+ ->first()
+ ->books()
+ ->get();
+ $key = 'genealabslaravelmodelcachingtestsfixturesbook-books.author_id_1-books.author_id_notnull';
+ $tags = [
+ 'genealabslaravelmodelcachingtestsfixturesbook'
+ ];
+
+ $cachedResults = cache()->tags($tags)->get($key);
+ $liveResults = (new UncachedAuthor)
+ ->first()
+ ->books()
+ ->get();
+
+ $this->assertTrue($cachedResults->diffAssoc($books)->isEmpty());
+ $this->assertTrue($liveResults->diffAssoc($books)->isEmpty());
+ }
}
|
Add test to check that nested relationship queries are cached
|
diff --git a/concrete/src/Application/Service/FileManager.php b/concrete/src/Application/Service/FileManager.php
index <HASH>..<HASH> 100644
--- a/concrete/src/Application/Service/FileManager.php
+++ b/concrete/src/Application/Service/FileManager.php
@@ -60,7 +60,7 @@ class FileManager
<div class="ccm-file-selector" data-file-selector="{$id}"></div>
<script type="text/javascript">
$(function() {
- $('[data-file-selector={$id}]').concreteFileSelector({$args});
+ $('[data-file-selector="{$id}"]').concreteFileSelector({$args});
});
</script>
EOL;
|
Escape element selector for adding file selector
|
diff --git a/thumbor/engines/pil.py b/thumbor/engines/pil.py
index <HASH>..<HASH> 100644
--- a/thumbor/engines/pil.py
+++ b/thumbor/engines/pil.py
@@ -116,6 +116,11 @@ class Engine(BaseEngine):
if quality is None:
options['quality'] = 'keep'
+ if self.image.mode == 'L':
+ self.image = self.image.convert('RGB')
+ if quality is None:
+ options['quality'] = None
+
if options['quality'] is None:
options['quality'] = self.context.config.QUALITY
diff --git a/vows/handler_images_vows.py b/vows/handler_images_vows.py
index <HASH>..<HASH> 100644
--- a/vows/handler_images_vows.py
+++ b/vows/handler_images_vows.py
@@ -294,3 +294,12 @@ class GetImageWithAutoWebP(BaseContext):
def should_be_200(self, response):
code, _ = response
expect(code).to_equal(200)
+
+ class WithMonochromaticJPEG(BaseContext):
+ def topic(self):
+ response = self.get('/unsafe/wellsford.jpg')
+ return (response.code, response.headers)
+
+ def should_be_200(self, response):
+ code, _ = response
+ expect(code).to_equal(200)
|
Fix #<I>.
Monochromatic JPG images were being handled incorrectly. Now it works as
expected.
|
diff --git a/docs/assets/js/models.js b/docs/assets/js/models.js
index <HASH>..<HASH> 100644
--- a/docs/assets/js/models.js
+++ b/docs/assets/js/models.js
@@ -332,6 +332,7 @@
};
const editions = [
+ 'Spark NLP 3.0',
'Spark NLP 2.7',
'Spark NLP 2.6',
'Spark NLP 2.5',
|
Add "Spark NLP <I>" option to the filters
|
diff --git a/code/model/Address.php b/code/model/Address.php
index <HASH>..<HASH> 100644
--- a/code/model/Address.php
+++ b/code/model/Address.php
@@ -56,7 +56,7 @@ class Address extends DataObject{
*/
function getFormFields($nameprefix = "", $showhints = false){
$countries = SiteConfig::current_site_config()->getCountriesList();
- $countryfield = (count($countries)) ? new DropdownField($nameprefix."Country",_t('Address.COUNTRY','Country'),$countries) : new ReadonlyField("Country",_t('Address.COUNTRY','Country'));
+ $countryfield = (count($countries)) ? new DropdownField($nameprefix."Country",_t('Address.COUNTRY','Country'),$countries) : new ReadonlyField($nameprefix."Country",_t('Address.COUNTRY','Country'));
$countryfield->setHasEmptyDefault(true);
$fields = new FieldSet(
$countryfield,
|
BUG: added missing prefix string for country drop down when read-only
|
diff --git a/src/database/migrations/2019_11_12_220840_drop_groups_table.php b/src/database/migrations/2019_11_12_220840_drop_groups_table.php
index <HASH>..<HASH> 100644
--- a/src/database/migrations/2019_11_12_220840_drop_groups_table.php
+++ b/src/database/migrations/2019_11_12_220840_drop_groups_table.php
@@ -215,14 +215,15 @@ class DropGroupsTable extends Migration
'updated_at' => carbon(),
]);
- $id = 0;
- DB::table('users')->get()->each(function ($user) use (&$id) {
- //$id++;
- DB::table('users')
- ->where('main_character_id', $user->main_character_id)
- ->update([
- 'id' => ++$id,
- ]);
+ DB::table('users')
+ ->whereNull('id')
+ ->get()
+ ->each(function ($user, $key) {
+ DB::table('users')
+ ->where('main_character_id', $user->main_character_id)
+ ->update([
+ 'id' => ($key + 2),
+ ]);
});
// switch id field from simple integer to auto-increment field
|
fix: ensure users table is starting with ID 2
|
diff --git a/ella/newman/context_processors.py b/ella/newman/context_processors.py
index <HASH>..<HASH> 100644
--- a/ella/newman/context_processors.py
+++ b/ella/newman/context_processors.py
@@ -6,8 +6,10 @@ def newman_media(request):
settings, if not available, use MEDIA_URL + 'newman_media/' combination
"""
uri = getattr(settings, 'NEWMAN_MEDIA_PREFIX', None)
+ debug = settings.DEBUG
if not uri:
uri = getattr(settings, 'MEDIA_URL') + 'newman_media/'
return {
- 'NEWMAN_MEDIA_URL' : uri
+ 'NEWMAN_MEDIA_URL' : uri,
+ 'DEBUG': False
}
|
Added DEBUG to context.
|
diff --git a/tests/Symfony/Tests/Component/Locale/Stub/StubIntlDateFormatterTest.php b/tests/Symfony/Tests/Component/Locale/Stub/StubIntlDateFormatterTest.php
index <HASH>..<HASH> 100644
--- a/tests/Symfony/Tests/Component/Locale/Stub/StubIntlDateFormatterTest.php
+++ b/tests/Symfony/Tests/Component/Locale/Stub/StubIntlDateFormatterTest.php
@@ -53,7 +53,7 @@ class StubIntlDateFormatterTest extends LocaleTestCase
/* general */
array('y-M-d', 0, '1970-1-1'),
array("yyyy.MM.dd G 'at' HH:mm:ss zzz", 0, '1970.01.01 AD at 00:00:00 GMT+00:00'),
- array("EEE, MMM d, ''yy", 0, "Thu, Jan 1, '00"),
+ array("EEE, MMM d, ''yy", 0, "Thu, Jan 1, '70"),
array('h:mm a', 0, '12:00 AM'),
array('K:mm a, z', 0, '0:00 AM, GMT+00:00'),
array('yyyyy.MMMM.dd GGG hh:mm aaa', 0, '01970.January.01 AD 12:00 AM'),
|
[Locale] fix failing test case
|
diff --git a/tools/functional-tester/agent/handler.go b/tools/functional-tester/agent/handler.go
index <HASH>..<HASH> 100644
--- a/tools/functional-tester/agent/handler.go
+++ b/tools/functional-tester/agent/handler.go
@@ -292,9 +292,7 @@ func (srv *Server) handleKillEtcd() (*rpcpb.Response, error) {
}
func (srv *Server) handleFailArchive() (*rpcpb.Response, error) {
- // TODO: stop/restart proxy?
- // for now, just keep using the old ones
- // if len(srv.advertisePortToProxy) > 0
+ srv.stopProxy()
// exit with stackstrace
srv.logger.Info("killing etcd process", zap.String("signal", syscall.SIGQUIT.String()))
|
functional-tester/agent: stop proxy on "fail archive"
|
diff --git a/securesystemslib/gpg/functions.py b/securesystemslib/gpg/functions.py
index <HASH>..<HASH> 100644
--- a/securesystemslib/gpg/functions.py
+++ b/securesystemslib/gpg/functions.py
@@ -47,7 +47,8 @@ def gpg_sign_object(content, keyid=None, homedir=None):
Path to the gpg keyring. If not passed the default keyring is used.
<Exceptions>
- None.
+ ValueError: if the gpg command failed to create a valid signature.
+ OSError: if the gpg command is not present or non-executable.
<Side Effects>
None.
|
DOC:gpg:functions: update exception docstrings
The gpg_sign_object did not mention two possible exceptions to raise
when trying to sign an object. Mention those two exceptions and the
reasons as to why they may be raised in the docstrings.
|
diff --git a/public/examples/scripts/mobilehacks.js b/public/examples/scripts/mobilehacks.js
index <HASH>..<HASH> 100644
--- a/public/examples/scripts/mobilehacks.js
+++ b/public/examples/scripts/mobilehacks.js
@@ -44,11 +44,14 @@ define(function() {
}
};
- // When the device re-orients, at least on iOS, the page is scrolled down :(
- window.addEventListener('orientationchange', function() {
+ var fixupAfterSizeChange = function() {
window.scrollTo(0, 0);
fixHeightHack();
- }, false);
+ };
+
+ // When the device re-orients, at least on iOS, the page is scrolled down :(
+ window.addEventListener('orientationchange', fixupAfterSizeChange, false);
+ window.addEventListener('resize', fixupAfterSizeChange, false);
// Prevents the browser from sliding the page when the user slides their finger.
// At least on iOS.
|
call fixheight hack on resize
|
diff --git a/lang/tr/lang.php b/lang/tr/lang.php
index <HASH>..<HASH> 100644
--- a/lang/tr/lang.php
+++ b/lang/tr/lang.php
@@ -27,6 +27,7 @@
'states' => 'States',
'main_price_type' => 'Main price',
'price_include_tax' => 'Price includes taxes',
+ 'discount_price' => 'Discount price',
],
'menu' => [
'main' => 'Catalog',
|
New translations lang.php (Turkish)
|
diff --git a/logger_windows.go b/logger_windows.go
index <HASH>..<HASH> 100644
--- a/logger_windows.go
+++ b/logger_windows.go
@@ -11,8 +11,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-// +build windows
-
package logger
import (
|
Update logger_windows.go
removed unneeded // +build windows (it would need to be at the top anyway)
|
diff --git a/cloudmesh/common/Shell.py b/cloudmesh/common/Shell.py
index <HASH>..<HASH> 100755
--- a/cloudmesh/common/Shell.py
+++ b/cloudmesh/common/Shell.py
@@ -310,7 +310,6 @@ class Shell(object):
return subprocess.check_output(*args, **kwargs)
@classmethod
- # @NotImplementedInWindows
def ls(cls, match="."):
"""
executes ls with the given arguments
|
ls is implemented for windows via glob
|
diff --git a/setuptools/dist.py b/setuptools/dist.py
index <HASH>..<HASH> 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -276,6 +276,12 @@ class Distribution(_Distribution):
ver = packaging.version.Version(self.metadata.version)
normalized_version = str(ver)
if self.metadata.version != normalized_version:
+ warnings.warn(
+ "Normalizing '%s' to '%s'" % (
+ self.metadata.version,
+ normalized_version,
+ )
+ )
self.metadata.version = normalized_version
except (packaging.version.InvalidVersion, TypeError):
warnings.warn(
|
soften normalized version warning
indicate that normalization is happening, but don't be pushy about changing valid versions.
--HG--
branch : no-normalize-warning
|
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/timemachine_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/timemachine_controller.rb
index <HASH>..<HASH> 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/timemachine_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/timemachine_controller.rb
@@ -149,15 +149,22 @@ class Api::TimemachineController < Api::ApiController
xml.snapshots do
snapshots.each do |snapshot|
- snapshot_to_xml(xml, snapshot, measures_by_sid[snapshot.id])
+ snapshot_to_xml(xml, snapshot, measures_by_sid[snapshot.id], metric_keys)
end
end
end
- def snapshot_to_xml(xml, snapshot, measures)
+ def snapshot_to_xml(xml, snapshot, measures, metric_keys)
+ values_by_key = {}
+ measures.each do |measure|
+ values_by_key[measure.metric.name] = measure.value.to_f if measure.value
+ end
+
xml.snapshot do
xml.date(format_datetime(snapshot.created_at))
- # TODO measures
+ metric_keys.each do |metric|
+ xml.measure(values_by_key[metric])
+ end
end
end
|
SONAR-<I>: New Web Service to get history of measures (time machine)
|
diff --git a/res/tiles/plato.js b/res/tiles/plato.js
index <HASH>..<HASH> 100644
--- a/res/tiles/plato.js
+++ b/res/tiles/plato.js
@@ -7,7 +7,8 @@ gpf.require.define({
}, function (require) {
"use strict";
- var dom = require.dom,
+ var HTTP_NOTFOUND = 404,
+ dom = require.dom,
metrics = require.config.metrics;
return gpf.define({
@@ -22,7 +23,7 @@ gpf.require.define({
getDynamicContent: function () {
return gpf.http.get("/tmp/plato/report.json")
.then(function (response) {
- if (response.status === 404) {
+ if (response.status === HTTP_NOTFOUND) {
return [];
}
return JSON.parse(response.responseText);
|
no-magic-numbers (#<I>)
|
diff --git a/lib/transpec/syntax/method_stub.rb b/lib/transpec/syntax/method_stub.rb
index <HASH>..<HASH> 100644
--- a/lib/transpec/syntax/method_stub.rb
+++ b/lib/transpec/syntax/method_stub.rb
@@ -69,15 +69,7 @@ module Transpec
end
def build_allow_expression(message_node, return_value_node = nil, keep_form_around_arg = true)
- expression = ''
-
- expression << if any_instance?
- class_source = class_node_of_any_instance.loc.expression.source
- "allow_any_instance_of(#{class_source})"
- else
- "allow(#{subject_range.source})"
- end
-
+ expression = allow_source
expression << range_in_between_subject_and_selector.source
expression << 'to receive'
expression << (keep_form_around_arg ? range_in_between_selector_and_arg.source : '(')
@@ -92,6 +84,15 @@ module Transpec
expression
end
+ def allow_source
+ if any_instance?
+ class_source = class_node_of_any_instance.loc.expression.source
+ "allow_any_instance_of(#{class_source})"
+ else
+ "allow(#{subject_range.source})"
+ end
+ end
+
def message_source(node)
message_source = node.loc.expression.source
message_source.prepend(':') if node.type == :sym && !message_source.start_with?(':')
|
Refactor MethodStub#build_allow_expression
|
diff --git a/kerncraft/models/ecm.py b/kerncraft/models/ecm.py
index <HASH>..<HASH> 100755
--- a/kerncraft/models/ecm.py
+++ b/kerncraft/models/ecm.py
@@ -556,14 +556,19 @@ class ECMCPU:
cl_latency = block_latency*block_to_cl_ratio
# Compile most relevant information
- if self._args.latency:
- T_OL = cl_latency
- else:
- T_OL = max(
- [v for k, v in port_cycles.items() if k in self.machine['overlapping ports']])
+ T_OL = max(
+ [v for k, v in port_cycles.items() if k in self.machine['overlapping ports']])
T_nOL = max(
[v for k, v in port_cycles.items() if k in self.machine['non-overlapping ports']])
+ # Use IACA throughput prediction if it is slower then T_nOL
+ if T_nOL < cl_throughput:
+ T_OL = cl_throughput
+
+ # Use latency if requested
+ if self._args.latency:
+ T_OL = cl_latency
+
# Create result dictionary
self.results = {
'port cycles': port_cycles,
|
using IACA throughput if it is slower then T_nOL
|
diff --git a/DM_IO/dm3_image_utils.py b/DM_IO/dm3_image_utils.py
index <HASH>..<HASH> 100644
--- a/DM_IO/dm3_image_utils.py
+++ b/DM_IO/dm3_image_utils.py
@@ -255,7 +255,7 @@ def save_image(data, dimensional_calibrations, intensity_calibration, metadata,
timezone_str = " " + timezone_str if timezone_str is not None else ""
date_str = modified.strftime("%x")
time_str = modified.strftime("%X") + timezone_str
- ret["ImageSourceList"] = {"Acquisition Date": date_str, "Acquisition Time": time_str}
+ ret["DataBar"] = {"Acquisition Date": date_str, "Acquisition Time": time_str}
# I think ImageSource list creates a mapping between ImageSourceIds and Images
ret["ImageSourceList"] = [{"ClassName": "ImageSource:Simple", "Id": [0], "ImageRef": 0}]
# I think this lists the sources for the DocumentObjectlist. The source number is not
|
Ugh. Wrong tag. Fixed.
|
diff --git a/lib/gli/commands/help_modules/full_synopsis_formatter.rb b/lib/gli/commands/help_modules/full_synopsis_formatter.rb
index <HASH>..<HASH> 100644
--- a/lib/gli/commands/help_modules/full_synopsis_formatter.rb
+++ b/lib/gli/commands/help_modules/full_synopsis_formatter.rb
@@ -27,10 +27,11 @@ module GLI
def sub_options_doc(sub_options)
sub_options_doc = sub_options.map { |_,option|
- option.names_and_aliases.map { |name|
+ doc = option.names_and_aliases.map { |name|
CommandLineOption.name_as_string(name,false) + (option.kind_of?(Flag) ? " #{option.argument_name }" : '')
}.join('|')
- }.map { |invocations| "[#{invocations}]" }.sort.join(' ').strip
+ option.required?? doc : "[#{doc}]"
+ }.sort.join(' ').strip
end
private
|
Don't mark required options with brackets in full synopsis
|
diff --git a/pythonforandroid/toolchain.py b/pythonforandroid/toolchain.py
index <HASH>..<HASH> 100644
--- a/pythonforandroid/toolchain.py
+++ b/pythonforandroid/toolchain.py
@@ -467,6 +467,10 @@ class ToolchainCL(object):
self.args = args
+ if args.subparser_name is None:
+ parser.print_help()
+ exit(1)
+
setup_color(args.color)
if args.debug:
|
Added command handling if p4a is run with no arguments
|
diff --git a/tests/UrlTest.php b/tests/UrlTest.php
index <HASH>..<HASH> 100644
--- a/tests/UrlTest.php
+++ b/tests/UrlTest.php
@@ -154,7 +154,7 @@ class UrlTest extends TestCase
/** @var Url $new */
$new = $url->$method($value);
- $this->assertSame($psr2, $new->getUri());
+ $this->assertSame($psr2, $new->psr());
}
/**
|
Fix deprecated getUri() method usage.
|
diff --git a/src/Uuid/IUuidGenerator.php b/src/Uuid/IUuidGenerator.php
index <HASH>..<HASH> 100644
--- a/src/Uuid/IUuidGenerator.php
+++ b/src/Uuid/IUuidGenerator.php
@@ -40,5 +40,5 @@ interface IUuidGenerator {
*
* @return String Valid v5 UUID.
*/
- public function generateV5($str, $namespace = NULL);
+ public function generateV5($name, $namespace = NULL);
}
|
Why am I changing the variable name in the interface?
|
diff --git a/modeltranslation/tests/__init__.py b/modeltranslation/tests/__init__.py
index <HASH>..<HASH> 100644
--- a/modeltranslation/tests/__init__.py
+++ b/modeltranslation/tests/__init__.py
@@ -1549,6 +1549,21 @@ class TranslationAdminTest(ModeltranslationTestBase):
for field, css in fields.items():
self.assertEqual(build_css_class(field), css)
+ def test_multitable_inheritance(self):
+ class MultitableModelAAdmin(admin.TranslationAdmin):
+ pass
+
+ class MultitableModelBAdmin(admin.TranslationAdmin):
+ pass
+
+ maa = MultitableModelAAdmin(models.MultitableModelA, self.site)
+ mab = MultitableModelBAdmin(models.MultitableModelB, self.site)
+
+ self.assertEqual(maa.get_form(request).base_fields.keys(),
+ ['titlea_de', 'titlea_en'])
+ self.assertEqual(mab.get_form(request).base_fields.keys(),
+ ['titlea_de', 'titlea_en', 'titleb_de', 'titleb_en'])
+
class TestManager(ModeltranslationTestBase):
def setUp(self):
|
Added admin test for multitable inheritance to verify that issue #<I> was resolved by pull request #<I>.
|
diff --git a/src/main/java/reactor/ipc/netty/channel/PooledClientContextHandler.java b/src/main/java/reactor/ipc/netty/channel/PooledClientContextHandler.java
index <HASH>..<HASH> 100644
--- a/src/main/java/reactor/ipc/netty/channel/PooledClientContextHandler.java
+++ b/src/main/java/reactor/ipc/netty/channel/PooledClientContextHandler.java
@@ -266,12 +266,10 @@ final class PooledClientContextHandler<CHANNEL extends Channel>
pool.release(c)
.addListener(f -> {
- if (f.isSuccess()) {
- onReleaseEmitter.onComplete();
- }
- else {
- onReleaseEmitter.onError(f.cause());
- }
+ if (log.isDebugEnabled() && !f.isSuccess()){
+ log.debug("Failed cleaning the channel from pool", f.cause());
+ }
+ onReleaseEmitter.onComplete();
});
}
|
Fix IllegalArgumentException: Channel [...] was not acquired from this ChannelPool
|
diff --git a/server.go b/server.go
index <HASH>..<HASH> 100644
--- a/server.go
+++ b/server.go
@@ -132,6 +132,16 @@ type Server struct {
// By default unlimited number of requests served per connection.
MaxRequestsPerConn int
+ // Aggressively reduces memory usage at the cost of higher CPU usage
+ // if set to true.
+ //
+ // Try enabling this option only if the server consumes too much memory
+ // serving mostly idle keep-alive connections. This may reduce memory
+ // usage by up to 50%.
+ //
+ // Aggressive memory usage reduction is disabled by default.
+ ReduceMemoryUsage bool
+
// Logger, which is used by RequestCtx.Logger().
//
// By default standard logger from log package is used.
@@ -693,7 +703,7 @@ func (s *Server) serveConn(c net.Conn) error {
break
}
}
- if ctx.lastReadDuration < time.Second || br != nil {
+ if !(s.ReduceMemoryUsage || ctx.lastReadDuration > time.Second) || br != nil {
if br == nil {
br = acquireReader(ctx)
}
|
Added ReduceMemoryUsage option to Server
|
diff --git a/src/Core/Config.php b/src/Core/Config.php
index <HASH>..<HASH> 100644
--- a/src/Core/Config.php
+++ b/src/Core/Config.php
@@ -97,7 +97,13 @@ class Config {
return $this->loaded[ $filename ];
}
- $contents = file_get_contents( $this->path . 'config/' . $filename . '.json' );
+ $config = $this->path . 'config/' . $filename . '.json';
+
+ if ( ! file_exists( $config ) ) {
+ return null;
+ }
+
+ $contents = file_get_contents( $config );
if ( false === $contents ) {
return null;
|
Better handling of potentially null config file
Check if the file exists first before loading.
|
diff --git a/ugali/observation/mask.py b/ugali/observation/mask.py
index <HASH>..<HASH> 100644
--- a/ugali/observation/mask.py
+++ b/ugali/observation/mask.py
@@ -223,7 +223,7 @@ class Mask:
if method == 'step':
func = lambda delta: (delta > 0).astype(float)
elif method == 'erf':
- # Trust the ERD???
+ # Trust the SDSS EDR???
# 95% completeness:
def func(delta):
# Efficiency at bright end (assumed to be 100%)
@@ -232,6 +232,14 @@ class Mask:
width = 0.2
# This should be the halfway point in the curve
return (e/2.0)*(1/np.sqrt(2*width))*(np.sqrt(2*width)-scipy.special.erf(-delta))
+ elif method = 'flemming':
+ # Functional form taken from Fleming et al. AJ 109, 1044 (1995)
+ # http://adsabs.harvard.edu/abs/1995AJ....109.1044F
+ # f = 1/2 [1 - alpha(V - Vlim)/sqrt(1 + alpha^2 (V - Vlim)^2)]
+ # CAREFUL: This definition is for Vlim = 50% completeness
+ def func(delta):
+ alpha = 2.0
+ return 0.5 * (1 - (alpha * delta)/np.sqrt(1+alpha**2 * delta**2))
else:
raise Exception('...')
return func(delta)
|
Added Flemming completeness function
|
diff --git a/src/Vinelab/Minion/Client.php b/src/Vinelab/Minion/Client.php
index <HASH>..<HASH> 100644
--- a/src/Vinelab/Minion/Client.php
+++ b/src/Vinelab/Minion/Client.php
@@ -60,4 +60,13 @@ class Client extends \Thruway\Peer\Client {
}
}
}
+
+ /**
+ * Start the transport
+ *
+ * @return void
+ */
+ public function start()
+ {
+ }
}
|
override the client's start method
|
diff --git a/lib/svtplay/service/urplay.py b/lib/svtplay/service/urplay.py
index <HASH>..<HASH> 100644
--- a/lib/svtplay/service/urplay.py
+++ b/lib/svtplay/service/urplay.py
@@ -11,7 +11,7 @@ from svtplay.hls import download_hls
class Urplay():
def handle(self, url):
- return "urplay.se" in url
+ return ("urplay.se" in url) or ("ur.se" in url)
def get(self, options, url):
data = get_http_data(url)
|
urplay: adding support for ur.se
|
diff --git a/nearley-make.js b/nearley-make.js
index <HASH>..<HASH> 100644
--- a/nearley-make.js
+++ b/nearley-make.js
@@ -1,6 +1,5 @@
'use strict'
-const fs = require('fs')
const nearley = require('nearley')
const nearleyg = require('nearley/lib/nearley-language-bootstrapped.js')
const nearleyc = require('nearley/lib/compile.js')
@@ -39,4 +38,4 @@ module.exports = function nearleyMake(grammar, args) {
parser = new nearley.Parser(grammar.ParserRules, grammar.ParserStart)
return parser
-}
\ No newline at end of file
+}
|
Remove unused require('fs') call (resolves #4)
|
diff --git a/jest-common/src/test/java/io/searchbox/client/JestResultTest.java b/jest-common/src/test/java/io/searchbox/client/JestResultTest.java
index <HASH>..<HASH> 100644
--- a/jest-common/src/test/java/io/searchbox/client/JestResultTest.java
+++ b/jest-common/src/test/java/io/searchbox/client/JestResultTest.java
@@ -88,7 +88,7 @@ public class JestResultTest {
result.setPathToResult("_source");
result.setSucceeded(true);
- Comment actual = result.getSourceAsObject(Comment.class);
+ SimpleComment actual = result.getSourceAsObject(SimpleComment.class);
assertNotNull(actual);
assertEquals(new Long(Integer.MAX_VALUE + 10l), actual.getSomeIdName());
@@ -577,4 +577,27 @@ public class JestResultTest {
}
}
+ class SimpleComment {
+
+ @JestId
+ Long someIdName;
+
+ String message;
+
+ public Long getSomeIdName() {
+ return someIdName;
+ }
+
+ public void setSomeIdName(Long someIdName) {
+ this.someIdName = someIdName;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+ }
}
|
ensure raw class works as well with meta annotations
|
diff --git a/elasticmock/fake_elasticsearch.py b/elasticmock/fake_elasticsearch.py
index <HASH>..<HASH> 100644
--- a/elasticmock/fake_elasticsearch.py
+++ b/elasticmock/fake_elasticsearch.py
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
import json
+import sys
from elasticsearch import Elasticsearch
from elasticsearch.client.utils import query_params
@@ -9,6 +10,11 @@ from elasticsearch.exceptions import NotFoundError
from elasticmock.utilities import get_random_id
+PY3 = sys.version_info[0] == 3
+if PY3:
+ unicode = str
+
+
class FakeElasticsearch(Elasticsearch):
__documents_dict = None
|
Make FakeElasticsearch work with modern python 3
As unicode() is not there anymore
|
diff --git a/alib/src/main/java/net/darkmist/alib/str/URLEscape.java b/alib/src/main/java/net/darkmist/alib/str/URLEscape.java
index <HASH>..<HASH> 100644
--- a/alib/src/main/java/net/darkmist/alib/str/URLEscape.java
+++ b/alib/src/main/java/net/darkmist/alib/str/URLEscape.java
@@ -1,7 +1,5 @@
package net.darkmist.alib.str;
-// never in qcomm
-
import java.io.UnsupportedEncodingException;
import org.apache.commons.logging.Log;
|
remove never in qcomm comment
|
diff --git a/src/main/java/org/apache/accumulo/accismus/api/mapreduce/AccismusInputFormat.java b/src/main/java/org/apache/accumulo/accismus/api/mapreduce/AccismusInputFormat.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/apache/accumulo/accismus/api/mapreduce/AccismusInputFormat.java
+++ b/src/main/java/org/apache/accumulo/accismus/api/mapreduce/AccismusInputFormat.java
@@ -30,8 +30,8 @@ import org.apache.accumulo.accismus.api.config.AccismusProperties;
import org.apache.accumulo.accismus.impl.Configuration;
import org.apache.accumulo.accismus.impl.OracleClient;
import org.apache.accumulo.accismus.impl.TransactionImpl;
+import org.apache.accumulo.core.client.mapreduce.AbstractInputFormat.RangeInputSplit;
import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat;
-import org.apache.accumulo.core.client.mapreduce.InputFormatBase.RangeInputSplit;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
import org.apache.accumulo.core.data.ArrayByteSequence;
import org.apache.accumulo.core.data.ByteSequence;
|
Make compile against latest <I>-SNAPSHOT
|
diff --git a/src/CoreBundle/EventListener/DcGeneral/Table/AbstractPaletteRestrictionListener.php b/src/CoreBundle/EventListener/DcGeneral/Table/AbstractPaletteRestrictionListener.php
index <HASH>..<HASH> 100644
--- a/src/CoreBundle/EventListener/DcGeneral/Table/AbstractPaletteRestrictionListener.php
+++ b/src/CoreBundle/EventListener/DcGeneral/Table/AbstractPaletteRestrictionListener.php
@@ -12,6 +12,7 @@
*
* @package MetaModels/core
* @author Christian Schiffler <c.schiffler@cyberspectrum.de>
+ * @author David Molineus <david.molineus@netzmacht.de>
* @copyright 2012-2019 The MetaModels team.
* @license https://github.com/MetaModels/core/blob/master/LICENSE LGPL-3.0-or-later
* @filesource
@@ -47,6 +48,10 @@ class AbstractPaletteRestrictionListener
*/
protected function getLegend($name, $palette, $prevLegend = null)
{
+ if (strpos($name, '+') === 0) {
+ $name = substr($name, 1);
+ }
+
if (!$palette->hasLegend($name)) {
$palette->addLegend(new Legend($name), $prevLegend);
}
|
Check if legend name starts with an + sign to fix #<I>
|
diff --git a/test/rake_test_setup.rb b/test/rake_test_setup.rb
index <HASH>..<HASH> 100644
--- a/test/rake_test_setup.rb
+++ b/test/rake_test_setup.rb
@@ -18,25 +18,7 @@ if RUBY_VERSION >= "1.9.0"
end
module TestMethods
- if RUBY_VERSION >= "1.9.0"
- def assert_no_match(expected_pattern, actual, msg=nil)
- refute_match(expected_pattern, actual, msg)
- end
- def assert_not_equal(expected, actual, msg=nil)
- refute_equal(expected, actual, msg)
- end
- def assert_nothing_raised
- yield
- end
- def assert_not_nil(actual, msg=nil)
- refute_nil(actual, msg)
- end
- def assert_exception(ex, msg=nil, &block)
- assert_raises(ex, msg, &block)
- end
- elsif RUBY_VERSION >= "1.8.0"
- def assert_exception(ex, msg=nil, &block)
- assert_raise(ex, msg, &block)
- end
+ def assert_exception(ex, msg=nil, &block)
+ assert_raise(ex, msg, &block)
end
end
|
modified to work with revert of mini/test
|
diff --git a/classes/fields/pick.php b/classes/fields/pick.php
index <HASH>..<HASH> 100644
--- a/classes/fields/pick.php
+++ b/classes/fields/pick.php
@@ -176,7 +176,7 @@ class PodsField_Pick extends PodsField {
'dropdown' => __( 'Drop Down', 'pods' ),
'radio' => __( 'Radio Buttons', 'pods' ),
'autocomplete' => __( 'Autocomplete', 'pods' ),
- 'list' => __( 'List View (with reordering)', 'pods' ),
+ 'list' => __( 'List View (single value)', 'pods' ),
] ),
'pick_show_select_text' => 0,
'dependency' => true,
@@ -187,7 +187,7 @@ class PodsField_Pick extends PodsField {
'depends-on' => [
static::$type . '_format_type' => 'multi',
],
- 'default' => 'checkbox',
+ 'default' => 'list',
'required' => true,
'type' => 'pick',
'data' => apply_filters( 'pods_form_ui_field_pick_format_multi_options', [
|
Set default relationship multi input as list view
|
diff --git a/src/adapt/layout.js b/src/adapt/layout.js
index <HASH>..<HASH> 100644
--- a/src/adapt/layout.js
+++ b/src/adapt/layout.js
@@ -2097,6 +2097,9 @@ adapt.layout.Column.prototype.saveEdgeAndCheckForOverflow = function(nodeContext
if (!nodeContext) {
return false;
}
+ if (this.isOrphan(nodeContext.viewNode)) {
+ return false;
+ }
var edge = adapt.layout.calculateEdge(nodeContext, this.clientLayout, 0, this.vertical);
var fc = nodeContext.after ?
(nodeContext.parent && nodeContext.parent.formattingContext) : nodeContext.formattingContext;
@@ -2195,6 +2198,17 @@ adapt.layout.Column.prototype.isBFC = function(formattingContext) {
};
/**
+ * @param {Node} node
+ * @return {boolean}
+ */
+adapt.layout.Column.prototype.isOrphan = function(node) {
+ while( node ) {
+ if (node.parentNode === node.ownerDocument) return false;
+ node = node.parentNode;
+ }
+ return true;
+}
+/**
* Skips positions until either the start of unbreakable block or inline content.
* Also sets breakBefore on the result combining break-before and break-after
* properties from all elements that meet at the edge.
|
Fix bug where incorrect page breaking was done at the beginning of the table when `writing-mode: vertical`
- Calling `Column#saveEdgeAndCheckForOverflow` with an element deleted by the mechanism of `TableLayoutStrategy.ignoreList` causes edge to be 0, so it was always judged as overflow in the vertical writing mode.
|
diff --git a/lib/processMultipart.js b/lib/processMultipart.js
index <HASH>..<HASH> 100644
--- a/lib/processMultipart.js
+++ b/lib/processMultipart.js
@@ -60,7 +60,8 @@ module.exports = (options, req, res, next) => {
const writePromise = options.useTempFiles
? getWritePromise().catch(err => {
- uploadTimer.clear();
+ req.unpipe(busboy);
+ req.resume();
cleanup();
next(err);
}) : getWritePromise();
|
Fixes richardgirges/express-fileupload#<I>. Unpipe busboy after error and skip further stream processing.
|
diff --git a/hazelcast/src/test/java/com/hazelcast/map/impl/mapstore/writebehind/WriteBehindFlushTest.java b/hazelcast/src/test/java/com/hazelcast/map/impl/mapstore/writebehind/WriteBehindFlushTest.java
index <HASH>..<HASH> 100644
--- a/hazelcast/src/test/java/com/hazelcast/map/impl/mapstore/writebehind/WriteBehindFlushTest.java
+++ b/hazelcast/src/test/java/com/hazelcast/map/impl/mapstore/writebehind/WriteBehindFlushTest.java
@@ -72,7 +72,7 @@ public class WriteBehindFlushTest extends HazelcastTestSupport {
.mapName(mapName)
.withMapStore(mapStore)
.withNodeCount(nodeCount)
- .withBackupCount(2)
+ .withBackupCount(1)
.withConfig(getConfig())
.withNodeFactory(factory)
.withWriteDelaySeconds(300);
|
Fixes test by decreasing backup count
|
diff --git a/core/src/test/java/com/orientechnologies/common/collection/OMVRBTreeCompositeTest.java b/core/src/test/java/com/orientechnologies/common/collection/OMVRBTreeCompositeTest.java
index <HASH>..<HASH> 100644
--- a/core/src/test/java/com/orientechnologies/common/collection/OMVRBTreeCompositeTest.java
+++ b/core/src/test/java/com/orientechnologies/common/collection/OMVRBTreeCompositeTest.java
@@ -543,9 +543,7 @@ public class OMVRBTreeCompositeTest {
assertEquals(entry.getKey(), compositeKey(2.0, 9.0));
}
- @SuppressWarnings("unchecked")
private OCompositeKey compositeKey(Comparable<?>... params) {
- return new OCompositeKey((List<? extends Comparable<OCompositeKey>>) Arrays.asList(params));
+ return new OCompositeKey((List<Comparable<?>>) Arrays.asList(params));
}
-
}
|
Resolved last compilation problem with Javac (Eclipse compiled)
|
diff --git a/src/core/lombok/javac/apt/LombokFileObjects.java b/src/core/lombok/javac/apt/LombokFileObjects.java
index <HASH>..<HASH> 100644
--- a/src/core/lombok/javac/apt/LombokFileObjects.java
+++ b/src/core/lombok/javac/apt/LombokFileObjects.java
@@ -116,7 +116,15 @@ final class LombokFileObjects {
if (Class.forName("com.sun.tools.javac.util.BaseFileObject") == null) throw new NullPointerException();
return Compiler.JAVAC6;
} catch (Exception e) {}
- return null;
+
+ StringBuilder sb = new StringBuilder(jfmClassName);
+ if (jfm != null) {
+ sb.append(" extends ").append(jfm.getClass().getSuperclass().getName());
+ for (Class<?> cls : jfm.getClass().getInterfaces()) {
+ sb.append(" implements ").append(cls.getName());
+ }
+ }
+ throw new IllegalArgumentException(sb.toString());
}
static JavaFileObject createEmpty(Compiler compiler, String name, Kind kind) {
|
[jdk9] added debugging information for when we cannot determine the compiler
|
diff --git a/config.js b/config.js
index <HASH>..<HASH> 100644
--- a/config.js
+++ b/config.js
@@ -146,53 +146,6 @@ module.exports = {
},
// Custom indicator of vendor service.
isSauceLabs: true
- },
- "safari7-mac": {
- desiredCapabilities: {
- browserName: "safari",
- platform: "OS X 10.9",
- version: "7"
- }
- },
- "chrome-win7": {
- desiredCapabilities: {
- browserName: "chrome",
- platform: "Windows 7"
- }
- },
- "firefox-win7": {
- desiredCapabilities: {
- browserName: "firefox",
- platform: "Windows 7"
- }
- },
- "ie8-winxp": {
- desiredCapabilities: {
- browserName: "internet explorer",
- platform: "Windows XP",
- version: "8"
- }
- },
- "ie9-win7": {
- desiredCapabilities: {
- browserName: "internet explorer",
- platform: "Windows 7",
- version: "9"
- }
- },
- "ie10-win7": {
- desiredCapabilities: {
- browserName: "internet explorer",
- platform: "Windows 7",
- version: "10"
- }
- },
- "ie11-win8": {
- desiredCapabilities: {
- browserName: "internet explorer",
- platform: "Windows 8.1",
- version: "11"
- }
}
},
|
Removing unneeded sauce definitions from config.js
|
diff --git a/yandextank/plugins/Monitoring/agent/agent.py b/yandextank/plugins/Monitoring/agent/agent.py
index <HASH>..<HASH> 100755
--- a/yandextank/plugins/Monitoring/agent/agent.py
+++ b/yandextank/plugins/Monitoring/agent/agent.py
@@ -82,8 +82,8 @@ class CpuStat(AbstractMetric):
# TODO: change to simple file reading
output = subprocess.Popen('cat /proc/stat | grep -E "^(ctxt|intr|cpu) "',
shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- except Exception, exc:
- logger.error("Problems running popen", traceback.format_exc(exc))
+ except Exception:
+ logger.exception("Problems running popen")
result.append([empty] * 9)
else:
err = output.stderr.read()
@@ -147,8 +147,8 @@ class CpuStat(AbstractMetric):
for cmd2 in command:
try:
output = subprocess.Popen(cmd2, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- except Exception, exc:
- logger.error("Problems running popen", traceback.format_exc(exc))
+ except Exception:
+ logger.exception("Problems running popen")
result.append(empty)
else:
err = output.stderr.read()
|
log exceptions in pythonic way
|
diff --git a/yfinance/utils.py b/yfinance/utils.py
index <HASH>..<HASH> 100644
--- a/yfinance/utils.py
+++ b/yfinance/utils.py
@@ -64,7 +64,7 @@ def get_json(url, proxy=None):
def camel2title(o):
- return [_re.sub("([a-z])([A-Z])", "\g<1> \g<2>", i).title() for i in o]
+ return [_re.sub("([a-z])([A-Z])", r"\g<1> \g<2>", i).title() for i in o]
def auto_adjust(data):
|
Fix deprecation warnings due to invalid escape sequences.
|
diff --git a/src/main/java/graphql/execution/instrumentation/tracing/TracingInstrumentation.java b/src/main/java/graphql/execution/instrumentation/tracing/TracingInstrumentation.java
index <HASH>..<HASH> 100644
--- a/src/main/java/graphql/execution/instrumentation/tracing/TracingInstrumentation.java
+++ b/src/main/java/graphql/execution/instrumentation/tracing/TracingInstrumentation.java
@@ -77,10 +77,10 @@ public class TracingInstrumentation extends SimpleInstrumentation {
Map<Object, Object> currentExt = executionResult.getExtensions();
TracingSupport tracingSupport = parameters.getInstrumentationState();
- Map<Object, Object> tracingMap = new LinkedHashMap<>(currentExt == null ? Collections.emptyMap() : currentExt);
- tracingMap.put("tracing", tracingSupport.snapshotTracingData());
+ Map<Object, Object> withTracingExt = new LinkedHashMap<>(currentExt == null ? Collections.emptyMap() : currentExt);
+ withTracingExt.put("tracing", tracingSupport.snapshotTracingData());
- return CompletableFuture.completedFuture(new ExecutionResultImpl(executionResult.getData(), executionResult.getErrors(), tracingMap));
+ return CompletableFuture.completedFuture(new ExecutionResultImpl(executionResult.getData(), executionResult.getErrors(), withTracingExt));
}
@Override
|
minor fix (#<I>)
|
diff --git a/closure/goog/fx/dragger.js b/closure/goog/fx/dragger.js
index <HASH>..<HASH> 100644
--- a/closure/goog/fx/dragger.js
+++ b/closure/goog/fx/dragger.js
@@ -209,14 +209,14 @@ goog.tagUnsealableClass(goog.fx.Dragger);
/**
* Whether setCapture is supported by the browser.
- * IE and Gecko after 1.9.3 has setCapture.
- * Microsoft Edge doesn't have setCapture.
- * WebKit does not yet: https://bugs.webkit.org/show_bug.cgi?id=27330.
* @type {boolean}
* @private
*/
goog.fx.Dragger.HAS_SET_CAPTURE_ =
- goog.global.document.documentElement.setCapture != null;
+ // IE and Gecko after 1.9.3 has setCapture
+ // WebKit does not yet: https://bugs.webkit.org/show_bug.cgi?id=27330
+ goog.userAgent.IE ||
+ goog.userAgent.GECKO && goog.userAgent.isVersionOrHigher('1.9.3');
/**
|
Automated g4 rollback of changelist <I>.
*** Reason for rollback ***
Broke headless tests
*** Original change description ***
Merge pull request #<I> from Znegl/bugfix-dragger-setcapture
Fixed IE Edge bug in goog.fx.Dragger
-------------
Created by MOE: <URL>
|
diff --git a/spec/bitbucket_rest_api/core_ext/hash_spec.rb b/spec/bitbucket_rest_api/core_ext/hash_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/bitbucket_rest_api/core_ext/hash_spec.rb
+++ b/spec/bitbucket_rest_api/core_ext/hash_spec.rb
@@ -25,6 +25,9 @@ describe Hash do
it 'should convert nested keys to symbols' do
expect(@nested_hash.symbolize_keys!).to eq @symbols
+
+ @nested_hash_with_array = { 'a' => { 'b' => [{'c' => 1}] } }
+ expect(@nested_hash_with_array.symbolize_keys!).to eq({:a=>{:b=>[{:c=>1}]}})
end
end
|
test symbolize_keys! when value is array in hash_spec
|
diff --git a/mqlight/src/main/java/com/ibm/mqlight/api/impl/SubscriptionTopic.java b/mqlight/src/main/java/com/ibm/mqlight/api/impl/SubscriptionTopic.java
index <HASH>..<HASH> 100644
--- a/mqlight/src/main/java/com/ibm/mqlight/api/impl/SubscriptionTopic.java
+++ b/mqlight/src/main/java/com/ibm/mqlight/api/impl/SubscriptionTopic.java
@@ -59,7 +59,7 @@ public class SubscriptionTopic {
return topic;
}
- public String[] crack() {
+ public String[] split() {
final String methodName = "crack";
logger.entry(methodName);
|
fix compilation issue with misnamed method SubscriptionTopic.crack should be split
|
diff --git a/lib/tern.js b/lib/tern.js
index <HASH>..<HASH> 100644
--- a/lib/tern.js
+++ b/lib/tern.js
@@ -453,7 +453,8 @@
if (query.end == null) throw new Error("missing .query.end field");
var wordStart = resolvePos(file, query.end), wordEnd = wordStart, text = file.text;
while (wordStart && /\w$/.test(text.charAt(wordStart - 1))) --wordStart;
- while (wordEnd < text.length && /\w$/.test(text.charAt(wordEnd))) ++wordEnd;
+ if (query.expandWordForward !== false)
+ while (wordEnd < text.length && /\w$/.test(text.charAt(wordEnd))) ++wordEnd;
var word = text.slice(wordStart, wordEnd), completions = [];
var wrapAsObjs = query.types || query.depths || query.docs || query.urls || query.origins;
|
Add expandWordForward option to completions query interface
Issue #<I>
|
diff --git a/blog/edit_form.php b/blog/edit_form.php
index <HASH>..<HASH> 100644
--- a/blog/edit_form.php
+++ b/blog/edit_form.php
@@ -38,11 +38,12 @@ class blog_edit_form extends moodleform {
$mform->addElement('header', 'general', get_string('general', 'form'));
- $mform->addElement('text', 'subject', get_string('entrytitle', 'blog'), 'size="60"');
+ $mform->addElement('text', 'subject', get_string('entrytitle', 'blog'), array('size' => 60, 'maxlength' => 128));
$mform->addElement('editor', 'summary_editor', get_string('entrybody', 'blog'), null, $summaryoptions);
$mform->setType('subject', PARAM_TEXT);
$mform->addRule('subject', get_string('emptytitle', 'blog'), 'required', null, 'client');
+ $mform->addRule('subject', get_string('maximumchars', '', 128), 'maxlength', 128, 'client');
$mform->setType('summary_editor', PARAM_RAW);
$mform->addRule('summary_editor', get_string('emptybody', 'blog'), 'required', null, 'client');
|
MDL-<I> Blog: Added maxlength rule to subject field
|
diff --git a/docs/source/conf.py b/docs/source/conf.py
index <HASH>..<HASH> 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -55,9 +55,9 @@ author = u'Osvaldo Santana Neto'
# built documents.
#
# The short X.Y version.
-version = '0.3.2'
+version = '0.3.3'
# The full version, including alpha/beta/rc tags.
-release = '0.3.2'
+release = '0.3.3'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
|
Fix release number at conf.py
|
diff --git a/packages/tyranid/src/express.js b/packages/tyranid/src/express.js
index <HASH>..<HASH> 100644
--- a/packages/tyranid/src/express.js
+++ b/packages/tyranid/src/express.js
@@ -79,7 +79,7 @@ class Serializer {
if (field.link) {
this.newline();
- this.file += 'link: "';
+ this.file += this.k('link') + ': "';
this.file += field.link.def.name;
this.file += '",';
}
|
work on compiling fields into Fields for fieldsFor()
|
diff --git a/lib/main.js b/lib/main.js
index <HASH>..<HASH> 100644
--- a/lib/main.js
+++ b/lib/main.js
@@ -241,6 +241,8 @@ function convertResource(data, dir, props, opts) {
let packageData = {
package_version: spec.version,
type: props.container_type,
+ // TRICKY: resource.modified_at comes from the format.modified_at in resource.formats.
+ // we assume this to have been normalized before hand.
modified_at: props.resource.modified_at,
content_mime_type: mimeType,
language: props.language,
@@ -412,12 +414,27 @@ function typeToMime(container_type) {
return 'application/ts+' + type;
}
+/**
+ * Reads the resource container info without opening it.
+ *
+ * @param container_path {string} path to the container archive or directory
+ * @returns {Promise.<{}>} the resource container info (package.json)
+ */
+function inspectContainer(container_path) {
+ return new Promise(function(resolve, reject) {
+ // TODO: look in the container and get the package info
+ throw new Error('Not implemented');
+ // return {};
+ });
+}
+
module.exports = {
load: loadContainer,
make: makeContainer,
open: openContainer,
close: closeContainer,
tools: {
+ inspect: inspectContainer,
convertResource: convertResource,
makeSlug: containerSlug,
mimeToType: mimeToType,
|
stubbed out inspecting a container
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.