diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/src/util-events.js b/src/util-events.js
index <HASH>..<HASH> 100644
--- a/src/util-events.js
+++ b/src/util-events.js
@@ -41,7 +41,7 @@ seajs.off = function(name, callback) {
// Emit event, firing all bound callbacks. Callbacks receive the same
// arguments as `emit` does, apart from the event name
var emit = seajs.emit = function(name, data) {
- var list = events[name], fn
+ var list = events[name]
if (list) {
// Copy callback lists to prevent modification
@@ -55,4 +55,3 @@ var emit = seajs.emit = function(name, data) {
return seajs
}
-
|
Delete unused var .
|
diff --git a/src/App.php b/src/App.php
index <HASH>..<HASH> 100644
--- a/src/App.php
+++ b/src/App.php
@@ -8,7 +8,6 @@ use Tuum\Web\ServiceInterface\RendererInterface;
use Tuum\Web\Stack\Stackable;
use Tuum\Web\Stack\StackableInterface;
use Tuum\Web\Stack\StackHandleInterface;
-use Tuum\Locator\Container;
class App implements ContainerInterface
{
@@ -21,7 +20,7 @@ class App implements ContainerInterface
const RENDER_ENGINE = 'view.engine';
/**
- * @var Container
+ * @var ContainerInterface
*/
public $container;
@@ -31,7 +30,7 @@ class App implements ContainerInterface
public $stack;
/**
- * @param Container $container
+ * @param ContainerInterface $container
*/
public function __construct($container)
{
@@ -39,7 +38,7 @@ class App implements ContainerInterface
}
/**
- * @param Container $container
+ * @param ContainerInterface $container
* @return static
*/
public static function forge($container)
|
use ContainerInterface as $container.
|
diff --git a/core/codegen/platform/src/main/java/org/overture/codegen/trans/patterns/PatternTrans.java b/core/codegen/platform/src/main/java/org/overture/codegen/trans/patterns/PatternTrans.java
index <HASH>..<HASH> 100644
--- a/core/codegen/platform/src/main/java/org/overture/codegen/trans/patterns/PatternTrans.java
+++ b/core/codegen/platform/src/main/java/org/overture/codegen/trans/patterns/PatternTrans.java
@@ -119,6 +119,14 @@ public class PatternTrans extends DepthFirstAnalysisAdaptor
{
return;
}
+
+ if (pattern instanceof AIgnorePatternCG)
+ {
+ AIdentifierPatternCG idPattern = getIdPattern(config.getIgnorePatternPrefix());
+ transAssistant.replaceNodeWith(node.getTarget(), idPattern);
+ transAssistant.replaceNodeWith(pattern, idPattern.clone());
+ return;
+ }
DeclarationTag tag = fetchTag(node);
|
Fix: missing handling of the ignore pattern for local pattern assignments
|
diff --git a/treeherder/webapp/graphql/schema.py b/treeherder/webapp/graphql/schema.py
index <HASH>..<HASH> 100644
--- a/treeherder/webapp/graphql/schema.py
+++ b/treeherder/webapp/graphql/schema.py
@@ -64,6 +64,11 @@ class FailureLineGraph(DjangoObjectType):
model = FailureLine
+class GroupGraph(DjangoObjectType):
+ class Meta:
+ model = Group
+
+
class ProductGraph(DjangoObjectType):
class Meta:
model = Product
|
Bug <I> - Add support for getting the FailureLine Group via GraphQL
|
diff --git a/src/app/actions/headers/peptable.py b/src/app/actions/headers/peptable.py
index <HASH>..<HASH> 100644
--- a/src/app/actions/headers/peptable.py
+++ b/src/app/actions/headers/peptable.py
@@ -39,7 +39,10 @@ def get_psm2pep_header(oldheader, isobq_pattern=False, precurqfield=False):
def get_linear_model_header(oldheader):
header = oldheader[:]
- ix = header.index(peptabledata.HEADER_PEP) + 1
+ try:
+ ix = header.index(peptabledata.HEADER_PEP) + 1
+ except ValueError:
+ ix = header.index(peptabledata.HEADER_QVAL) + 1
return header[:ix] + [peptabledata.HEADER_QVAL_MODELED] + header[ix:]
|
When inserting field in header, if PEP does not exist, use q-value
|
diff --git a/salt/modules/cron.py b/salt/modules/cron.py
index <HASH>..<HASH> 100644
--- a/salt/modules/cron.py
+++ b/salt/modules/cron.py
@@ -604,10 +604,10 @@ def rm_job(user,
if rm_ is not None:
lst['crons'].pop(rm_)
ret = 'removed'
- comdat = _write_cron_lines(user, _render_tab(lst))
- if comdat['retcode']:
- # Failed to commit, return the error
- return comdat['stderr']
+ comdat = _write_cron_lines(user, _render_tab(lst))
+ if comdat['retcode']:
+ # Failed to commit, return the error
+ return comdat['stderr']
return ret
rm = salt.utils.alias_function(rm_job, 'rm')
|
Don't create cron for cron.rm_job if no cron present for user
|
diff --git a/jira/client.py b/jira/client.py
index <HASH>..<HASH> 100644
--- a/jira/client.py
+++ b/jira/client.py
@@ -1755,9 +1755,15 @@ class JIRA:
try:
user_obj: User
if self._is_cloud:
- user_obj = self.search_users(query=user, maxResults=1)[0]
+ users = self.search_users(query=user, maxResults=20)
else:
- user_obj = self.search_users(user=user, maxResults=1)[0]
+ users = self.search_users(user=user, maxResults=20)
+
+ matches = []
+ if len(users) > 1:
+ matches = [u for u in users if self._get_user_identifier(u) == user]
+ user_obj = matches[0] if matches else users[0]
+
except Exception as e:
raise JIRAError(str(e))
return self._get_user_identifier(user_obj)
|
Locate the exact user by identifier if multiple users returned from query (#<I>)
|
diff --git a/tests/test_rpool.py b/tests/test_rpool.py
index <HASH>..<HASH> 100644
--- a/tests/test_rpool.py
+++ b/tests/test_rpool.py
@@ -108,9 +108,20 @@ def return_instance(cls):
def start_job(func, args):
pool = get_reusable_pool(processes=2)
- pool.apply(func, args)
- pool.terminate()
- pool.join()
+ try:
+ pool.apply(func, args)
+ except Exception as e:
+ # One should never call join before terminate: if the pool is broken,
+ # (AbortedWorkerError was raised) the cleanup mechanism should be
+ # triggered by the _worker_handler thread. Else we should call
+ # terminate explicitly
+ if not isinstance(e, AbortedWorkerError):
+ pool.terminate()
+ raise e
+ finally:
+ # _worker_handler thread is triggered every .1s
+ sleep(.2)
+ pool.join()
class SayWhenError(ValueError):
|
TST ensure that callback pool end cleanly
|
diff --git a/lib/fog/aws/models/ec2/snapshot.rb b/lib/fog/aws/models/ec2/snapshot.rb
index <HASH>..<HASH> 100644
--- a/lib/fog/aws/models/ec2/snapshot.rb
+++ b/lib/fog/aws/models/ec2/snapshot.rb
@@ -10,10 +10,13 @@ module Fog
identity :id, 'snapshotId'
+ attribute :description
attribute :progress
attribute :created_at, 'startTime'
+ attribute :owner_id, 'ownerId'
attribute :state, 'status'
attribute :volume_id, 'volumeId'
+ attribute :volume_size, 'volumeSize'
def destroy
requires :id
|
[ec2] update snapshot models to accept new attributes
|
diff --git a/lib/determine-basal/determine-basal.js b/lib/determine-basal/determine-basal.js
index <HASH>..<HASH> 100644
--- a/lib/determine-basal/determine-basal.js
+++ b/lib/determine-basal/determine-basal.js
@@ -374,10 +374,20 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
}
}
}
+
+ var minutes_running;
+ if (typeof currenttemp.duration == 'undefined' || currenttemp.duration == 0) {
+ minutes_running = 30;
+ } else if (typeof currenttemp.minutesrunning !== 'undefined'){
+ // If the time the current temp is running is not defined, use default request duration of 30 minutes.
+ minutes_running = currenttemp.minutesrunning;
+ } else {
+ minutes_running = 30 - currenttemp.duration;
+ }
// if there is a low-temp running, and eventualBG would be below min_bg without it, let it run
if (round_basal(currenttemp.rate, profile) < round_basal(basal, profile) ) {
- var lowtempimpact = (currenttemp.rate - basal) * (currenttemp.duration/60) * sens;
+ var lowtempimpact = (currenttemp.rate - basal) * ((30-minutes_running)/60) * sens;
var adjEventualBG = eventualBG + lowtempimpact;
if ( adjEventualBG < min_bg ) {
rT.reason += "letting low temp of " + currenttemp.rate + " run.";
|
lowtempimpact based on <I> minutes (#<I>)
* lowtempimpact based on <I> minutes
@Scott
* <I> as default for minutes_running
|
diff --git a/spec/javascripts/unit/transports/flash_transport_spec.js b/spec/javascripts/unit/transports/flash_transport_spec.js
index <HASH>..<HASH> 100644
--- a/spec/javascripts/unit/transports/flash_transport_spec.js
+++ b/spec/javascripts/unit/transports/flash_transport_spec.js
@@ -31,6 +31,10 @@ describe("FlashTransport", function() {
expect(this.transport.name).toEqual("flash");
});
+ it("should not support ping", function() {
+ expect(this.transport.supportsPing()).toBe(false);
+ });
+
it("should be supported only if Flash is present", function() {
var _mimeTypes = navigator.mimeTypes;
|
Test FlashTransport for ping support
|
diff --git a/packages/vaex-jupyter/vaex/jupyter/bqplot.py b/packages/vaex-jupyter/vaex/jupyter/bqplot.py
index <HASH>..<HASH> 100644
--- a/packages/vaex-jupyter/vaex/jupyter/bqplot.py
+++ b/packages/vaex-jupyter/vaex/jupyter/bqplot.py
@@ -51,6 +51,7 @@ class BqplotBackend(BackendBase):
margin = {'bottom': 30, 'left': 60, 'right': 0, 'top': 0}
self.figure = plt.figure(self.figure_key, fig=self.figure, scales=self.scales, fig_margin=margin)
+ self.figure.layout.min_width = '900px'
plt.figure(fig=self.figure)
self.figure.padding_y = 0
x = np.arange(0, 10)
|
vaex-jupyter: have a min with for bqplot
|
diff --git a/api.go b/api.go
index <HASH>..<HASH> 100644
--- a/api.go
+++ b/api.go
@@ -1,4 +1,4 @@
-package main
+package giota
import (
"bytes"
diff --git a/api_mock.go b/api_mock.go
index <HASH>..<HASH> 100644
--- a/api_mock.go
+++ b/api_mock.go
@@ -1,4 +1,4 @@
-package main
+package giota
// XXX: add a mock for IRI so that running test doesn't
// require a running IRI instance, at least for simple
diff --git a/api_test.go b/api_test.go
index <HASH>..<HASH> 100644
--- a/api_test.go
+++ b/api_test.go
@@ -1,4 +1,4 @@
-package main
+package giota
import (
"testing"
|
changes the package from main to giota
|
diff --git a/js/bitfinex.js b/js/bitfinex.js
index <HASH>..<HASH> 100644
--- a/js/bitfinex.js
+++ b/js/bitfinex.js
@@ -578,8 +578,9 @@ module.exports = class bitfinex extends Exchange {
}
handleErrors (code, reason, url, method, headers, body) {
- if (this.verbose)
+ if (this.verbose) {
console.log (this.id, method, url, code, reason, body ? ("\nResponse:\n" + body) : '');
+ }
if (code == 400) {
if (body[0] == "{") {
let response = JSON.parse (body);
|
one more transpiler fix... maybe
|
diff --git a/core-bundle/src/DependencyInjection/ContaoCoreExtension.php b/core-bundle/src/DependencyInjection/ContaoCoreExtension.php
index <HASH>..<HASH> 100644
--- a/core-bundle/src/DependencyInjection/ContaoCoreExtension.php
+++ b/core-bundle/src/DependencyInjection/ContaoCoreExtension.php
@@ -66,7 +66,6 @@ class ContaoCoreExtension extends ConfigurableExtension
foreach ($this->files as $file) {
$loader->load($file);
- $container->addResource(new FileResource(__DIR__ . '/../Resources/config/' . $file));
}
$container->setParameter('contao.prepend_locale', $mergedConfig['prepend_locale']);
|
[Core] No need to add YAML to container resources, the loader does it already
|
diff --git a/src/consumer/subscriptionState.js b/src/consumer/subscriptionState.js
index <HASH>..<HASH> 100644
--- a/src/consumer/subscriptionState.js
+++ b/src/consumer/subscriptionState.js
@@ -74,22 +74,24 @@ module.exports = class SubscriptionState {
}
/**
- * @returns {Array<TopicPartitions>} topicPartitions Example: [{ topic: 'topic-name', partitions: [1, 2] }]
+ * @returns {Array<TopicPartitions>} topicPartitions
+ * Example: [{ topic: 'topic-name', partitions: [1, 2] }]
*/
assigned() {
return Object.values(this.assignedPartitionsByTopic).map(({ topic, partitions }) => ({
topic,
- partitions,
+ partitions: partitions.sort(),
}))
}
/**
- * @returns {Array<TopicPartitions>} topicPartitions Example: [{ topic: 'topic-name', partitions: [1, 2] }]
+ * @returns {Array<TopicPartitions>} topicPartitions
+ * Example: [{ topic: 'topic-name', partitions: [1, 2] }]
*/
active() {
return Object.values(this.assignedPartitionsByTopic).map(({ topic, partitions }) => ({
topic,
- partitions: partitions.filter(partition => !this.isPaused(topic, partition)),
+ partitions: partitions.filter(partition => !this.isPaused(topic, partition)).sort(),
}))
}
|
Always return the list of partitions with stable order
|
diff --git a/chef/lib/chef/provider/package/pkg.rb b/chef/lib/chef/provider/package/pkg.rb
index <HASH>..<HASH> 100644
--- a/chef/lib/chef/provider/package/pkg.rb
+++ b/chef/lib/chef/provider/package/pkg.rb
@@ -37,11 +37,10 @@ class Chef
when /^#{@new_resource.package_name}-(.+)/
@current_resource.version($1)
Chef::Log.debug("Current version is #{@current_resource.version}")
- else
- @current_resource.version(nil)
end
end
end
+ @current_resource.version(nil) unless @current_resource.version
unless status.exitstatus == 0 || status.exitstatus == 1
raise Chef::Exception::Package, "pkg_info -E #{@new_resource.package_name} failed - #{status.inspect}!"
@@ -59,13 +58,9 @@ class Chef
case line
when /^PORTVERSION=\s+(\S+)/
@candidate_version = $1
+ Chef::Log.debug("Candidate version is #{@candidate_version}")
end
end
-
- @current_resource.version($1)
- Chef::Log.debug("Current version is #{@current_resource.version}")
- else
- @current_resource.version(nil)
end
end
end
|
clean up some unneeded code paths in Chef::Package::Pkg
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -130,11 +130,12 @@ setup(
'scripts/mm_project'],
include_dirs = [numpy.get_include()],
ext_modules = [cocovar_module],
- data_files = [('emma2', ['emma2.cfg'])],
+ data_files = [('emma2', ['emma2.cfg']),
+ # TODO: make this somehow choose the latest version available.
+ ('lib',
+ ['lib/stallone/stallone-1.0-SNAPSHOT-jar-with-dependencies.jar'])],
# runtime dependencies
install_requires = ['numpy >=1.8.0',
'scipy >=0.11',
- 'JCC >=2.17'],
- # build time dependencies
- requires = ['JCC (>=2.17)'],
+ 'JPype1 >= 0.5.4.5'],
)
|
[setup] install stallone lib to lib dir in emma2 egg. Removed jcc dependencies
|
diff --git a/fluid-ws-java-client/src/main/java/com/fluid/ws/client/v1/ABaseClientWS.java b/fluid-ws-java-client/src/main/java/com/fluid/ws/client/v1/ABaseClientWS.java
index <HASH>..<HASH> 100644
--- a/fluid-ws-java-client/src/main/java/com/fluid/ws/client/v1/ABaseClientWS.java
+++ b/fluid-ws-java-client/src/main/java/com/fluid/ws/client/v1/ABaseClientWS.java
@@ -7,6 +7,7 @@ import java.net.URLEncoder;
import java.net.UnknownHostException;
import java.util.List;
+import com.fluid.GitDescribe;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
@@ -781,4 +782,13 @@ public class ABaseClientWS {
protected final boolean isEmpty(String textParam) {
return (textParam == null) ? true : textParam.trim().isEmpty();
}
+
+ /**
+ *
+ * @return
+ */
+ public String getFluidAPIVersion()
+ {
+ return GitDescribe.GIT_DESCRIBE;
+ }
}
|
Added a version fetcher for API.
|
diff --git a/core/src/main/java/com/digitalpebble/storm/crawler/util/MetadataTransfer.java b/core/src/main/java/com/digitalpebble/storm/crawler/util/MetadataTransfer.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/com/digitalpebble/storm/crawler/util/MetadataTransfer.java
+++ b/core/src/main/java/com/digitalpebble/storm/crawler/util/MetadataTransfer.java
@@ -25,7 +25,6 @@ import org.apache.commons.lang.StringUtils;
import clojure.lang.PersistentVector;
import com.digitalpebble.storm.crawler.Metadata;
-import com.digitalpebble.storm.crawler.filtering.URLFilter;
/**
* Implements the logic of how the metadata should be passed to the outlinks,
@@ -103,7 +102,7 @@ public class MetadataTransfer {
return transferInstance;
}
- void configure(Map<String, Object> conf) {
+ protected void configure(Map<String, Object> conf) {
trackPath = ConfUtils.getBoolean(conf, trackPathParamName, true);
|
MetadataTransfer : bugfix - configure method should be protected
|
diff --git a/lib/defaults.php b/lib/defaults.php
index <HASH>..<HASH> 100644
--- a/lib/defaults.php
+++ b/lib/defaults.php
@@ -23,6 +23,7 @@
"maxeditingtime" => 1800,
"changepassword" => true,
"country" => "",
+ "prefix" => "",
"guestloginbutton" => 1,
"debug" => 7
);
|
Add default prefix (for tables) of "" for upgraders
|
diff --git a/src/Gerrie/Gerrie.php b/src/Gerrie/Gerrie.php
index <HASH>..<HASH> 100644
--- a/src/Gerrie/Gerrie.php
+++ b/src/Gerrie/Gerrie.php
@@ -431,7 +431,7 @@ class Gerrie {
}
// Clear the temp tables. The data is not needed anymore
- //$this->cleanupTempTables();
+ $this->cleanupTempTables();
$this->setTime('end');
$this->outputEndStatistics();
|
Activated cleanup of temp tables again
|
diff --git a/packages/cucumber-browserstack-example/nightwatch.conf.js b/packages/cucumber-browserstack-example/nightwatch.conf.js
index <HASH>..<HASH> 100644
--- a/packages/cucumber-browserstack-example/nightwatch.conf.js
+++ b/packages/cucumber-browserstack-example/nightwatch.conf.js
@@ -13,6 +13,8 @@ module.exports = {
desiredCapabilities: {
'browserstack.user': process.env.BROWSERSTACK_USERNAME,
'browserstack.key': process.env.BROWSERSTACK_ACCESS_KEY,
+ os: 'Windows',
+ os_version: '10',
browserName: 'chrome',
javascriptEnabled: true,
acceptSslCerts: true,
|
set windows <I> as platform for browserstack tests
|
diff --git a/python_modules/dagster/dagster/scheduler/sensor.py b/python_modules/dagster/dagster/scheduler/sensor.py
index <HASH>..<HASH> 100644
--- a/python_modules/dagster/dagster/scheduler/sensor.py
+++ b/python_modules/dagster/dagster/scheduler/sensor.py
@@ -144,7 +144,7 @@ def execute_sensor_iteration_loop(
not handle_manager
or (start_time - manager_loaded_time) > RELOAD_LOCATION_MANAGER_INTERVAL
):
- stack.pop_all() # remove the previous context
+ stack.close() # remove the previous context
handle_manager = stack.enter_context(
RepositoryLocationHandleManager(grpc_server_registry)
)
|
Fix sensor loop handle cleanup
Summary:
TIL that pop_stack doesn't actually close the contextmanagers in the stack! <URL>.
Resolves <URL>, CTRL-C the daemon, daemon no longer hangs.
Reviewers: prha, johann, alangenfeld
Reviewed By: johann
Differential Revision: <URL>
|
diff --git a/src/bundle/Controller/LanguageController.php b/src/bundle/Controller/LanguageController.php
index <HASH>..<HASH> 100644
--- a/src/bundle/Controller/LanguageController.php
+++ b/src/bundle/Controller/LanguageController.php
@@ -186,8 +186,7 @@ class LanguageController extends Controller
public function editAction(Request $request, Language $language): Response
{
$form = $this->formFactory->updateLanguage(
- new LanguageUpdateData($language),
- 'ezplatform.language.view'
+ new LanguageUpdateData($language)
);
$form->handleRequest($request);
|
EZP-<I>: Can't edit language because of Internal Server Error
|
diff --git a/green/cmdline.py b/green/cmdline.py
index <HASH>..<HASH> 100644
--- a/green/cmdline.py
+++ b/green/cmdline.py
@@ -167,7 +167,6 @@ def main(testing=False, coverage_testing=False):
cov.stop()
cov.save()
cov.combine()
- cov.save()
cov.report(file=stream, omit=omit)
return(int(not result.wasSuccessful()))
|
Removed a redundant coverage call.
|
diff --git a/wp-cxense.php b/wp-cxense.php
index <HASH>..<HASH> 100644
--- a/wp-cxense.php
+++ b/wp-cxense.php
@@ -1,7 +1,7 @@
<?php
/**
* Plugin Name: WP cXense
- * Version: 1.1.16
+ * Version: 1.1.17
* Plugin URI: https://github.com/BenjaminMedia/wp-cxense
* Description: This plugin integrates your site with cXense by adding meta tags and calling the cXense api
* Author: Bonnier - Alf Henderson
|
Bumped plugin version to <I>
|
diff --git a/juju/utils.py b/juju/utils.py
index <HASH>..<HASH> 100644
--- a/juju/utils.py
+++ b/juju/utils.py
@@ -115,6 +115,8 @@ class IdQueue:
async def block_until(*conditions, timeout=None, wait_period=0.5):
"""Return only after all conditions are true.
+ If a timeout occurs, it cancels the task and raises
+ asyncio.TimeoutError.
"""
async def _block():
@@ -125,7 +127,8 @@ async def block_until(*conditions, timeout=None, wait_period=0.5):
async def block_until_with_coroutine(condition_coroutine, timeout=None, wait_period=0.5):
"""Return only after the given coroutine returns True.
-
+ If a timeout occurs, it cancels the task and raises
+ asyncio.TimeoutError.
"""
async def _block():
while not await condition_coroutine():
|
Minor comments on docs for block_until related functions.
|
diff --git a/core/base/Boot.php b/core/base/Boot.php
index <HASH>..<HASH> 100644
--- a/core/base/Boot.php
+++ b/core/base/Boot.php
@@ -213,7 +213,7 @@ abstract class Boot
$require = require_once(dirname($this->_baseYiiFile) . DIRECTORY_SEPARATOR . 'BaseYii.php');
- include($this->getCoreBasePath() . '/Yii.php');
+ require_once($this->getCoreBasePath() . '/Yii.php');
Yii::setAlias('@luya', $this->getCoreBasePath());
return $require;
|
use require once in order to fix multi loading.
|
diff --git a/src/Selection.js b/src/Selection.js
index <HASH>..<HASH> 100644
--- a/src/Selection.js
+++ b/src/Selection.js
@@ -80,7 +80,7 @@ class Selection {
, collides, offsetData;
// Right clicks
- if (e.which === 3 || e.button === 2 || !isOverContainer(node, e.pageX, e.pageY))
+ if (e.which === 3 || e.button === 2 || !isOverContainer(node, e.clientX, e.clientY))
return;
if (!this.globalMouse && node && !contains(node, e.target)) {
|
[fixed] use client coords to get node during selection
|
diff --git a/tests/model/test_exif.py b/tests/model/test_exif.py
index <HASH>..<HASH> 100644
--- a/tests/model/test_exif.py
+++ b/tests/model/test_exif.py
@@ -37,7 +37,7 @@ class TestOcrdExif(TestCase):
self.assertEqual(exif.photometricInterpretation, '1')
def test_png2(self):
- exif = OcrdExif(Image.open(assets.path_to('scribo-test/data/OCR-D-IMG-BIN-SAUVOLA/OCR-D-IMG-orig_sauvola_png.jpg')))
+ exif = OcrdExif(Image.open(assets.path_to('scribo-test/data/OCR-D-IMG-BIN-SAUVOLA/OCR-D-SEG-PAGE-SAUVOLA-orig_tiff-BIN_sauvola.png')))
self.assertEqual(exif.width, 2097)
self.assertEqual(exif.height, 3062)
self.assertEqual(exif.xResolution, 1)
|
fix test regression from OCR-D/assets#<I>
|
diff --git a/lib/passport/index.js b/lib/passport/index.js
index <HASH>..<HASH> 100644
--- a/lib/passport/index.js
+++ b/lib/passport/index.js
@@ -109,6 +109,15 @@ Passport.prototype.session = function() {
*
* Examples:
*
+ * passport.authenticate('local', { successRedirect: '/', failureRedirect: '/login' })(req, res);
+ *
+ * passport.authenticate('local', function(err, user) {
+ * if (!user) { return res.redirect('/login'); }
+ * res.end('Authenticated!');
+ * })(req, res);
+ *
+ * req.authenticate('basic', { session: false })(req, res);
+ *
* app.get('/auth/twitter', passport.authenticate('twitter'), function(req, res) {
* // request will be redirected to Twitter
* });
@@ -116,6 +125,9 @@ Passport.prototype.session = function() {
* res.json(req.user);
* });
*
+ * @param {String} strategy
+ * @param {Object} options
+ * @param {Function} callback
* @return {Function} middleware
* @api public
*/
|
Add additional examples to passport.authenticate().
|
diff --git a/src/main/resources/admin-ui/js/robe/ProfileManagement.js b/src/main/resources/admin-ui/js/robe/ProfileManagement.js
index <HASH>..<HASH> 100644
--- a/src/main/resources/admin-ui/js/robe/ProfileManagement.js
+++ b/src/main/resources/admin-ui/js/robe/ProfileManagement.js
@@ -31,6 +31,10 @@ function initializeProfileManagement() {
success: function (response) {
console.log(response);
showToast("success", "Profil bilgileriniz başarı ile güncellendi.");
+
+ /* LOGOUT */
+ $.cookie.destroy("MedyAuthToken");
+ location.reload();
},
error: function (jqXHR, textStatus, errorThrown) {
console.log(errorThrown);
|
ROBE-<I> cookie destroyed in client-side
|
diff --git a/inigo_suite_test.go b/inigo_suite_test.go
index <HASH>..<HASH> 100644
--- a/inigo_suite_test.go
+++ b/inigo_suite_test.go
@@ -269,13 +269,13 @@ func beforeSuite(encodedSharedContext []byte) {
context.SharedContext.NsyncListenerPath,
"-etcdCluster", strings.Join(context.EtcdRunner.NodeURLS(), ","),
"-natsAddresses", fmt.Sprintf("127.0.0.1:%d", context.NatsPort),
+ "-circuses", `{"`+context.RepStack+`":"some-lifecycle-bundle.tgz"}`,
+ "-repAddrRelativeToExecutor", fmt.Sprintf("127.0.0.1:%d", context.RepPort),
)
context.AppManagerRunner = app_manager_runner.New(
context.SharedContext.AppManagerPath,
context.EtcdRunner.NodeURLS(),
- map[string]string{context.RepStack: "some-lifecycle-bundle.tgz"},
- fmt.Sprintf("127.0.0.1:%d", context.RepPort),
)
context.FileServerRunner = fileserver_runner.New(
|
move circus/rep addr config to nsync
|
diff --git a/spec/unit/interface/face_collection_spec.rb b/spec/unit/interface/face_collection_spec.rb
index <HASH>..<HASH> 100755
--- a/spec/unit/interface/face_collection_spec.rb
+++ b/spec/unit/interface/face_collection_spec.rb
@@ -30,8 +30,8 @@ describe Puppet::Interface::FaceCollection do
after :all do
# Restore global state
- subject.instance_variable_set :@faces, @faces
- subject.instance_variable_set :@loaded, @faces_loaded
+ described_class.instance_variable_set :@faces, @faces
+ described_class.instance_variable_set :@loaded, @faces_loaded
$".delete_if { |path| path =~ /face\/.*\.rb$/ }
@required.each { |path| $".push path unless $".include? path }
Puppet::Util::Autoload.instance_variable_set(:@loaded, @loaded)
|
(PUP-<I>) Fix a use of 'subject' in an after hook
|
diff --git a/src/Parser/BaseParser.php b/src/Parser/BaseParser.php
index <HASH>..<HASH> 100644
--- a/src/Parser/BaseParser.php
+++ b/src/Parser/BaseParser.php
@@ -1,10 +1,5 @@
<?php
-/**
- * @file
- * Contains \Hedron\Parser\BaseParser.
- */
-
namespace Hedron\Parser;
use EclipseGc\Plugin\PluginDefinitionInterface;
|
removing a non-essential file comment
|
diff --git a/test/actions/nodesSpec.js b/test/actions/nodesSpec.js
index <HASH>..<HASH> 100644
--- a/test/actions/nodesSpec.js
+++ b/test/actions/nodesSpec.js
@@ -60,6 +60,7 @@ describe('Node actions with dependencies', () => {
x: 10,
y: 10,
},
+ properties: {},
},
},
pins: {
|
fix(tests): fix nodesSpec tests (missing new property "properties")
|
diff --git a/Controller/Tool/RolesController.php b/Controller/Tool/RolesController.php
index <HASH>..<HASH> 100644
--- a/Controller/Tool/RolesController.php
+++ b/Controller/Tool/RolesController.php
@@ -401,8 +401,8 @@ class RolesController extends Controller
{
$this->checkAccess($workspace);
$this->roleManager->associateRolesToSubjects($users, $roles, true);
- $listCptNodes = $this->cptManager->getCompetenceByWorkspace($workspace);
- $this->cptManager->subscribeUserToCompetences($users, $listCptNodes);
+ //$listCptNodes = $this->cptManager->getCompetenceByWorkspace($workspace);
+ //$this->cptManager->subscribeUserToCompetences($users, $listCptNodes);
return new Response('success');
}
|
[CoreBundle] Commenting broken code.
|
diff --git a/pandas/core/panel.py b/pandas/core/panel.py
index <HASH>..<HASH> 100644
--- a/pandas/core/panel.py
+++ b/pandas/core/panel.py
@@ -1930,16 +1930,20 @@ def _get_combined_index(frames, intersect=False):
if intersect:
combine = Index.intersection
+ copy = Index
+ unique = lambda x: x
else:
- combine = Index.union
+ combine = lambda a, b: np.concatenate((a, b))
+ copy = np.array
+ unique = lambda x: Index(np.unique(x))
for _, frame in frames.iteritems():
if index is None:
- index = frame.index
+ index = copy(frame.index)
elif index is not frame.index:
index = combine(index, frame.index)
- return index
+ return unique(index)
def pivot(index, columns, values):
"""
|
ENH: contrib perf optimization in panel homogenization routine
|
diff --git a/lib/octocatalog-diff/catalog.rb b/lib/octocatalog-diff/catalog.rb
index <HASH>..<HASH> 100644
--- a/lib/octocatalog-diff/catalog.rb
+++ b/lib/octocatalog-diff/catalog.rb
@@ -222,7 +222,7 @@ module OctocatalogDiff
else
source_file
end
- "(#{filename}:#{line_number})"
+ "(#{filename.sub(%r{^environments/production/}, '')}:#{line_number})"
end
# Private method: Format the missing references into human-readable text
|
Drop environments/production from the start of file names
|
diff --git a/lib/web.route.handler.js b/lib/web.route.handler.js
index <HASH>..<HASH> 100644
--- a/lib/web.route.handler.js
+++ b/lib/web.route.handler.js
@@ -48,7 +48,7 @@ function convertUrlSegmentToRegex(segment) {
return '(' + pieces[1].substring(0, pieces[1].length - 1) + ')';
}
else if (pieces.length === 1) {
- return segment.substring(0, beginIdx) + '[a-zA-Z0-9\\-_~]+' + segment.substring(endIdx + 1);
+ return segment.substring(0, beginIdx) + '[^\\/]+' + segment.substring(endIdx + 1);
}
else {
throw new Error('Weird URL segment- don\'t know how to parse! ' + segment);
|
correctly allow more characters in url path parts for parsing
|
diff --git a/transfer/adapterbase.go b/transfer/adapterbase.go
index <HASH>..<HASH> 100644
--- a/transfer/adapterbase.go
+++ b/transfer/adapterbase.go
@@ -99,6 +99,7 @@ func (a *adapterBase) worker(workerNum int) {
if signalAuthOnResponse {
authCallback = func() {
a.authWait.Done()
+ signalAuthOnResponse = false
}
}
tracerx.Printf("xfer: adapter %q worker %d processing job for %q", a.Name(), workerNum, t.Object.Oid)
@@ -110,9 +111,6 @@ func (a *adapterBase) worker(workerNum int) {
a.outChan <- res
}
- // Only need to signal for auth once
- signalAuthOnResponse = false
-
tracerx.Printf("xfer: adapter %q worker %d finished job for %q", a.Name(), workerNum, t.Object.Oid)
}
// This will only happen if no jobs were submitted; just wake up all workers to finish
|
Fix retry; only confirm that auth signal done when auth func called
|
diff --git a/lib/datalib.php b/lib/datalib.php
index <HASH>..<HASH> 100644
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -698,6 +698,11 @@ function get_courses_wmanagers($categoryid=0, $sort="c.sortorder ASC", $fields=a
return array(); // no courses!
}
+ $CFG->coursemanager = trim($CFG->coursemanager);
+ if (empty($CFG->coursemanager)) {
+ return $courses;
+ }
+
$managerroles = split(',', $CFG->coursemanager);
$catctxids = '';
if (count($managerroles)) {
|
datalib:get_courses_wmanagers() handle empty $CFG->coursemanager more gracefully
Having no roles set as coursemanager is a valid setting.
get_courses_wmanagers() should not produce invalid SQL on it...
actually, it should not even try to get the course managers.
|
diff --git a/structr-core/src/main/java/org/structr/core/graph/Tx.java b/structr-core/src/main/java/org/structr/core/graph/Tx.java
index <HASH>..<HASH> 100644
--- a/structr-core/src/main/java/org/structr/core/graph/Tx.java
+++ b/structr-core/src/main/java/org/structr/core/graph/Tx.java
@@ -46,7 +46,7 @@ public class Tx implements AutoCloseable {
}
public Tx(final SecurityContext securityContext, final StructrApp app, final boolean doValidation, final boolean doCallbacks) {
- this(securityContext, app, doValidation, doCallbacks, true);
+ this(securityContext, app, doValidation, doCallbacks, ((securityContext == null) ? true : securityContext.isDoTransactionNotifications()));
}
public Tx(final SecurityContext securityContext, final StructrApp app, final boolean doValidation, final boolean doCallbacks, final boolean doNotifications) {
|
use the transaction notification flag from securityContext by default
|
diff --git a/src/WebPageInspector.php b/src/WebPageInspector.php
index <HASH>..<HASH> 100644
--- a/src/WebPageInspector.php
+++ b/src/WebPageInspector.php
@@ -7,10 +7,6 @@ use webignition\WebResourceInterfaces\WebPageInterface;
class WebPageInspector
{
- const CHARSET_GB2312 = 'GB2312';
- const CHARSET_BIG5 = 'BIG5';
- const CHARSET_UTF_8 = 'UTF-8';
-
/**
* @var WebPageInterface
*/
|
Remove WebPageInspector::CHARSET_* constants (#<I>)
|
diff --git a/packages/feedback/src/FeedbackForm.js b/packages/feedback/src/FeedbackForm.js
index <HASH>..<HASH> 100644
--- a/packages/feedback/src/FeedbackForm.js
+++ b/packages/feedback/src/FeedbackForm.js
@@ -211,7 +211,6 @@ const FeedbackForm = ({
onClick={onClose}
color="secondary"
onKeyDown={({ keyCode }) => {
- console.log(keyCode);
if (keyCode === 13) {
onClose();
}
|
fix(feedback): removed console log
|
diff --git a/src/Sulu/Bundle/WebsocketBundle/Controller/FallbackController.php b/src/Sulu/Bundle/WebsocketBundle/Controller/FallbackController.php
index <HASH>..<HASH> 100644
--- a/src/Sulu/Bundle/WebsocketBundle/Controller/FallbackController.php
+++ b/src/Sulu/Bundle/WebsocketBundle/Controller/FallbackController.php
@@ -49,6 +49,12 @@ class FallbackController
$app->onMessage($connection, $message);
+ // clean output buffer if there is data in it
+ // happens if a twig error occurs
+ if (ob_get_length() > 0) {
+ ob_clean();
+ }
+
return new Response($connection->getData(), 200, array('Content-Type' => 'application/json'));
}
}
|
added ob_clean if outputbuffer is not empty
|
diff --git a/Swat/SwatFrame.php b/Swat/SwatFrame.php
index <HASH>..<HASH> 100644
--- a/Swat/SwatFrame.php
+++ b/Swat/SwatFrame.php
@@ -28,6 +28,13 @@ class SwatFrame extends SwatContainer implements SwatTitleable
public $subtitle = null;
/**
+ * An optional string to separate subtitle from the title
+ *
+ * @var string
+ */
+ public $title_separator = ': ';
+
+ /**
* Gets the title of this frame
*
* Implements the {SwatTitleable::getTitle()} interface.
@@ -93,7 +100,7 @@ class SwatFrame extends SwatContainer implements SwatTitleable
$header_tag->open();
$header_tag->displayContent();
- echo ' ';
+ echo $this->title_separator;
$span_tag->display();
$header_tag->close();
}
|
Replace hardcoded space between title and subtitle with a public property named $title_seperator that defaults to ': '.
svn commit r<I>
|
diff --git a/src/core/renderers/webgl/managers/FilterManager.js b/src/core/renderers/webgl/managers/FilterManager.js
index <HASH>..<HASH> 100644
--- a/src/core/renderers/webgl/managers/FilterManager.js
+++ b/src/core/renderers/webgl/managers/FilterManager.js
@@ -106,7 +106,7 @@ FilterManager.prototype.popFilter = function()
if(filters.length === 1)
{
- filters[0].apply(this, currentState.renderTarget, lastState.renderTarget, false);
+ filters[0].apply(this, currentState.renderTarget, lastState.renderTarget, true);
this.freePotRenderTarget(currentState.renderTarget);
}
else
|
Merged in dev conflict
# Conflicts:
# src/core/renderers/webgl/managers/FilterManager.js
|
diff --git a/lib/perobs/IndexTreeNode.rb b/lib/perobs/IndexTreeNode.rb
index <HASH>..<HASH> 100644
--- a/lib/perobs/IndexTreeNode.rb
+++ b/lib/perobs/IndexTreeNode.rb
@@ -190,8 +190,8 @@ module PEROBS
# Recursively check this node and all sub nodes. Compare the found
# ID/address pairs with the corresponding entry in the given FlatFile.
# @param flat_file [FlatFile]
- # @tree_level [Fixnum] Assumed level in the tree. Must correspond with
- # @nibble_idx
+ # @param tree_level [Fixnum] Assumed level in the tree. Must correspond
+ # with @nibble_idx
# @return [Boolean] true if no errors were found, false otherwise
def check(flat_file, tree_level)
if tree_level >= 16
diff --git a/lib/perobs/Store.rb b/lib/perobs/Store.rb
index <HASH>..<HASH> 100644
--- a/lib/perobs/Store.rb
+++ b/lib/perobs/Store.rb
@@ -160,7 +160,6 @@ module PEROBS
# Copy the store content into a new Store. The arguments are identical to
# Store.new().
- # @param data_base [String] the name of the database
# @param options [Hash] various options to affect the operation of the
def copy(dir, options = {})
# Make sure all objects are persisted.
|
Fix: Eliminate yardoc warnings.
|
diff --git a/tests/Core/ModuleResolver/ResolverStackTest.php b/tests/Core/ModuleResolver/ResolverStackTest.php
index <HASH>..<HASH> 100644
--- a/tests/Core/ModuleResolver/ResolverStackTest.php
+++ b/tests/Core/ModuleResolver/ResolverStackTest.php
@@ -43,7 +43,7 @@ class ResolverStackTest extends PHPUnit_Framework_TestCase
$allResolvers = $property->getValue($stack);
$theResolver = array_shift($allResolvers);
- $this->assertInstanceOf('Slender\Interface\ModuleResolverInterface',$theResolver);
+ $this->assertInstanceOf('Slender\Interfaces\ModuleResolverInterface',$theResolver);
}
|
need to write tests for the tests i think...
|
diff --git a/src/main/java/com/buschmais/jqassistant/plugin/maven3/api/scanner/MavenScope.java b/src/main/java/com/buschmais/jqassistant/plugin/maven3/api/scanner/MavenScope.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/buschmais/jqassistant/plugin/maven3/api/scanner/MavenScope.java
+++ b/src/main/java/com/buschmais/jqassistant/plugin/maven3/api/scanner/MavenScope.java
@@ -10,20 +10,20 @@ public enum MavenScope implements Scope {
PROJECT {
@Override
- public void create(ScannerContext context) {
+ public void onEnter(ScannerContext context) {
}
@Override
- public void destroy(ScannerContext context) {
+ public void onLeave(ScannerContext context) {
}
},
REPOSITORY {
@Override
- public void create(ScannerContext context) {
+ public void onEnter(ScannerContext context) {
}
@Override
- public void destroy(ScannerContext context) {
+ public void onLeave(ScannerContext context) {
}
};
|
Renamed methods in the Scope interface and added some JavaDoc.
|
diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb
index <HASH>..<HASH> 100644
--- a/lib/jekyll/utils.rb
+++ b/lib/jekyll/utils.rb
@@ -6,7 +6,7 @@ module Jekyll
autoload :Ansi, "jekyll/utils/ansi"
# Constants for use in #slugify
- SLUGIFY_MODES = %w(raw default pretty urlsafe)
+ SLUGIFY_MODES = %w(raw default pretty ascii)
SLUGIFY_RAW_REGEXP = Regexp.new('\\s+').freeze
SLUGIFY_DEFAULT_REGEXP = Regexp.new('[^[:alnum:]]+').freeze
SLUGIFY_PRETTY_REGEXP = Regexp.new("[^[:alnum:]._~!$&'()+,;=@]+").freeze
|
One final "urlsafe" replaced with "ascii"
|
diff --git a/backtrader/strategy.py b/backtrader/strategy.py
index <HASH>..<HASH> 100644
--- a/backtrader/strategy.py
+++ b/backtrader/strategy.py
@@ -497,11 +497,13 @@ class Strategy(with_metaclass(MetaStrategy, StrategyBase)):
size = abs(size or possize)
if possize > 0:
- return self.sell(data, size, price, exectype, valid,
+ return self.sell(data=data, size=size, price=price,
+ exectype=exectype, valid=valid,
tradeid=tradeid, **kwargs)
elif possize < 0:
- return self.buy(data, size, price, exectype, valid,
- tradeid=tradeid, **kwargs)
+ return self.sell(data=data, size=size, price=price,
+ exectype=exectype, valid=valid,
+ tradeid=tradeid, **kwargs)
return None
|
Correct method close of strategy by using kwargs which was not taking into account the existence of a plimit parameter in methods buy/sell and would pass the execution type as plimit
|
diff --git a/monitor/schedule_test.go b/monitor/schedule_test.go
index <HASH>..<HASH> 100644
--- a/monitor/schedule_test.go
+++ b/monitor/schedule_test.go
@@ -286,7 +286,7 @@ func agentSchedule(t *testing.T, td *testData, queue *mockQueue,
// Tick here on purpose, so that not all events are ignored because
// the offering's been deleted.
ticker.tick()
- queue.awaitCompletion(time.Second)
+ queue.awaitCompletion(time.Second * 5)
}
func clientSchedule(t *testing.T, td *testData, queue *mockQueue,
@@ -474,7 +474,7 @@ func clientSchedule(t *testing.T, td *testData, queue *mockQueue,
// Tick here on purpose, so that not all events are ignored because
// the offering's been deleted.
ticker.tick()
- queue.awaitCompletion(time.Second)
+ queue.awaitCompletion(time.Second * 5)
}
func commonSchedule(t *testing.T, td *testData, queue *mockQueue,
@@ -504,7 +504,7 @@ func commonSchedule(t *testing.T, td *testData, queue *mockQueue,
// Tick here on purpose, so that not all events are ignored because
// the offering's been deleted.
ticker.tick()
- queue.awaitCompletion(time.Second)
+ queue.awaitCompletion(time.Second * 5)
}
func scheduleTest(t *testing.T, td *testData, queue *mockQueue,
|
Increased timeout for `mockQueue.awaitCompletion`
|
diff --git a/php/WP_CLI/Bootstrap/DefineProtectedCommands.php b/php/WP_CLI/Bootstrap/DefineProtectedCommands.php
index <HASH>..<HASH> 100644
--- a/php/WP_CLI/Bootstrap/DefineProtectedCommands.php
+++ b/php/WP_CLI/Bootstrap/DefineProtectedCommands.php
@@ -40,7 +40,7 @@ final class DefineProtectedCommands implements BootstrapStep {
private function get_protected_commands() {
return array(
'cli info',
- 'package',
+ 'package',
);
}
|
CS for php/WP_CLI/Bootstrap/*
Auto-fixing of sniffs no longer excluded.
See #<I>.
|
diff --git a/promise/promise.py b/promise/promise.py
index <HASH>..<HASH> 100644
--- a/promise/promise.py
+++ b/promise/promise.py
@@ -818,7 +818,7 @@ class Promise(Generic[T]):
)
-_type_done_callbacks = WeakKeyDictionary() # type: Dict[type, bool]
+_type_done_callbacks = WeakKeyDictionary()
def is_future_like(_type):
|
Remove incorrect type annotation
mypy complained that WeakKeyDictionary is not a Dict[type, bool].
|
diff --git a/src/werkzeug/middleware/shared_data.py b/src/werkzeug/middleware/shared_data.py
index <HASH>..<HASH> 100644
--- a/src/werkzeug/middleware/shared_data.py
+++ b/src/werkzeug/middleware/shared_data.py
@@ -35,7 +35,7 @@ class SharedDataMiddleware(object):
environments or simple server setups. Usage is quite simple::
import os
- from werkzeug.wsgi import SharedDataMiddleware
+ from werkzeug.middleware.shared_data import SharedDataMiddleware
app = SharedDataMiddleware(app, {
'/static': os.path.join(os.path.dirname(__file__), 'static')
|
Update documentation of SharedDataMiddleware
Let the doc of SharedDataMiddleware reflect its move to middleware.shared_data
|
diff --git a/OpenPNM/Utilities/misc.py b/OpenPNM/Utilities/misc.py
index <HASH>..<HASH> 100644
--- a/OpenPNM/Utilities/misc.py
+++ b/OpenPNM/Utilities/misc.py
@@ -1,5 +1,5 @@
import scipy as _sp
-import time
+import time as _time
def iscoplanar(coords):
r'''
@@ -48,8 +48,8 @@ def tic():
Homemade version of matlab tic and toc function, tic starts or resets
the clock, toc reports the time since the last call of tic.
'''
- global startTime_for_tictoc
- startTime_for_tictoc = time.time()
+ global _startTime_for_tictoc
+ _startTime_for_tictoc = _time.time()
def toc(quiet=False):
r'''
@@ -62,8 +62,8 @@ def toc(quiet=False):
If False (default) then a message is output to the console. If True
the message is not displayed and the elapsed time is returned.
'''
- if 'startTime_for_tictoc' in globals():
- t = time.time() - startTime_for_tictoc
+ if '_startTime_for_tictoc' in globals():
+ t = _time.time() - _startTime_for_tictoc
if quiet == False:
print('Elapsed time in seconds: ', t)
else:
|
A few updates to misc
- it is important to import other modules preceded with an underscore, or else they pollute the namespace
Former-commit-id: <I>a5b<I>b<I>d8da6c4bac3d6c9a<I>ae
Former-commit-id: 8f<I>be5dd<I>caf<I>e<I>abefdc<I>a<I>bdaaf<I>d
|
diff --git a/src/Commands/Import.php b/src/Commands/Import.php
index <HASH>..<HASH> 100644
--- a/src/Commands/Import.php
+++ b/src/Commands/Import.php
@@ -104,8 +104,11 @@ class Import extends Command
foreach ($users as $user) {
try {
+ // Get the users credentials array.
+ $credentials = $this->getUserCredentials($user);
+
// Import the user and retrieve it's model.
- $model = $this->getImporter()->run($user, $this->model());
+ $model = $this->getImporter()->run($user, $this->model(), $credentials);
$password = str_random();
@@ -225,6 +228,20 @@ class Import extends Command
}
/**
+ * Returns the specified users credentials array.
+ *
+ * @param User $user
+ *
+ * @return array
+ */
+ protected function getUserCredentials(User $user)
+ {
+ return [
+ $this->getResolver()->getEloquentUsername() => $user->getFirstAttribute($this->getResolver()->getLdapUsername())
+ ];
+ }
+
+ /**
* Saves the specified user with its model.
*
* @param User $user
|
Fixed retrieving the existing users model during import.
|
diff --git a/lib/arel.rb b/lib/arel.rb
index <HASH>..<HASH> 100644
--- a/lib/arel.rb
+++ b/lib/arel.rb
@@ -1,5 +1,4 @@
require 'active_support/inflector'
-require 'active_support/core_ext/class/attribute_accessors'
require 'active_support/core_ext/module/delegation'
require 'active_support/core_ext/object/blank'
diff --git a/lib/arel/engines/sql/relations/table.rb b/lib/arel/engines/sql/relations/table.rb
index <HASH>..<HASH> 100644
--- a/lib/arel/engines/sql/relations/table.rb
+++ b/lib/arel/engines/sql/relations/table.rb
@@ -2,7 +2,16 @@ module Arel
class Table
include Relation, Recursion::BaseCase
- cattr_accessor :engine, :tables
+ @@engine = nil
+ @@tables = nil
+ class << self # FIXME: Do we really need these?
+ def engine; @@engine; end
+ def engine= e; @@engine = e; end
+
+ def tables; @@tables; end
+ def tables= e; @@tables = e; end
+ end
+
attr_reader :name, :engine, :table_alias, :options
def initialize(name, options = {})
|
removing cattr_accessor
|
diff --git a/backbone-formview.js b/backbone-formview.js
index <HASH>..<HASH> 100644
--- a/backbone-formview.js
+++ b/backbone-formview.js
@@ -1117,7 +1117,7 @@
} else {
$option = Backbone.$('<option>').text(val.display).attr('value', val.value);
if (this.isSelected(val.value)) {
- $option.attr('selected', 'selected');
+ $option.prop('selected', true);
}
$option.appendTo($wrapper);
}
@@ -1306,7 +1306,7 @@
CheckBoxView.__super__.initialize.call(this, options);
},
getValue: function () {
- if (this.$('input:checkbox').prop('checked')) {
+ if (this.$(this.elementType).prop('checked')) {
return this.checkedVal;
}
return this.unCheckedVal;
@@ -1326,7 +1326,7 @@
if (this.addId) { $input.attr({ id: id, name: id }); }
if (this.isSelected()) {
- $input.attr('checked', 'checked');
+ $input.prop('checked', true);
}
$label.append($input);
if (this.displayText) {
|
Change attr(selected) and attr(checked) calls to prop() calls, as they should be in newer versions of jQuery
|
diff --git a/TYPO3.Neos/Classes/Routing/PageRoutePartHandler.php b/TYPO3.Neos/Classes/Routing/PageRoutePartHandler.php
index <HASH>..<HASH> 100644
--- a/TYPO3.Neos/Classes/Routing/PageRoutePartHandler.php
+++ b/TYPO3.Neos/Classes/Routing/PageRoutePartHandler.php
@@ -53,7 +53,7 @@ class PageRoutePartHandler extends \F3\FLOW3\MVC\Web\Routing\DynamicRoutePart {
/**
* Returns the current content context
- *
+ *
* @return \F3\TYPO3\Domain\Service\ContentContext
* @author Robert Lemke <robert@typo3.org>
*/
@@ -88,7 +88,7 @@ class PageRoutePartHandler extends \F3\FLOW3\MVC\Web\Routing\DynamicRoutePart {
return self::MATCHRESULT_NOSUCHPAGE;
}
$contentContext->setCurrentPage($page);
- $contentContext->setNodePath('/' . $value);
+ $contentContext->setNodePath('/' . $value);
$this->value = array('__identity' => $page->FLOW3_Persistence_Entity_UUID);
return TRUE;
}
|
[+BUGFIX] FLOW3: Removed object and cache configuration for missing DatesReader class, resolving exception #<I>.
[~TASK] TYPO3 (Routing): Whitespace fixes, no functional changes.
Original-Commit-Hash: <I>cce0ab<I>f<I>f<I>e<I>be<I>e<I>ad9d<I>
|
diff --git a/Gruntfile.js b/Gruntfile.js
index <HASH>..<HASH> 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -29,7 +29,7 @@ module.exports = function(grunt) {
uglify: {
options: {
mangle: true,
- compress: true
+ compress: {}
},
uglified_build: {
files: {
|
type of setting changed in grunt-contrib-uglify
|
diff --git a/lib/adminlib.php b/lib/adminlib.php
index <HASH>..<HASH> 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -8438,7 +8438,7 @@ class admin_setting_configcolourpicker extends admin_setting {
$content .= html_writer::empty_tag('input', array('type'=>'button','id'=>$this->get_id().'_preview', 'value'=>get_string('preview'), 'class'=>'admin_colourpicker_preview'));
}
$content .= html_writer::end_tag('div');
- return format_admin_setting($this, $this->visiblename, $content, $this->description, false, '', $this->get_defaultsetting(), $query);
+ return format_admin_setting($this, $this->visiblename, $content, $this->description, true, '', $this->get_defaultsetting(), $query);
}
}
|
MDL-<I> admin: attached color label to input control
|
diff --git a/lib/codemirror.js b/lib/codemirror.js
index <HASH>..<HASH> 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1793,9 +1793,9 @@
function resetInput(cm, user) {
var minimal, selected, doc = cm.doc;
- var range = doc.sel.primary();
- if (!range.empty()) {
+ if (cm.somethingSelected()) {
cm.display.prevInput = "";
+ var range = doc.sel.primary();
minimal = hasCopyEvent &&
(range.to().line - range.from().line > 100 || (selected = cm.getSelection()).length > 1000);
var content = minimal ? "-" : selected || cm.getSelection();
|
Fix resetInput to not confuse readInput when prim sel is empty but secondary is not
Closes #<I>
Closes #<I>
Closes #<I>
|
diff --git a/chef/lib/chef/cookbook_uploader.rb b/chef/lib/chef/cookbook_uploader.rb
index <HASH>..<HASH> 100644
--- a/chef/lib/chef/cookbook_uploader.rb
+++ b/chef/lib/chef/cookbook_uploader.rb
@@ -23,7 +23,7 @@ class Chef
# generate checksums of cookbook files and create a sandbox
checksum_files = cookbook.checksums
checksums = checksum_files.inject({}){|memo,elt| memo[elt.first]=nil ; memo}
- new_sandbox = rest.post_rest("/sandboxes", { :checksums => checksums })
+ new_sandbox = rest.post_rest("sandboxes", { :checksums => checksums })
Chef::Log.info("Uploading files")
# upload the new checksums and commit the sandbox
@@ -72,10 +72,8 @@ class Chef
raise
end
end
-
# files are uploaded, so save the manifest
cookbook.save
-
Chef::Log.info("Upload complete!")
end
@@ -99,4 +97,4 @@ class Chef
end
end
-end
\ No newline at end of file
+end
|
Prevent double '/' in HTTP call to sandboxes
|
diff --git a/lib/chef/audit/reporter/automate.rb b/lib/chef/audit/reporter/automate.rb
index <HASH>..<HASH> 100644
--- a/lib/chef/audit/reporter/automate.rb
+++ b/lib/chef/audit/reporter/automate.rb
@@ -88,14 +88,8 @@ class Chef
end
end
- # ***************************************************************************************
- # TODO: We could likely simplify/remove some of the extra logic we have here with a small
- # revamp of the Automate expected input.
- # ***************************************************************************************
-
def enriched_report(final_report)
- # Remove nil profiles if any
- final_report[:profiles].select! { |p| p }
+ final_report[:profiles].compact!
# Label this content as an inspec_report
final_report[:type] = "inspec_report"
|
Remove a misleading TODO and simplify some code.
|
diff --git a/odinweb/constants.py b/odinweb/constants.py
index <HASH>..<HASH> 100644
--- a/odinweb/constants.py
+++ b/odinweb/constants.py
@@ -60,3 +60,14 @@ class Type(str, enum.Enum):
Boolean = "boolean", bool, fields.BooleanField
# Array = "array", list, fields.ListField
# File = "file", str, fields.StringField
+
+
+PATH_STRING_RE = r'[-\w.~,!%]+'
+"""
+Regular expression for a "string" in a URL path.
+
+This includes all `Unreserved Characters <https://tools.ietf.org/html/rfc3986#section-2.3>`_
+from URL Syntax RFC as well as a selection of sub-delims from
+`Reserved Characters <https://tools.ietf.org/html/rfc3986#section-2.2>`_.
+
+"""
|
Added a path string regular expression to provide a good base point.
|
diff --git a/openquake/calculators/ebrisk.py b/openquake/calculators/ebrisk.py
index <HASH>..<HASH> 100644
--- a/openquake/calculators/ebrisk.py
+++ b/openquake/calculators/ebrisk.py
@@ -61,9 +61,10 @@ def _calc(computers, events, min_iml, rlzs_by_gsim, weights,
for c in computers:
with mon_haz:
gmfs.append(c.compute_all(min_iml, rlzs_by_gsim))
- gmftimes.append((c.rupture.ridx, mon_haz.dt))
+ gmftimes.append((c.rupture.ridx, len(c.sids), mon_haz.dt))
gmfs = numpy.concatenate(gmfs)
- gmftimes = numpy.array(gmftimes, [('ridx', U32), ('dt', F32)])
+ gmftimes = numpy.array(
+ gmftimes, [('ridx', U32), ('nsites', U16), ('dt', F32)])
for sid, haz in general.group_array(gmfs, 'sid').items():
gmf_nbytes += haz.nbytes
|
Stored the number of sites affected by each contributing ruptures
Former-commit-id: 4cc<I>fe8cc0e4a<I>aaf<I>eeab<I>cf4ced1a<I> [formerly be<I>cfba<I>b4fc1d<I>f<I>ef<I>d]
Former-commit-id: a<I>f<I>ede<I>d<I>d<I>e7e6
|
diff --git a/spec/support/kit/temp_dir.rb b/spec/support/kit/temp_dir.rb
index <HASH>..<HASH> 100644
--- a/spec/support/kit/temp_dir.rb
+++ b/spec/support/kit/temp_dir.rb
@@ -14,9 +14,10 @@ RSpec.configure do |config|
config.include RSpec::Kit::TempDirContext
config.before do |example|
- if example.metadata[:temp_dir]
- FileUtils.rm_rf(temp_dir) if File.exist?(temp_dir)
- FileUtils.mkdir_p(temp_dir)
- end
+ FileUtils.mkdir_p(temp_dir) if example.metadata[:temp_dir]
+ end
+
+ config.after do |example|
+ FileUtils.rm_rf(temp_dir) if example.metadata[:temp_dir]
end
end
|
Updated RSpec temp_dir clean to happen after test.
- Necessary to build new sub-directory structures within
the temp_dir without it being deleted with each before
block.
- Moves cleaning up of the temp_dir after each test.
|
diff --git a/src/Check/Callback.php b/src/Check/Callback.php
index <HASH>..<HASH> 100644
--- a/src/Check/Callback.php
+++ b/src/Check/Callback.php
@@ -6,6 +6,13 @@ class Callback extends \Psecio\Validation\Check
{
public function execute($input)
{
- return false;
+ $addl = $this->get();
+ list($class, $method) = explode('::', $addl[0]);
+
+ if (!method_exists($class, $method)) {
+ throw new \InvalidArgumentException('Invalid callback: '.$method);
+ }
+ $call = $class.'::'.$method;
+ return $call($input);
}
}
|
making the Callback check work with a static class::method
|
diff --git a/packages/ui-list/src/List/index.js b/packages/ui-list/src/List/index.js
index <HASH>..<HASH> 100644
--- a/packages/ui-list/src/List/index.js
+++ b/packages/ui-list/src/List/index.js
@@ -51,7 +51,7 @@ category: components
**/
@deprecated('8.0.0', {
variant: 'List with the isUnstyled boolean or InlineList',
- delimeter:
+ delimiter:
'with delimiter set to [pipe, slash, arrow] will only be available when using [InlineList] as of version 8.0.0.'
})
@testable()
|
chore(ui-list): fix typo
|
diff --git a/src/victory-util/style.js b/src/victory-util/style.js
index <HASH>..<HASH> 100644
--- a/src/victory-util/style.js
+++ b/src/victory-util/style.js
@@ -54,6 +54,6 @@ export default {
blue: ["#002C61", "#004B8F", "#006BC9", "#3795E5", "#65B4F4"],
green: ["#354722", "#466631", "#649146", "#8AB25C", "#A9C97E"]
};
- return name ? scales[name] : scales.greyscale;
+ return name ? scales[name] : scales.grayscale;
}
};
|
Fix victory-util/style.js typo
Spelling of property 'grayscale' incrorrectly referenced as 'greyscale' in return statement of getColorScale function
|
diff --git a/lib/contentful_redis/model_base.rb b/lib/contentful_redis/model_base.rb
index <HASH>..<HASH> 100644
--- a/lib/contentful_redis/model_base.rb
+++ b/lib/contentful_redis/model_base.rb
@@ -11,6 +11,8 @@ module ContentfulRedis
class ModelBase
class << self
def find(id, env = nil)
+ raise ContentfulRedis::Error::ArgumentError, 'Expected Contentful model ID' unless id.is_a?(String)
+
parameters = { 'sys.id': id, content_type: content_model }
new(ContentfulRedis::Request.new(space, parameters, :get, request_env(env)).call)
diff --git a/spec/contentful_redis/model_base_spec.rb b/spec/contentful_redis/model_base_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/contentful_redis/model_base_spec.rb
+++ b/spec/contentful_redis/model_base_spec.rb
@@ -257,5 +257,11 @@ RSpec.describe ContentfulRedis::ModelBase, contentful: true do
ContentfulRedis::ModelBase.find_by(error: '')
end.to raise_error ContentfulRedis::Error::ArgumentError
end
+
+ it 'raises a ArgumentError when #find is called without a string id' do
+ expect do
+ ContentfulRedis::ModelBase.find(id: 'xxxx')
+ end.to raise_error ContentfulRedis::Error::ArgumentError
+ end
end
end
|
fix-issue <I> cannot call find with a hash (#<I>)
|
diff --git a/bika/lims/browser/__init__.py b/bika/lims/browser/__init__.py
index <HASH>..<HASH> 100644
--- a/bika/lims/browser/__init__.py
+++ b/bika/lims/browser/__init__.py
@@ -65,12 +65,17 @@ def ulocalized_time(time, long_format=None, time_only=None, context=None,
time_str = _ut(time, long_format, time_only, context,
'bika', request)
except ValueError:
- # dividing by 1000 is necessary because your JavaScript returns
- # the timestamp in milliseconds, and ulocalized_time()
- # expects a timestamp in seconds.
- time = time/1000
- time_str = _ut(time, long_format, time_only, context,
- 'bika', request)
+ # TODO: Clean-up this mess
+ # Maybe the date was captured with js, which returns the timestamp
+ # in milliseconds, while ulocalized_time() expects a timestamp in
+ # seconds.
+ try:
+ time = time/1000
+ time_str = _ut(time, long_format, time_only, context,
+ 'bika', request)
+ except:
+ time_str = ''
+
return time_str
|
Additional try except. I know is ugly, but is just a temporary fix
|
diff --git a/decls/validator.js b/decls/validator.js
index <HASH>..<HASH> 100644
--- a/decls/validator.js
+++ b/decls/validator.js
@@ -3,6 +3,8 @@ declare type ValidatorDefinition = {
message?: string|Function // error message
}
+declare type ValidatorAsset = Function|ValidatorDefinition
+
declare type ValidationError = {
field: string,
validator: string,
diff --git a/src/asset.js b/src/asset.js
index <HASH>..<HASH> 100644
--- a/src/asset.js
+++ b/src/asset.js
@@ -30,8 +30,8 @@ export default function (Vue: GlobalAPI): void {
*/
function validator (
id: string,
- def?: Function | ValidatorDefinition
- ): Function | ValidatorDefinition | void {
+ def?: ValidatorAsset
+ ): ValidatorAsset|void {
if (def === undefined) {
return Vue.options['validators'][id]
} else {
|
:shirt: refactor(asset): update flowtype
|
diff --git a/ca/django_ca/models.py b/ca/django_ca/models.py
index <HASH>..<HASH> 100644
--- a/ca/django_ca/models.py
+++ b/ca/django_ca/models.py
@@ -148,6 +148,14 @@ class X509CertMixin(models.Model):
return 'critical,%s' % value
return str(value)
+ def extensions_cryptography(self):
+ for ext in sorted(self.x509c.extensions, key=lambda e: e.oid._name):
+ name = ext.oid._name
+ if hasattr(self, name):
+ yield name, getattr(self, name)()
+ else:
+ yield name, ext.value
+
def distinguishedName(self):
return format_subject(self.subject)
distinguishedName.short_description = 'Distinguished Name'
|
add method to print all extensions of the certificate
|
diff --git a/lib/trim-slash.js b/lib/trim-slash.js
index <HASH>..<HASH> 100644
--- a/lib/trim-slash.js
+++ b/lib/trim-slash.js
@@ -14,12 +14,10 @@
* @ nosideeffects
*/
function trimSlash(string) {
- if (typeof string !== 'string') {
- return string;
- }
- if (string.length > 0 && string.charAt(string.length - 1) === '/') {
- return string.slice(0, string.length - 1);
+ if (typeof string === 'string' && string.endsWith('/')) {
+ return string.slice(0, -1);
}
+
return string;
}
|
style: clean up trimSlash
This code violates the ESLint unicorn/prefer-negative-index rule. Clean
it up and simplify a bit.
|
diff --git a/salt/states/virt.py b/salt/states/virt.py
index <HASH>..<HASH> 100644
--- a/salt/states/virt.py
+++ b/salt/states/virt.py
@@ -15,11 +15,26 @@ from __future__ import absolute_import
# Import python libs
import os
+try:
+ import libvirt # pylint: disable=import-error
+ HAS_LIBVIRT = True
+except ImportError:
+ HAS_LIBVIRT = False
# Import salt libs
import salt.utils
+def __virtual__():
+ '''
+ Only if libvirt bindings for Python are installed.
+
+ :return:
+ '''
+
+ return HAS_LIBVIRT
+
+
def keys(name, basepath='/etc/pki'):
'''
Manage libvirt keys.
|
Add __virtual__ to check if libvirt is installed for the virt state
|
diff --git a/lazysignup/tests.py b/lazysignup/tests.py
index <HASH>..<HASH> 100644
--- a/lazysignup/tests.py
+++ b/lazysignup/tests.py
@@ -191,4 +191,14 @@ class LazyTestCase(TestCase):
def testGetConvert(self):
self.client.get('/lazy/')
response = self.client.get('/convert/')
- self.assertEqual(200, response.status_code)
\ No newline at end of file
+ self.assertEqual(200, response.status_code)
+
+ def testConversionKeepsSameUser(self):
+ self.client.get('/lazy/')
+ response = self.client.post('/convert/', {
+ 'username': 'demo',
+ 'password1': 'password',
+ 'password2': 'password',
+ })
+ self.assertEqual(1, len(User.objects.all()))
+
\ No newline at end of file
|
Extra test to check that the same user is maintained
|
diff --git a/molgenis-data-mapper/src/main/java/org/molgenis/data/algorithm/AlgorithmServiceImpl.java b/molgenis-data-mapper/src/main/java/org/molgenis/data/algorithm/AlgorithmServiceImpl.java
index <HASH>..<HASH> 100644
--- a/molgenis-data-mapper/src/main/java/org/molgenis/data/algorithm/AlgorithmServiceImpl.java
+++ b/molgenis-data-mapper/src/main/java/org/molgenis/data/algorithm/AlgorithmServiceImpl.java
@@ -80,9 +80,15 @@ public class AlgorithmServiceImpl implements AlgorithmService
{
return null;
}
- Object value = ScriptEvaluator.eval(algorithm, sourceEntity);
- return AlgorithmServiceImpl.convert(value, attributeMapping.getTargetAttributeMetaData().getDataType()
- .getEnumType());
+ try
+ {
+ Object value = ScriptEvaluator.eval(algorithm, sourceEntity);
+ return convert(value, attributeMapping.getTargetAttributeMetaData().getDataType().getEnumType());
+ }
+ catch (RuntimeException e)
+ {
+ return null;
+ }
}
private static Object convert(Object value, FieldTypeEnum targetDataType)
|
Catch exception if script eval fails while creating integrated dataset
|
diff --git a/gns3server/version.py b/gns3server/version.py
index <HASH>..<HASH> 100644
--- a/gns3server/version.py
+++ b/gns3server/version.py
@@ -23,7 +23,7 @@
# or negative for a release candidate or beta (after the base version
# number has been incremented)
-__version__ = "2.1.1"
+__version__ = "2.1.2dev1"
__version_info__ = (2, 1, 1, 0)
# If it's a git checkout try to add the commit
|
Development on <I>dev1
|
diff --git a/hydpy/core/timetools.py b/hydpy/core/timetools.py
index <HASH>..<HASH> 100644
--- a/hydpy/core/timetools.py
+++ b/hydpy/core/timetools.py
@@ -373,6 +373,10 @@ class Date(object):
self.datetime = date
elif isinstance(date, str):
self._initfromstr(date)
+ elif isinstance(date, TOY):
+ self.datetime = datetime.datetime(2000,
+ date.month, date.day, date.hour,
+ date.minute, date.second)
else:
raise TypeError('The supplied argument must be either an '
'instance of `datetime.datetime` or of `str`. '
|
Allow TOY objects as initialization arguments for class Date.
Note that the year is generally set to <I>, which is a leap year.
|
diff --git a/lib/ronin/database/database.rb b/lib/ronin/database/database.rb
index <HASH>..<HASH> 100644
--- a/lib/ronin/database/database.rb
+++ b/lib/ronin/database/database.rb
@@ -46,7 +46,7 @@ module Ronin
# Default configuration of the database
DEFAULT_CONFIG = {
- :adapter => :sqlite3,
+ :adapter => 'sqlite3',
:database => File.join(Config::PATH,'database.sqlite3')
}
|
Make sure the :adapture option is a String for DM <I>.
|
diff --git a/ipyrad/assemble/cluster_within.py b/ipyrad/assemble/cluster_within.py
index <HASH>..<HASH> 100644
--- a/ipyrad/assemble/cluster_within.py
+++ b/ipyrad/assemble/cluster_within.py
@@ -418,10 +418,10 @@ def build_clusters(data, sample):
LOGGER.info("exc indbld: %s %s", inserts, revseq)
seqslist.append("\n".join(seq))
- if count % 1000:
- clustfile.write("\n//\n//\n".join(seqslist)+"\n")
- seqslist = []
- count = 0
+ #if count % 1000:
+ # clustfile.write("\n//\n//\n".join(seqslist)+"\n")
+ # seqslist = []
+ # count = 0
## This will get skipped but the part below assumes there is already
## at least one seq in the file (prepends the // sep)
|
Reverting a change that broke cluster_within
|
diff --git a/lib/plugins/tag/img.js b/lib/plugins/tag/img.js
index <HASH>..<HASH> 100644
--- a/lib/plugins/tag/img.js
+++ b/lib/plugins/tag/img.js
@@ -37,14 +37,10 @@ module.exports = ctx => {
let src;
// Find image URL and class name
- for (let i = 0, len = args.length; i < len; i++) {
- const item = args[i];
-
+ while (args.length > 0) {
+ const item = args.shift();
if (rUrl.test(item) || item[0] === '/') {
src = makeUrl(item);
-
- // Delete image URL and class name from arguments
- args = args.slice(i + 1);
break;
} else {
classes.push(item);
|
Changed not to use Array#slice()
|
diff --git a/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ParentController.java b/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ParentController.java
index <HASH>..<HASH> 100644
--- a/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ParentController.java
+++ b/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ParentController.java
@@ -74,6 +74,7 @@ public abstract class ParentController<T extends ViewGroup> extends ViewControll
}
}
+ @CallSuper
void clearOptions() {
options = initialOptions.copy();
}
diff --git a/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/StackController.java b/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/StackController.java
index <HASH>..<HASH> 100644
--- a/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/StackController.java
+++ b/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/StackController.java
@@ -42,6 +42,7 @@ public class StackController extends ParentController <StackLayout> {
@Override
void clearOptions() {
+ super.clearOptions();
stackLayout.clearOptions();
}
|
Require clearOptions to calls super
|
diff --git a/lib/dm-core/query/conditions/operation.rb b/lib/dm-core/query/conditions/operation.rb
index <HASH>..<HASH> 100644
--- a/lib/dm-core/query/conditions/operation.rb
+++ b/lib/dm-core/query/conditions/operation.rb
@@ -96,7 +96,7 @@ module DataMapper
# TODO: document
# @api semipublic
def <<(operand)
- unless operand.kind_of? Conditions::AbstractOperation or operand.kind_of? Conditions::AbstractComparison
+ unless operand.kind_of? Conditions::AbstractOperation or operand.kind_of? Conditions::AbstractComparison or operand.kind_of? Array
raise ArgumentError, "Operands must be a kind of DataMapper::Query::Conditions::AbstractOperation or DataMapper::Query::Conditions::AbstractComparison. This one was a #{operand.class}"
end
@operands << operand unless operand.nil?
|
Accommodating Arrays as operands
|
diff --git a/lib/gphoto2/camera.rb b/lib/gphoto2/camera.rb
index <HASH>..<HASH> 100644
--- a/lib/gphoto2/camera.rb
+++ b/lib/gphoto2/camera.rb
@@ -108,7 +108,7 @@ module GPhoto2
end
def [](key)
- config[key]
+ config[key.to_s]
end
def []=(key, value)
|
Allow config keys to be passed as symbols
|
diff --git a/lib/mongoose/delete.js b/lib/mongoose/delete.js
index <HASH>..<HASH> 100644
--- a/lib/mongoose/delete.js
+++ b/lib/mongoose/delete.js
@@ -7,6 +7,7 @@ const async = require('async');
/**
+ * @module mongoose-rest-actions
* @name deletePlugin
* @function deletePlugin
* @description mongoose schema plugin to support http delete verb
@@ -25,6 +26,7 @@ const async = require('async');
* const app = express();
*
* ....
+ *
* app.delete('/users/:id', function(request, response, next){
*
* //obtain id
|
update delete jsdocs:
|
diff --git a/dist/canvas.js b/dist/canvas.js
index <HASH>..<HASH> 100644
--- a/dist/canvas.js
+++ b/dist/canvas.js
@@ -87,8 +87,8 @@ Canvas.drawFunction = {
var y = this.Y(obj.points[0].y);
var w = obj.points[1].x - obj.points[0].x;
var h = - (obj.points[1].y - obj.points[0].y); // 左下を原点として扱っているからマイナスしないと計算があわない
- this.canvas.strokeRect(x, y, w, h); // 上でX()、Y()している
- if (obj.style.fillColor !== null) this.canvas.fill();
+ if (obj.style.fillColor !== null) this.canvas.fillRect(x, y, w, h); // 上でそれぞれX()、Y()適用済み
+ else this.canvas.strokeRect(x, y, w, h);
},
Text: function(obj) {
this.canvas.textAlign = obj.style.align;
|
bugfix: fill Rect.
fill() isn’t needed for rect.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ description = "Command line script that automatically searches for video subtitl
setup(
name = "ss",
- version = "1.2.0",
+ version = "1.1.0",
packages = [],
scripts = ['ss.py'],
entry_points = {'console_scripts' : ['ss = ss:Main']},
|
bumping version to <I>
|
diff --git a/lib/motion/dealloc_logging.rb b/lib/motion/dealloc_logging.rb
index <HASH>..<HASH> 100644
--- a/lib/motion/dealloc_logging.rb
+++ b/lib/motion/dealloc_logging.rb
@@ -15,7 +15,7 @@ class RMX
end
def self.log_dealloc(object, verbose=false)
- LOG_DEALLOC_QUEUE.sync do
+ LOG_DEALLOC_QUEUE.async do
$rmx_log_deallocs.addObject(object)
end
if verbose || DEBUG_DEALLOC
|
need to use async with RM <I>, not sure exactly why yet
|
diff --git a/generators/Generator.py b/generators/Generator.py
index <HASH>..<HASH> 100644
--- a/generators/Generator.py
+++ b/generators/Generator.py
@@ -9,7 +9,7 @@ import os
import operator
import generators
-from generators import iterable, consume, itemgetter
+from generators import iterable, consume, itemgetter, rps
class OrderError(Exception):
pass
@@ -156,13 +156,15 @@ class Generator:
def next(self):
return next(self._iterable)
- def print(self, before='', use_repr=False):
+ def print(self, before='', use_repr=False, **print_options):
return Generator(self.side_task((
- lambda i:print('{}{}'.format(before, repr(i)))
+ lambda i:print('{}{}'.format(before, repr(i)), **print_options)
) if use_repr else (
- lambda i:print('{}{}'.format(before, i))
+ lambda i:print('{}{}'.format(before, i), **print_options)
)))
+ benchmark = rps
+
#def __slice__(self, s):
# raise NotImplementedError()
def __negative_slice__(self, s):
|
added easy benchmarking to the Generator class
|
diff --git a/scripts/init.js b/scripts/init.js
index <HASH>..<HASH> 100644
--- a/scripts/init.js
+++ b/scripts/init.js
@@ -149,13 +149,17 @@ module.exports = function(
console.log(chalk.cyan(` ${displayedCommand} start`));
console.log(' Starts the development server.');
console.log();
- console.log(chalk.cyan(` ${displayedCommand} run build`));
+ console.log(
+ chalk.cyan(` ${displayedCommand} ${useYarn ? '' : 'run '}build`)
+ );
console.log(' Bundles the app into static files for production.');
console.log();
console.log(chalk.cyan(` ${displayedCommand} test`));
console.log(' Starts the test runner.');
console.log();
- console.log(chalk.cyan(` ${displayedCommand} run eject`));
+ console.log(
+ chalk.cyan(` ${displayedCommand} ${useYarn ? '' : 'run '}eject`)
+ );
console.log(
' Removes this tool and copies build dependencies, configuration files'
);
|
Suggest "yarn build" rather than "yarn run build" (#<I>)
* Fix for issue #<I>: Suggested 'yarn build' versus 'yarn run build'
* remove 'run' from 'yarn test' command as well
* conditionally show 'run' if Yarn is not available
|
diff --git a/lnwire/onion_error.go b/lnwire/onion_error.go
index <HASH>..<HASH> 100644
--- a/lnwire/onion_error.go
+++ b/lnwire/onion_error.go
@@ -663,7 +663,7 @@ func (f *FailFeeInsufficient) Code() FailCode {
//
// NOTE: Implements the error interface.
func (f FailFeeInsufficient) Error() string {
- return fmt.Sprintf("FeeInsufficient(fee=%v, update=%v", f.HtlcMsat,
+ return fmt.Sprintf("FeeInsufficient(htlc_amt==%v, update=%v", f.HtlcMsat,
spew.Sdump(f.Update))
}
|
lnwire: fix logging for FeeInsufficient, show amt not fee
Fixes #<I>.
|
diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/GraphHistory.js b/server/sonar-web/src/main/js/apps/projectActivity/components/GraphHistory.js
index <HASH>..<HASH> 100644
--- a/server/sonar-web/src/main/js/apps/projectActivity/components/GraphHistory.js
+++ b/server/sonar-web/src/main/js/apps/projectActivity/components/GraphHistory.js
@@ -64,6 +64,8 @@ export default class GraphHistory extends React.PureComponent {
formatValue = (tick /*: string | number */) =>
formatMeasure(tick, getShortType(this.props.metricsType));
+ formatTooltipValue = (tick /*: string | number */) => formatMeasure(tick, this.props.metricsType);
+
updateTooltip = (
selectedDate /*: ?Date */,
tooltipXPos /*: ?number */,
@@ -106,7 +108,7 @@ export default class GraphHistory extends React.PureComponent {
tooltipXPos != null &&
<GraphsTooltips
events={this.props.events}
- formatValue={this.formatValue}
+ formatValue={this.formatTooltipValue}
graph={graph}
graphWidth={width}
measuresHistory={this.props.measuresHistory}
|
Do not round numbers in project activity graph's tooltips
|
diff --git a/fastcore.py b/fastcore.py
index <HASH>..<HASH> 100644
--- a/fastcore.py
+++ b/fastcore.py
@@ -265,7 +265,7 @@ def fastcore_lp10_cplex(model, subset_k, subset_p, epsilon):
zs_names = []
for rxnid in subset_p:
zs_names.append('z_'+rxnid)
- prob.variables.add(names=zs_names, lb=[0]*len(zs_names), ub=[max_bound*scaling]*len(zs_names), obj=[1]*len(zs_names))
+ prob.variables.add(names=zs_names, lb=[0]*len(zs_names), ub=[cplex.infinity]*len(zs_names), obj=[1]*len(zs_names))
# Define constraints
for rxnid in subset_p:
@@ -366,7 +366,7 @@ def fastcc(model, epsilon):
return consistent_subset
def find_sparse_mode(model, core, additional, singleton, epsilon):
- '''Find the support of a sparse mode containing the the core subset.'''
+ '''Find the support of a sparse mode containing the core subset.'''
if len(core) == 0:
return set()
|
fastcore: Fix variable bounds in LP<I> cplex
|
diff --git a/activemodel/lib/active_model/validations/confirmation.rb b/activemodel/lib/active_model/validations/confirmation.rb
index <HASH>..<HASH> 100644
--- a/activemodel/lib/active_model/validations/confirmation.rb
+++ b/activemodel/lib/active_model/validations/confirmation.rb
@@ -9,7 +9,7 @@ module ActiveModel
end
def validate_each(record, attribute, value)
- unless (confirmed = record.send("#{attribute}_confirmation")).nil?
+ unless (confirmed = record.public_send("#{attribute}_confirmation")).nil?
unless confirmation_value_equal?(record, attribute, value, confirmed)
human_attribute_name = record.class.human_attribute_name(attribute)
record.errors.add(:"#{attribute}_confirmation", :confirmation, **options.except(:case_sensitive).merge!(attribute: human_attribute_name))
|
*_confirmation is defined as a public method
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.