diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/classes/Collector.php b/classes/Collector.php
index <HASH>..<HASH> 100644
--- a/classes/Collector.php
+++ b/classes/Collector.php
@@ -78,6 +78,8 @@ abstract class QM_Collector {
if ( ! defined( $constant ) ) {
/* translators: Undefined PHP constant */
return __( 'undefined', 'query-monitor' );
+ } elseif ( is_string( constant( $constant ) ) && ! is_numeric( constant( $constant ) ) ) {
+ return constant( $constant );
} elseif ( ! constant( $constant ) ) {
return 'false';
} else {
|
Handle non-boolean constants such as WP_DEBUG_LOG, which now accepts a path too.
|
diff --git a/fastlane/lib/fastlane/version.rb b/fastlane/lib/fastlane/version.rb
index <HASH>..<HASH> 100644
--- a/fastlane/lib/fastlane/version.rb
+++ b/fastlane/lib/fastlane/version.rb
@@ -1,5 +1,5 @@
module Fastlane
- VERSION = '2.62.0'.freeze
+ VERSION = '2.62.1'.freeze
DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
MINIMUM_XCODE_RELEASE = "7.0".freeze
end
|
Version bump to <I> (#<I>)
|
diff --git a/findbugs/src/java/edu/umd/cs/findbugs/detect/FindDeadLocalStores.java b/findbugs/src/java/edu/umd/cs/findbugs/detect/FindDeadLocalStores.java
index <HASH>..<HASH> 100644
--- a/findbugs/src/java/edu/umd/cs/findbugs/detect/FindDeadLocalStores.java
+++ b/findbugs/src/java/edu/umd/cs/findbugs/detect/FindDeadLocalStores.java
@@ -99,6 +99,12 @@ public class FindDeadLocalStores implements Detector {
if (!isStore(location))
continue;
+ // Ignore exception handler blocks:
+ // javac always stores caught exceptions in
+ // a local, even if the value is not used.
+ if (location.getBasicBlock().isExceptionHandler())
+ continue;
+
IndexedInstruction store = (IndexedInstruction) location.getHandle().getInstruction();
int local = store.getIndex();
|
Ignore dead local stores in exception handler blocks:
javac always stores caught exceptions in a local, even if the
exception is ignored.
git-svn-id: <URL>
|
diff --git a/state/backups.go b/state/backups.go
index <HASH>..<HASH> 100644
--- a/state/backups.go
+++ b/state/backups.go
@@ -388,7 +388,7 @@ func (s *backupMetadataStorage) SetStored(meta filestorage.Metadata) error {
const backupStorageRoot = "/"
// Ensure we satisfy the interface.
-var _ = filestorage.RawFileStorage(&envFileStorage{})
+var _ = filestorage.RawFileStorage((*envFileStorage)(nil))
type envFileStorage struct {
envStor storage.Storage
|
Use a more canonical form for testing interface satisfaction.
|
diff --git a/view/attachments/tmpl/app.html.php b/view/attachments/tmpl/app.html.php
index <HASH>..<HASH> 100644
--- a/view/attachments/tmpl/app.html.php
+++ b/view/attachments/tmpl/app.html.php
@@ -163,7 +163,10 @@ $can_detach = isset(parameters()->config['can_detach']) ? parameters()->config['
<div class="attachments-top">
<div class="attachments-table">
<div class="attachments-upload">
- <div class="k-upload">Upload</div>
+ <?= helper('uploader.container', array(
+ 'container' => 'fileman-attachments',
+ 'element' => '.fileman-attachments-uploader',
+ )) ?>
</div>
<div class="attachments-lists">
<div class="attachments-existing">
|
re #<I>: Add uploader
|
diff --git a/nion/swift/ScriptsDialog.py b/nion/swift/ScriptsDialog.py
index <HASH>..<HASH> 100644
--- a/nion/swift/ScriptsDialog.py
+++ b/nion/swift/ScriptsDialog.py
@@ -19,6 +19,7 @@ from nion.ui import Converter
from nion.ui import Dialog
from nion.ui import Selection
from nion.swift import Widgets
+from nion.swift.model import PlugInManager
from nion.swift.model import Utility
_ = gettext.gettext
@@ -279,7 +280,8 @@ class RunScriptDialog(Dialog.ActionDialog):
if Utility.compare_versions(version, actual_version) > 0:
raise NotImplementedError("API requested version %s is greater than %s." % (version, actual_version))
return interactive_session
-
+ def get_api(self, version, ui_version):
+ return PlugInManager.api_broker_fn(version, ui_version)
try:
g = dict()
g["api_broker"] = APIBroker()
|
Add ability to get api object from script dialog.
|
diff --git a/tfatool/_version.py b/tfatool/_version.py
index <HASH>..<HASH> 100644
--- a/tfatool/_version.py
+++ b/tfatool/_version.py
@@ -1,2 +1,2 @@
-__version__ = "v2.0.3"
+__version__ = "v2.1.0"
|
minor version for the improvements to sync
|
diff --git a/lib/Gitlab/Api/Repositories.php b/lib/Gitlab/Api/Repositories.php
index <HASH>..<HASH> 100644
--- a/lib/Gitlab/Api/Repositories.php
+++ b/lib/Gitlab/Api/Repositories.php
@@ -178,6 +178,16 @@ class Repositories extends AbstractApi
/**
* @param int $project_id
+ * @param $sha
+ * @return mixed
+ */
+ public function commitrefs($project_id, $sha)
+ {
+ return $this->get($this->getProjectPath($project_id, 'repository/commits/'.$this->encodePath($sha) . '/refs'));
+ }
+
+ /**
+ * @param int $project_id
* @param array $parameters (
*
* @var string $branch Name of the branch to commit into. To create a new branch, also provide start_branch.
|
add a method to pull refs (tags and branches) for a given commit
|
diff --git a/src/Service/ViewHelper.php b/src/Service/ViewHelper.php
index <HASH>..<HASH> 100644
--- a/src/Service/ViewHelper.php
+++ b/src/Service/ViewHelper.php
@@ -138,6 +138,9 @@ class ViewHelper
*/
public function forms()
{
+ if (!$this->dataView->inputs) {
+ $this->dataView->setInputs($this->viewData->getInput());
+ }
return $this->dataView->forms;
}
|
fix bug that input values not populated in html form.
|
diff --git a/packages/vaex-viz/vaex/viz/mpl.py b/packages/vaex-viz/vaex/viz/mpl.py
index <HASH>..<HASH> 100644
--- a/packages/vaex-viz/vaex/viz/mpl.py
+++ b/packages/vaex-viz/vaex/viz/mpl.py
@@ -843,7 +843,7 @@ def plot(self, x=None, y=None, z=None, what="count(*)", vwhat=None, reduce=["col
if show:
pylab.show()
if return_extra:
- return im, grid, fgrid, ngrid, rgrid, rgba8
+ return im, grid, fgrid, ngrid, rgrid
else:
return im
# colorbar = None
|
Removed unused, undefined variable in the `plot` method.
|
diff --git a/indra/tools/reading/submit_reading_pipeline.py b/indra/tools/reading/submit_reading_pipeline.py
index <HASH>..<HASH> 100644
--- a/indra/tools/reading/submit_reading_pipeline.py
+++ b/indra/tools/reading/submit_reading_pipeline.py
@@ -304,9 +304,9 @@ def get_environment():
# Get the Elsevier keys from the Elsevier client
environment_vars = [
{'name': ec.api_key_env_name,
- 'value': ec.elsevier_keys.get('X-ELS-APIKey')},
+ 'value': ec.elsevier_keys.get('X-ELS-APIKey', '')},
{'name': ec.inst_key_env_name,
- 'value': ec.elsevier_keys.get('X-ELS-Insttoken')},
+ 'value': ec.elsevier_keys.get('X-ELS-Insttoken', '')},
{'name': 'AWS_ACCESS_KEY_ID',
'value': access_key},
{'name': 'AWS_SECRET_ACCESS_KEY',
|
Fix small bug in environment variables passed to batch.
|
diff --git a/src/ComponentManager.js b/src/ComponentManager.js
index <HASH>..<HASH> 100644
--- a/src/ComponentManager.js
+++ b/src/ComponentManager.js
@@ -55,12 +55,15 @@ ComponentManager.prototype._preprocess = function(next, args, callback) {
*/
ComponentManager.prototype.ls = function(args, callback) {
var config = utils.getConfig(),
- plugins = Object.keys(config.components[this._group]).join(' ') || '<none>',
+ components = Object.keys(config.components[this._group]).join(' ') || '<none>',
deps = Object.keys(config.dependencies[this._group]).join(' ') || '<none>';
- this._logger.write('Detected '+this._group+': '+plugins+
- '\nThird party '+this._group+': '+deps);
- callback(null, {components: plugins, dependencies: deps});
+ this._logger.write(
+ this._group+':\n' +
+ ' local: ' + components + '\n' +
+ ' dependencies: ' + deps + '\n'
+ );
+ callback(null, {components: components, dependencies: deps});
};
ComponentManager.prototype.rm = function(args, callback) {
|
Cleaned ls formatting. Fixes #<I>
|
diff --git a/dramatiq/cli.py b/dramatiq/cli.py
index <HASH>..<HASH> 100644
--- a/dramatiq/cli.py
+++ b/dramatiq/cli.py
@@ -388,6 +388,8 @@ def worker_process(args, worker_id, logging_pipe, canteen, event):
# worker process will realize that soon enough.
event.set()
+ running = True
+
def termhandler(signum, frame):
nonlocal running
if running:
@@ -408,7 +410,6 @@ def worker_process(args, worker_id, logging_pipe, canteen, event):
# Unblock the blocked signals inherited from the parent process.
try_unblock_signals()
- running = True
while running:
time.sleep(1)
|
cli: ensure 'running' is assigned before reference
Fixes #<I>
|
diff --git a/src/Symfony/Component/HttpFoundation/RequestMatcher.php b/src/Symfony/Component/HttpFoundation/RequestMatcher.php
index <HASH>..<HASH> 100644
--- a/src/Symfony/Component/HttpFoundation/RequestMatcher.php
+++ b/src/Symfony/Component/HttpFoundation/RequestMatcher.php
@@ -70,7 +70,7 @@ class RequestMatcher implements RequestMatcherInterface
*/
public function matchMethod($method)
{
- $this->methods = array_map('strtolower', is_array($method) ? $method : array($method));
+ $this->methods = array_map('strtoupper', is_array($method) ? $method : array($method));
}
/**
@@ -89,7 +89,7 @@ class RequestMatcher implements RequestMatcherInterface
*/
public function matches(Request $request)
{
- if (null !== $this->methods && !in_array(strtolower($request->getMethod()), $this->methods)) {
+ if (null !== $this->methods && !in_array($request->getMethod(), $this->methods)) {
return false;
}
|
[HttpFoundation] simplified code
|
diff --git a/sos/plugins/pacemaker.py b/sos/plugins/pacemaker.py
index <HASH>..<HASH> 100644
--- a/sos/plugins/pacemaker.py
+++ b/sos/plugins/pacemaker.py
@@ -44,7 +44,7 @@ class Pacemaker(Plugin):
self.add_copy_spec("/var/log/pcsd/pcsd.log")
self.add_cmd_output([
"pcs config",
- "pcs status",
+ "pcs status --full",
"pcs stonith sbd status",
"pcs stonith sbd watchdog list",
"pcs stonith history show",
|
[pacemaker] Collect full status output
Changes the 'pcs status' collection to display full status results.
Resolves: #<I>
|
diff --git a/common/models/LoginForm.php b/common/models/LoginForm.php
index <HASH>..<HASH> 100644
--- a/common/models/LoginForm.php
+++ b/common/models/LoginForm.php
@@ -67,7 +67,7 @@ class LoginForm extends Model
*
* @return User|null
*/
- private function getUser()
+ protected function getUser()
{
if ($this->_user === null) {
$this->_user = User::findByUsername($this->username);
|
Changed \common\models\LoginForm::getUser from private to protected
|
diff --git a/alphafilter/templatetags/alphafilter.py b/alphafilter/templatetags/alphafilter.py
index <HASH>..<HASH> 100644
--- a/alphafilter/templatetags/alphafilter.py
+++ b/alphafilter/templatetags/alphafilter.py
@@ -90,7 +90,6 @@ class AlphabetFilterNode(Node):
def render(self, context):
try:
qset = self.qset.resolve(context)
-
except VariableDoesNotExist:
raise TemplateSyntaxError("Can't resolve the queryset passed")
try:
@@ -106,7 +105,9 @@ class AlphabetFilterNode(Node):
if request is not None:
alpha_lookup = request.GET.get(alpha_field, '')
- qstring_items = request.GET.items()
+ qstring_items = request.GET.copy()
+ if alpha_field in qstring_items:
+ qstring_items.pop(alpha_field)
qstring = "&".join(["%s=%s" % (k, v) for k, v in qstring_items])
else:
alpha_lookup = ''
|
The query string was appending the field lookup, so I needed to pop it from the query string stack.
|
diff --git a/src/java/arjdbc/mysql/MySQLRubyJdbcConnection.java b/src/java/arjdbc/mysql/MySQLRubyJdbcConnection.java
index <HASH>..<HASH> 100644
--- a/src/java/arjdbc/mysql/MySQLRubyJdbcConnection.java
+++ b/src/java/arjdbc/mysql/MySQLRubyJdbcConnection.java
@@ -222,6 +222,13 @@ public class MySQLRubyJdbcConnection extends RubyJdbcConnection {
}
@Override
+ protected String caseConvertIdentifierForRails(final Connection connection, final String value)
+ throws SQLException {
+ if ( value == null ) return null;
+ return value; // MySQL does not storesUpperCaseIdentifiers() :
+ }
+
+ @Override
protected Connection newConnection() throws RaiseException, SQLException {
final Connection connection = super.newConnection();
killCancelTimer(connection);
|
MySQL does not store upper-case identifiers (for lower case it depends)
|
diff --git a/tests/custom_map_key_type.go b/tests/custom_map_key_type.go
index <HASH>..<HASH> 100644
--- a/tests/custom_map_key_type.go
+++ b/tests/custom_map_key_type.go
@@ -22,9 +22,8 @@ var customMapKeyTypeValue CustomMapKeyType
func init() {
customMapKeyTypeValue.Map = map[customKeyType]int{
- customKeyType{0x01, 0x01}: 1,
- customKeyType{0x02, 0x02}: 2,
+ customKeyType{0x01, 0x02}: 3,
}
}
-var customMapKeyTypeValueString = `{"Map":{"0101":1,"0202":2}}`
+var customMapKeyTypeValueString = `{"Map":{"0102":3}}`
|
reduce the unit test map to 1 element so the encoding is consistent
otherwise, since the map iterates in randomish order, some of the time
the element order does not match the unit test expected result, causing
the unit test to fail unnecessarily.
|
diff --git a/findbugs/src/java/edu/umd/cs/findbugs/detect/FindUncalledPrivateMethods.java b/findbugs/src/java/edu/umd/cs/findbugs/detect/FindUncalledPrivateMethods.java
index <HASH>..<HASH> 100644
--- a/findbugs/src/java/edu/umd/cs/findbugs/detect/FindUncalledPrivateMethods.java
+++ b/findbugs/src/java/edu/umd/cs/findbugs/detect/FindUncalledPrivateMethods.java
@@ -51,6 +51,7 @@ public class FindUncalledPrivateMethods extends BytecodeScanningDetector {
&& !methodName.equals("readObject")
&& !methodName.equals("writeObject")
&& !methodName.equals("<init>")
+ && !methodName.equals("<clinit>")
)
definedPrivateMethods.add(MethodAnnotation.fromVisitedMethod(this));
}
|
Don't report class initializers. While Sun's javac gives these
default access, jikes makes them private, which would lead to spurious
warnings.
git-svn-id: <URL>
|
diff --git a/cas-server-core/src/main/java/org/jasig/cas/ticket/TicketGrantingTicketImpl.java b/cas-server-core/src/main/java/org/jasig/cas/ticket/TicketGrantingTicketImpl.java
index <HASH>..<HASH> 100644
--- a/cas-server-core/src/main/java/org/jasig/cas/ticket/TicketGrantingTicketImpl.java
+++ b/cas-server-core/src/main/java/org/jasig/cas/ticket/TicketGrantingTicketImpl.java
@@ -50,7 +50,6 @@ public final class TicketGrantingTicketImpl extends AbstractTicket implements Ti
/** Unique Id for serialization. */
private static final long serialVersionUID = -5197946718924166491L;
- private static final Logger LOGGER = LoggerFactory.getLogger(TicketGrantingTicketImpl.class);
/** The authenticated object for which this ticket was generated for. */
@Lob
@Column(name="AUTHENTICATION", nullable=false)
|
NOJIRA: Fixed compilation issue after the merge with master. Removed the unneeded logger.
|
diff --git a/families/track_and_trade/server/api/users.js b/families/track_and_trade/server/api/users.js
index <HASH>..<HASH> 100644
--- a/families/track_and_trade/server/api/users.js
+++ b/families/track_and_trade/server/api/users.js
@@ -23,13 +23,14 @@ const auth = require('./auth')
const { BadRequest } = require('./errors')
const create = user => {
- return agents.fetch(user.publicKey, null)
- .then(agent => {
- if (!agent) {
- throw new BadRequest('Public key must match an Agent on the blockchain')
- }
- return auth.hashPassword(user.password)
+ return Promise.resolve()
+ .then(() => {
+ return agents.fetch(user.publicKey, null)
+ .catch(() => {
+ throw new BadRequest('Public key must match an Agent on blockchain')
+ })
})
+ .then(() => auth.hashPassword(user.password))
.then(hashed => {
return db.insert(_.assign({}, user, {password: hashed}))
.catch(err => { throw new BadRequest(err.message) })
|
Fix error handling when creating a user without Agent
|
diff --git a/spacy/about.py b/spacy/about.py
index <HASH>..<HASH> 100644
--- a/spacy/about.py
+++ b/spacy/about.py
@@ -1,6 +1,6 @@
# fmt: off
__title__ = "spacy-nightly"
-__version__ = "3.0.0a34"
+__version__ = "3.0.0a35"
__download_url__ = "https://github.com/explosion/spacy-models/releases/download"
__compatibility__ = "https://raw.githubusercontent.com/explosion/spacy-models/master/compatibility.json"
__projects__ = "https://github.com/explosion/projects"
|
Set version to <I>a<I>
|
diff --git a/stanza/server/semgrex.py b/stanza/server/semgrex.py
index <HASH>..<HASH> 100644
--- a/stanza/server/semgrex.py
+++ b/stanza/server/semgrex.py
@@ -25,11 +25,11 @@ relative to the search if used many times on small documents. Ideally
larger texts would be processed, and all of the desired semgrex
patterns would be run at once. The worst thing to do would be to call
this multiple times on a large document, one invocation per semgrex
-pattern, as that would serialize the document each time. There are of
-course multiple ways of making this more efficient, such as including
-it as a separate call in the server or keeping the subprocess alive
-for multiple queries, but we didn't do any of those. We do, however,
-accept pull requests...
+pattern, as that would serialize the document each time.
+Included here is a context manager which allows for keeping the same
+java process open for multiple requests. This saves on the subprocess
+launching time. It is still important not to wastefully serialize the
+same document over and over, though.
"""
import stanza
|
Update an incorrect doc in the semgrex context manager
|
diff --git a/lark/parsers/resolve_ambig.py b/lark/parsers/resolve_ambig.py
index <HASH>..<HASH> 100644
--- a/lark/parsers/resolve_ambig.py
+++ b/lark/parsers/resolve_ambig.py
@@ -24,7 +24,10 @@ def _compare_rules(rule1, rule2):
def _compare_drv(tree1, tree2):
if not (isinstance(tree1, Tree) and isinstance(tree2, Tree)):
- return -compare(tree1, tree2)
+ try:
+ return -compare(tree1, tree2)
+ except TypeError:
+ return 0
try:
rule1, rule2 = tree1.rule, tree2.rule
|
Bugfix #<I>: Ambiguity resolver sometimes failed under Python3
|
diff --git a/pemutil_test.go b/pemutil_test.go
index <HASH>..<HASH> 100644
--- a/pemutil_test.go
+++ b/pemutil_test.go
@@ -6,6 +6,7 @@ import (
"errors"
"io/ioutil"
"path"
+ "sort"
"strings"
"testing"
)
@@ -261,13 +262,29 @@ func TestGenKeys(t *testing.T) {
}
}
-func keys(s Store) []BlockType {
- k := make([]BlockType, len(s))
+type BlockTypeKeys []BlockType
+
+func (btk BlockTypeKeys) Len() int {
+ return len(btk)
+}
+
+func (btk BlockTypeKeys) Swap(i, j int) {
+ btk[i], btk[j] = btk[j], btk[i]
+}
+
+func (btk BlockTypeKeys) Less(i, j int) bool {
+ return strings.Compare(btk[i].String(), btk[j].String()) < 0
+}
+
+func keys(s Store) BlockTypeKeys {
+ k := make(BlockTypeKeys, len(s))
i := 0
for key, _ := range s {
k[i] = key
i++
}
+ sort.Sort(k)
+
return k
}
|
Adding sorting to map key check to fix unit test failure
|
diff --git a/tasklib/backends.py b/tasklib/backends.py
index <HASH>..<HASH> 100644
--- a/tasklib/backends.py
+++ b/tasklib/backends.py
@@ -201,3 +201,6 @@ class TaskWarrior(object):
# altering the data before saving
task.refresh(after_save=True)
+ def delete_task(self, task):
+ self.execute_command([task['uuid'], 'delete'])
+
diff --git a/tasklib/task.py b/tasklib/task.py
index <HASH>..<HASH> 100644
--- a/tasklib/task.py
+++ b/tasklib/task.py
@@ -586,7 +586,7 @@ class Task(TaskResource):
if self.deleted:
raise Task.DeletedTask("Task was already deleted")
- self.warrior.execute_command([self['uuid'], 'delete'])
+ self.backend.delete_task(self)
# Refresh the status again, so that we have updated info stored
self.refresh(only_fields=['status', 'start', 'end'])
|
Task: Move TW-specific deletion logic into TW backend
|
diff --git a/assets/js/components/Revealer.js b/assets/js/components/Revealer.js
index <HASH>..<HASH> 100644
--- a/assets/js/components/Revealer.js
+++ b/assets/js/components/Revealer.js
@@ -153,6 +153,7 @@ class Group {
this.elements[i].hide();
}
}
+ this.adminController.refreshUi();
}
// --------------------------------------------------------------------------
|
Refreshing the UI after revealing
|
diff --git a/src/pfs/fuse/fuse.go b/src/pfs/fuse/fuse.go
index <HASH>..<HASH> 100644
--- a/src/pfs/fuse/fuse.go
+++ b/src/pfs/fuse/fuse.go
@@ -1,9 +1,8 @@
package fuse
type Mounter interface {
- // Mount mounts a repository available as a fuse filesystem at mountPoint at the commitID.
- // commitID is optional - if not passed, all commits will be mounted.
- // Mount will not block and will return once mounted, or error otherwise.
+ // Mount mounts a repository available as a fuse filesystem at mountPoint.
+ // Mount blocks and will return once the volume is unmounted.
Mount(
mountPoint string,
shard uint64,
|
Updates docs for Mount.
|
diff --git a/src/Condition/Compiler.php b/src/Condition/Compiler.php
index <HASH>..<HASH> 100644
--- a/src/Condition/Compiler.php
+++ b/src/Condition/Compiler.php
@@ -152,7 +152,7 @@ class Compiler
}
$conditions = $model->getPermissionWheres($this->user, $where['permission']);
- if (!$conditions->wheres) {
+ if (!$conditions->wheres || (count($conditions->wheres) === 1 && $conditions->wheres[0]['type'] === 'raw' && $conditions->wheres[0]['sql'] === 'TRUE')) {
return $query;
}
|
If there's only one condition and it's satisfied, don't need to continue
|
diff --git a/pagelet.js b/pagelet.js
index <HASH>..<HASH> 100644
--- a/pagelet.js
+++ b/pagelet.js
@@ -461,20 +461,28 @@ Pagelet.prototype.emit = function emit(event) {
* @api public
*/
Pagelet.prototype.broadcast = function broadcast(event) {
- EventEmitter.prototype.emit.apply(this, arguments);
+ var pagelet = this;
- var name = this.name +':'+ event;
+ /**
+ * Broadcast the event with namespaced name.
+ *
+ * @param {String} name Event name.
+ * @returns {Pagelet}
+ * @api private
+ */
+ function shout(name) {
+ pagelet.bigpipe.emit.apply(pagelet.bigpipe, [
+ name.join(':'),
+ pagelet
+ ].concat(Array.prototype.slice.call(arguments, 1)));
- if (this.parent) {
- name = this.parent.name +':'+ name;
+ return pagelet;
}
- this.bigpipe.emit.apply(this.bigpipe, [
- name,
- this
- ].concat(Array.prototype.slice.call(arguments, 1)));
+ EventEmitter.prototype.emit.apply(this, arguments);
- return this;
+ if (this.parent) shout([this.parent.name, this.name, event]);
+ return shout([this.name, event]);
};
/**
|
[minor] emit events both namespaced to parent and self
Improve the reusability of pagelet and especially recursive pagelets as standalone units.
|
diff --git a/bundles/target/src/main/java/org/jscsi/target/Activator.java b/bundles/target/src/main/java/org/jscsi/target/Activator.java
index <HASH>..<HASH> 100644
--- a/bundles/target/src/main/java/org/jscsi/target/Activator.java
+++ b/bundles/target/src/main/java/org/jscsi/target/Activator.java
@@ -61,7 +61,6 @@ public class Activator implements BundleActivator {
public void stop(BundleContext context) throws Exception {
// Need to provide a shutdown method within the jscsi target
runner.shutdown();
- System.exit(-1);
}
}
|
[MOD] Removed an exit command from the activator, since it influenced
the container.
|
diff --git a/src/platforms/web/compiler/index.js b/src/platforms/web/compiler/index.js
index <HASH>..<HASH> 100644
--- a/src/platforms/web/compiler/index.js
+++ b/src/platforms/web/compiler/index.js
@@ -58,6 +58,8 @@ export function compile (
})
if (process.env.NODE_ENV !== 'production') {
compiled.errors = errors.concat(detectErrors(compiled.ast))
+ } else {
+ compiled.errors = errors
}
return compiled
}
|
ensure errors Array is always present in compiler output
|
diff --git a/lib/Thelia/Form/Definition/FrontForm.php b/lib/Thelia/Form/Definition/FrontForm.php
index <HASH>..<HASH> 100644
--- a/lib/Thelia/Form/Definition/FrontForm.php
+++ b/lib/Thelia/Form/Definition/FrontForm.php
@@ -29,4 +29,5 @@ final class FrontForm
const ADDRESS_UPDATE = 'thelia.front.address.update';
const CONTACT = 'thelia.front.contact';
const NEWSLETTER = 'thelia.front.newsletter';
+ const CART_ADD = 'thelia.cart.add';
}
|
use the correct method to get the correct CartAdd form
This allow to use the action TheliaEvents::FORM_AFTER_BUILD.".thelia_cart_add" during to build the form AND to submit the form :)
|
diff --git a/filer/admin/fileadmin.py b/filer/admin/fileadmin.py
index <HASH>..<HASH> 100644
--- a/filer/admin/fileadmin.py
+++ b/filer/admin/fileadmin.py
@@ -114,7 +114,8 @@ class FileAdmin(PrimitivePermissionAwareModelAdmin):
url = r.get("Location", None)
# Account for custom Image model
- image_change_list_url_name = 'admin:filer_{0}_changelist'.format(Image._meta.model_name)
+ image_change_list_url_name = 'admin:{0}_{1}_changelist'.format(Image._meta.app_label,
+ Image._meta.model_name)
# Check against filer_file_changelist as file deletion is always made by
# the base class
if (url in ["../../../../", "../../"] or
|
You can set an app_label on your custom image model. Account for this in image admin changelist url.
|
diff --git a/secedgar/filings/__init__.py b/secedgar/filings/__init__.py
index <HASH>..<HASH> 100644
--- a/secedgar/filings/__init__.py
+++ b/secedgar/filings/__init__.py
@@ -2,3 +2,4 @@ from secedgar.filings.filing import Filing # noqa:F401
from secedgar.filings.cik_lookup import CIKLookup # noqa: F401
from secedgar.filings.filing_types import FilingType # noqa:F401
from secedgar.filings.daily import DailyFilings # noqa:F401
+from secedgar.filings.master import MasterFilings # noqa:F401
|
STRUCT: Add MasterFilings to filings package
|
diff --git a/lib/modules/kss-splitter.js b/lib/modules/kss-splitter.js
index <HASH>..<HASH> 100644
--- a/lib/modules/kss-splitter.js
+++ b/lib/modules/kss-splitter.js
@@ -49,6 +49,7 @@ module.exports = {
kss: '',
code: []
},
+ firstBlock = true,
pairs = [],
isKssMarkupBlock = /Styleguide [0-9]+/
@@ -58,7 +59,7 @@ module.exports = {
// Check if KSS
if (isKssMarkupBlock.test(block.content)) {
// Save old pair
- if (pair) {
+ if (pair && !firstBlock) {
pair.code = pair.code.join('');
pairs.push(pair)
}
@@ -77,6 +78,8 @@ module.exports = {
pair.code.push(block.content)
}
+ firstBlock = false;
+
});
// Push last pair
|
Do not save first empty block into pair
|
diff --git a/tests/test_cmd2.py b/tests/test_cmd2.py
index <HASH>..<HASH> 100644
--- a/tests/test_cmd2.py
+++ b/tests/test_cmd2.py
@@ -352,5 +352,9 @@ def test_base_colorize(base_app):
# But if we create a fresh Cmd() instance, it will
fresh_app = cmd2.Cmd()
color_test = fresh_app.colorize('Test', 'red')
- assert color_test == '\x1b[31mTest\x1b[39m'
+ # Actually, colorization only ANSI escape codes is only applied on non-Windows systems
+ if sys.platform == 'win32':
+ assert out.startswith('Elapsed: 0:00:00')
+ else:
+ assert color_test == '\x1b[31mTest\x1b[39m'
|
Fix to colorize unit test for Windows
|
diff --git a/pyairtable/api/api.py b/pyairtable/api/api.py
index <HASH>..<HASH> 100644
--- a/pyairtable/api/api.py
+++ b/pyairtable/api/api.py
@@ -267,7 +267,7 @@ class Api(ApiAbstract):
Args:
base_id: |arg_base_id|
table_name: |arg_table_name|
- records(``list``): List of dict: [{"id": record_id, "field": fields_to_update_dict}]
+ records(``list``): List of dict: [{"id": record_id, "fields": fields_to_update_dict}]
Keyword Args:
replace (``bool``, optional): If ``True``, record is replaced in its entirety
|
Minor doc change on batch_update
Current docstring says to use "field" as the key, but it needs to be "fields".
|
diff --git a/engines/bastion/Gruntfile.js b/engines/bastion/Gruntfile.js
index <HASH>..<HASH> 100644
--- a/engines/bastion/Gruntfile.js
+++ b/engines/bastion/Gruntfile.js
@@ -132,7 +132,7 @@ module.exports = function (grunt) {
reporters: ['progress', 'coverage'],
preprocessors: {
'app/assets/javascripts/bastion/**/*.html': ['ng-html2js'],
- 'app/assets/javascripts/bsation/**/*.js': ['coverage']
+ 'app/assets/javascripts/bastion/**/*.js': ['coverage']
},
coverageReporter: {
type: 'cobertura',
|
Fixes #<I>, fixing typo in karma coverage configuration.
|
diff --git a/api/src/main/java/org/project/neutrino/nfvo/api/RestVimInstances.java b/api/src/main/java/org/project/neutrino/nfvo/api/RestVimInstances.java
index <HASH>..<HASH> 100644
--- a/api/src/main/java/org/project/neutrino/nfvo/api/RestVimInstances.java
+++ b/api/src/main/java/org/project/neutrino/nfvo/api/RestVimInstances.java
@@ -13,7 +13,7 @@ import java.util.List;
@RestController
-@RequestMapping("/api/v1/datacenters")
+@RequestMapping("/api/v1/vim-instances")
public class RestVimInstances {
// TODO add log prints
|
from datacenter to vim-instances
|
diff --git a/lib/coderunner/class_methods.rb b/lib/coderunner/class_methods.rb
index <HASH>..<HASH> 100644
--- a/lib/coderunner/class_methods.rb
+++ b/lib/coderunner/class_methods.rb
@@ -390,13 +390,27 @@ EOF
FileUtils.makedirs tl
unless ENV['CODE_RUNNER_LAUNCHER'] =~ /serial/
- Thread.new{loop{`cp #{tl}/queue_status.txt #{tl}/queue_status2.txt; ps > #{tl}/queue_status.txt`; sleep 1}}
-
mutex = Mutex.new
processes= []
Thread.new do
loop do
+ `cp #{tl}/queue_status.txt #{tl}/queue_status2.txt`
+ `ps > #{tl}/queue_status.txt`
+ mutex.synchronize do
+ File.open("#{tl}/queue_status.txt", 'a') do |f|
+ # This ensures that the right pids will be listed,
+ # regardless of the way that ps behaves
+ f.puts processes
+ end
+ end
+ sleep 1
+ end
+ end
+
+
+ Thread.new do
+ loop do
Dir.entries(tl).each do |file|
next unless file =~ (/(^.*)\.stop/)
pid = $1
|
--Small patch to ensure that the correct pids always show up in the queue_status for launcher
|
diff --git a/lib/elastomer.js b/lib/elastomer.js
index <HASH>..<HASH> 100644
--- a/lib/elastomer.js
+++ b/lib/elastomer.js
@@ -190,8 +190,22 @@ Elastomer.prototype._injectHtml = function () {
if (this.useNative) {
this.shadowRoot.innerHTML = this.html.toString()
- this.css(this.shadowRoot)
+ // this.css(this.shadowRoot)
this._bind(this.shadowRoot)
+ if (this.css) {
+ if (typeof this.css === 'function') {
+ this.css(this.shadowRoot)
+ } else {
+ var style = document.createElement('style')
+ style.setAttribute('type', 'text/css')
+ this.shadowRoot.appendChild(style)
+ if (style.styleSheet) {
+ style.styleSheet.cssText = this.css.toString()
+ } else {
+ style.textContent = this.css.toString()
+ }
+ }
+ }
} else {
this.shadowRoot.innerHTML = this.html.toString()
this._bind(this.shadowRoot.shadow)
|
fix: Support raw css in native mode
|
diff --git a/src/svg.js b/src/svg.js
index <HASH>..<HASH> 100644
--- a/src/svg.js
+++ b/src/svg.js
@@ -1,9 +1,14 @@
module.exports = {
draw: function(parent, svgString, config) {
if (!parent) return;
- var el = root.getElement(svgString, config);
+ var el = module.exports.getElement(svgString, config);
if (el) {
- $(parent).append(el);
+ if (parent.append) {
+ parent.append(el);
+ } else {
+ //regular dom doc
+ parent.appendChild(el);
+ }
}
},
getElement: function(svgString, config) {
|
fixed issue with reference to missing jquery
|
diff --git a/src/main/java/com/github/tomakehurst/wiremock/http/HttpClientFactory.java b/src/main/java/com/github/tomakehurst/wiremock/http/HttpClientFactory.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/github/tomakehurst/wiremock/http/HttpClientFactory.java
+++ b/src/main/java/com/github/tomakehurst/wiremock/http/HttpClientFactory.java
@@ -74,6 +74,7 @@ public class HttpClientFactory {
.disableRedirectHandling()
.disableContentCompression()
.setMaxConnTotal(maxConnections)
+ .setMaxConnPerRoute(maxConnections)
.setDefaultRequestConfig(RequestConfig.custom().setStaleConnectionCheckEnabled(true).build())
.setDefaultSocketConfig(SocketConfig.custom().setSoTimeout(timeoutMilliseconds).build())
.useSystemProperties();
|
Made max connections per route the same as max connections for proxying as the default is low and sometimes presents a bottleneck
|
diff --git a/lib/action_subscriber/configuration.rb b/lib/action_subscriber/configuration.rb
index <HASH>..<HASH> 100644
--- a/lib/action_subscriber/configuration.rb
+++ b/lib/action_subscriber/configuration.rb
@@ -72,7 +72,7 @@ module ActionSubscriber
::ActionSubscriber.config.__send__("#{key}=", setting) if setting
end
- nil
+ true
end
end
end
|
Configuration memo should return something truthy or this will change
|
diff --git a/lib/excon.rb b/lib/excon.rb
index <HASH>..<HASH> 100644
--- a/lib/excon.rb
+++ b/lib/excon.rb
@@ -145,6 +145,9 @@ module Excon
request_params[:headers]['Authorization'] ||= 'Basic ' << ['' << user << ':' << pass].pack('m').delete(Excon::CR_NL)
end
end
+ if request_params.has_key?(:headers)
+ request_params[:headers] = Excon::Headers.new
+ end
if block_given?
if response_params
raise(ArgumentError.new("stub requires either response_params OR a block"))
|
use case-insensitive header stuff for stubs
closes #<I>
|
diff --git a/lib/middleware.js b/lib/middleware.js
index <HASH>..<HASH> 100644
--- a/lib/middleware.js
+++ b/lib/middleware.js
@@ -29,13 +29,14 @@ module.exports = uglifyjs.middleware = function (options) {
console[type]('%s'.cyan + ': ' + '%s'.green, key, val);
};
- return function (req, res, next) {
+ return function uglifyjsMiddleware (req, res, next) {
// Only handle GET and HEAD requests
if (req.method.toUpperCase() !== "GET" && req.method.toUpperCase() !== "HEAD") {
return next();
}
var filename = url.parse(req.url).pathname;
+ log('source', filename);
return next();
};
|
Named the returning function and logging the source filename
|
diff --git a/test/to-string.js b/test/to-string.js
index <HASH>..<HASH> 100644
--- a/test/to-string.js
+++ b/test/to-string.js
@@ -223,3 +223,11 @@ test('utf8 replacement chars for anything in the surrogate pair range', function
)
t.end()
})
+
+test('utf8 don\'t replace the replacement char', function (t) {
+ t.equal(
+ new B('\uFFFD').toString(),
+ '\uFFFD'
+ )
+ t.end()
+})
|
add failing test for replacing the utf8 replacement char
|
diff --git a/assess_model_migration.py b/assess_model_migration.py
index <HASH>..<HASH> 100755
--- a/assess_model_migration.py
+++ b/assess_model_migration.py
@@ -223,10 +223,6 @@ def ensure_migration_including_resources_succeeds(source_client, dest_client):
- Migrate that model to the other environment
- Ensure it's operating as expected
- Add a new unit to the application to ensure the model is functional
- - Migrate the model back to the original environment
- - Note: Test for lp:1607457, lp:1641824
- - Ensure it's operating as expected
- - Add a new unit to the application to ensure the model is functional
"""
resource_contents = get_random_string()
@@ -237,11 +233,6 @@ def ensure_migration_including_resources_succeeds(source_client, dest_client):
assert_model_migrated_successfully(
migration_target_client, application, resource_contents)
- migrate_back_client = migrate_model_to_controller(
- migration_target_client, source_client)
- assert_model_migrated_successfully(
- migrate_back_client, application, resource_contents)
-
migration_target_client.remove_service(application)
log.info('SUCCESS: resources migrated')
|
Move re-migration to new branch
|
diff --git a/definitions/npm/socket.io-client_v2.x.x/flow_v0.34.x-/socket.io-client_v2.x.x.js b/definitions/npm/socket.io-client_v2.x.x/flow_v0.34.x-/socket.io-client_v2.x.x.js
index <HASH>..<HASH> 100644
--- a/definitions/npm/socket.io-client_v2.x.x/flow_v0.34.x-/socket.io-client_v2.x.x.js
+++ b/definitions/npm/socket.io-client_v2.x.x/flow_v0.34.x-/socket.io-client_v2.x.x.js
@@ -48,6 +48,7 @@ declare module "socket.io-client" {
declare export class Socket extends Emitter<Socket> {
constructor(io: Manager, nsp: string, opts?: SocketOptions): Socket;
+ id: string;
open(): Socket;
connect(): Socket;
send(...args: any[]): Socket;
|
socket.io-client: Add missing id definition (#<I>)
For socket.io-client_v2.x.x
|
diff --git a/src/Illuminate/Support/helpers.php b/src/Illuminate/Support/helpers.php
index <HASH>..<HASH> 100755
--- a/src/Illuminate/Support/helpers.php
+++ b/src/Illuminate/Support/helpers.php
@@ -893,13 +893,13 @@ if (! function_exists('throw_if')) {
*
* @param bool $boolean
* @param \Throwable|string $exception
- * @param string $message
+ * @param array ...$parameters
* @return void
*/
- function throw_if($boolean, $exception, $message = '')
+ function throw_if($boolean, $exception, ...$parameters)
{
if ($boolean) {
- throw (is_string($exception) ? new $exception($message) : $exception);
+ throw (is_string($exception) ? new $exception(...$parameters) : $exception);
}
}
}
@@ -910,13 +910,13 @@ if (! function_exists('throw_unless')) {
*
* @param bool $boolean
* @param \Throwable|string $exception
- * @param string $message
+ * @param array ...$parameters
* @return void
*/
- function throw_unless($boolean, $exception, $message)
+ function throw_unless($boolean, $exception, ...$parameters)
{
if (! $boolean) {
- throw (is_string($exception) ? new $exception($message) : $exception);
+ throw (is_string($exception) ? new $exception(...$parameters) : $exception);
}
}
}
|
[<I>] Use of argument (un)packing in throw_if/unless helpers (#<I>)
* Use of argument (un)packing in throw_if/unless helpers
* Replace $arguments with $parameters
because "argument is the value/variable/reference being passed in, parameter is the receiving variable used w/in the function/block" :)
|
diff --git a/sharq/utils.py b/sharq/utils.py
index <HASH>..<HASH> 100644
--- a/sharq/utils.py
+++ b/sharq/utils.py
@@ -18,7 +18,7 @@ def is_valid_identifier(identifier):
- _ (underscore)
- - (hypen)
"""
- if not isinstance(identifier, basestring):
+ if not isinstance(identifier, str):
return False
if len(identifier) > 100 or len(identifier) < 1:
@@ -32,7 +32,7 @@ def is_valid_interval(interval):
"""Checks if the given interval is valid. A valid interval
is always a positive, non-zero integer value.
"""
- if not isinstance(interval, (int, long)):
+ if not isinstance(interval, int):
return False
if interval <= 0:
@@ -46,7 +46,7 @@ def is_valid_requeue_limit(requeue_limit):
A valid requeue limit is always greater than
or equal to -1.
"""
- if not isinstance(requeue_limit, (int, long)):
+ if not isinstance(requeue_limit, int):
return False
if requeue_limit <= -2:
|
change to python 3 semantics
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -35,7 +35,7 @@ setup(
author = "Kristen Thyng",
author_email = "kthyng@gmail.com",
url = 'https://github.com/matplotlib/cmocean',
- download_url = 'https://github.com/matplotlib/cmocean/tarball/0.2.1',
+ download_url = 'https://github.com/matplotlib/cmocean/tarball/0.2.2',
description = ("Colormaps for Oceanography"),
long_description=open('README.rst').read(),
classifiers=[
|
updated version manually to update pypi
|
diff --git a/lib/vestal_versions.rb b/lib/vestal_versions.rb
index <HASH>..<HASH> 100644
--- a/lib/vestal_versions.rb
+++ b/lib/vestal_versions.rb
@@ -97,7 +97,7 @@ module LaserLemon
return {} if chain.empty?
backward = chain.first > chain.last
- backward ? chain.pop : chain.shift
+ backward ? chain.pop : chain.shift unless [from_number, to_number].include?(1)
chain.inject({}) do |changes, version|
version.changes.each do |attribute, change|
|
Don't pop or shift the reversion chain when dealing with version number 1.
This is because when dealing with version number 1, a corresponding version record will not exist in the chain.
|
diff --git a/src/puzzle/Puzzle.js b/src/puzzle/Puzzle.js
index <HASH>..<HASH> 100644
--- a/src/puzzle/Puzzle.js
+++ b/src/puzzle/Puzzle.js
@@ -518,11 +518,11 @@ function parseImageOption(){ // (type,quality,option)のはず
type = argv;
break;
case 'number':
- if(argv>1.1){ cellsize = argv;}else{ quality = argv;}
+ if(argv>1.01){ cellsize = argv;}else{ quality = argv;}
break;
case 'object':
- cellsize = argv.cellsize || 0;
- bgcolor = argv.bgcolor || '';
+ if('cellsize' in argv){ cellsize = argv.cellsize;}
+ if('bgcolor' in argv){ bgcolor = argv.bgcolor;}
break;
}
}
|
Puzzle: Fix illegal handling of option value in outputting image functions
|
diff --git a/network.go b/network.go
index <HASH>..<HASH> 100644
--- a/network.go
+++ b/network.go
@@ -851,14 +851,25 @@ func (n *network) updateSvcRecord(ep *endpoint, localEps []*endpoint, isAdd bool
if iface := ep.Iface(); iface.Address() != nil {
myAliases := ep.MyAliases()
if isAdd {
- if !ep.isAnonymous() {
+ // If anonymous endpoint has an alias use the first alias
+ // for ip->name mapping. Not having the reverse mapping
+ // breaks some apps
+ if ep.isAnonymous() {
+ if len(myAliases) > 0 {
+ n.addSvcRecords(myAliases[0], iface.Address().IP, true)
+ }
+ } else {
n.addSvcRecords(epName, iface.Address().IP, true)
}
for _, alias := range myAliases {
n.addSvcRecords(alias, iface.Address().IP, false)
}
} else {
- if !ep.isAnonymous() {
+ if ep.isAnonymous() {
+ if len(myAliases) > 0 {
+ n.deleteSvcRecords(myAliases[0], iface.Address().IP, true)
+ }
+ } else {
n.deleteSvcRecords(epName, iface.Address().IP, true)
}
for _, alias := range myAliases {
|
If anonymous container has alias names use it for DNS PTR record
|
diff --git a/tests/AttributeInjectors/HostnameAttributeInjectorTest.php b/tests/AttributeInjectors/HostnameAttributeInjectorTest.php
index <HASH>..<HASH> 100644
--- a/tests/AttributeInjectors/HostnameAttributeInjectorTest.php
+++ b/tests/AttributeInjectors/HostnameAttributeInjectorTest.php
@@ -12,13 +12,13 @@ class HostnameAttributeInjectorTest extends TestCase
$injector = new HostnameAttributeInjector();
$this->assertEquals('hostname', $injector->getAttributeKey());
- $injector = new HostnameAttributeInjectorTest('custom_attribute');
+ $injector = new HostnameAttributeInjector('custom_attribute');
$this->assertEquals('custom_attribute', $injector->getAttributeKey());
}
public function testGetAttributeValue()
{
- $injector = new HostnameAttributeInjectorTest();
+ $injector = new HostnameAttributeInjector();
$this->assertEquals(gethostname(), $injector->getAttributeValue());
}
}
|
fix the broken unit test, for realsies
|
diff --git a/src/store-enhancer.js b/src/store-enhancer.js
index <HASH>..<HASH> 100644
--- a/src/store-enhancer.js
+++ b/src/store-enhancer.js
@@ -12,6 +12,8 @@ import { default as matcherFactory } from './create-matcher';
import attachRouterToReducer from './reducer-enhancer';
import { locationDidChange } from './action-creators';
+import matchCache from './match-cache';
+
import validateRoutes from './util/validate-routes';
import flattenRoutes from './util/flatten-routes';
@@ -61,6 +63,7 @@ export default ({
history.listen(newLocation => {
/* istanbul ignore else */
if (newLocation) {
+ matchCache.clear();
store.dispatch(locationDidChange({
location: newLocation, matchRoute
}));
|
Clear the MatchCache whenever the location changes
This way the cache will not get stale
|
diff --git a/lib/workers/scheduler.rb b/lib/workers/scheduler.rb
index <HASH>..<HASH> 100644
--- a/lib/workers/scheduler.rb
+++ b/lib/workers/scheduler.rb
@@ -57,7 +57,6 @@ module Workers
return nil
rescue Exception => e
- puts e.inspect
end
def process_overdue
diff --git a/lib/workers/timer.rb b/lib/workers/timer.rb
index <HASH>..<HASH> 100644
--- a/lib/workers/timer.rb
+++ b/lib/workers/timer.rb
@@ -38,7 +38,6 @@ module Workers
begin
@callback.call if @callback
rescue Exception => e
- puts "EXCEPTION: #{e.message}\n#{e.backtrace.join("\n")}\n--"
end
return nil
|
Remove puts. Will replace with logger.error in future.
|
diff --git a/python_modules/dagster/dagster/core/definitions/decorators/repository.py b/python_modules/dagster/dagster/core/definitions/decorators/repository.py
index <HASH>..<HASH> 100644
--- a/python_modules/dagster/dagster/core/definitions/decorators/repository.py
+++ b/python_modules/dagster/dagster/core/definitions/decorators/repository.py
@@ -211,7 +211,7 @@ def repository(
def __init__(self, yaml_directory):
self._yaml_directory = yaml_directory
- def get_all_jobs(self):
+ def get_all_pipelines(self):
return [
self._construct_job_def_from_yaml_file(
self._yaml_file_for_job_name(file_name)
|
Update RepositoryData docs to reflect what method you actually need to override when building one (#<I>)
Summary:
Currently RepositoryData has two methods, get_all_pipelines and get_all_jobs, and (presumably for back-compat reasons), get_all_pipelines returns both pipelines and jobs. The doc incorrectly implies that you only need to override get_all_jobs.
We may want to change this in the future as CRAG rolls out more, but for now update the docs to reflect reality.
|
diff --git a/server/config.js b/server/config.js
index <HASH>..<HASH> 100644
--- a/server/config.js
+++ b/server/config.js
@@ -4,7 +4,7 @@ const config = {
port: process.env.PORT || 1337,
apiUrl: process.env.API_URL || 'http://localhost:3000',
authPort: process.env.AUTH_PORT || 3005,
- appDomain: `app.${process.env.APP_DOMAIN}` || 'localhost',
+ appDomain: process.env.APP_DOMAIN || 'localhost',
timeout: 60000
}
|
Fix app_domain env for build app
|
diff --git a/semver.js b/semver.js
index <HASH>..<HASH> 100644
--- a/semver.js
+++ b/semver.js
@@ -161,8 +161,8 @@ var LONETILDE = R++;
src[LONETILDE] = '(?:~>?)';
var TILDETRIM = R++;
-src[TILDETRIM] = src[LONETILDE] + '\s+';
-var tildeTrimReplace = '$1';
+src[TILDETRIM] = src[LONETILDE] + '\\s+';
+var tildeTrimReplace = '~';
var TILDE = R++;
src[TILDE] = '^' + src[LONETILDE] + src[XRANGEPLAIN] + '$';
|
Fix typo in tilde trim expression
|
diff --git a/perceval/backends/core/telegram.py b/perceval/backends/core/telegram.py
index <HASH>..<HASH> 100644
--- a/perceval/backends/core/telegram.py
+++ b/perceval/backends/core/telegram.py
@@ -61,7 +61,7 @@ class Telegram(Backend):
:param tag: label used to mark the data
:param archive: archive to store/retrieve items
"""
- version = '0.9.1'
+ version = '0.9.2'
CATEGORIES = [CATEGORY_MESSAGE]
@@ -101,9 +101,14 @@ class Telegram(Backend):
return items
- def fetch_items(self, **kwargs):
- """Fetch the messages"""
+ def fetch_items(self, category, **kwargs):
+ """Fetch the messages
+ :param category: the category of items to fetch
+ :param kwargs: backend arguments
+
+ :returns: a generator of items
+ """
offset = kwargs['offset']
chats = kwargs['chats']
|
[telegram] Set category when calling fetch and fetch_from_archive
This patch adds to the params of the fetch_items method the category.
Thus, it allows to handle fetching operations
(fetch and fetch_from_archive) with multiple categories
|
diff --git a/includes/pb-utility.php b/includes/pb-utility.php
index <HASH>..<HASH> 100644
--- a/includes/pb-utility.php
+++ b/includes/pb-utility.php
@@ -382,7 +382,7 @@ function check_epubcheck_install() {
}
}
- return false;
+ return apply_filters( 'pb_epub_has_dependencies', false );
}
/**
|
add filter hook 'pb_epub_has_dependencies' to epub export class (#<I>)
* add filter hook 'pb_epub_has_dependencies' to epub export class
this allows a user to hook into the filter and enable epub exports
without having to install the dependency EpubCheck
* apply pb_epub_as_dependencies filter to check_epubcheck_install function
|
diff --git a/src/components/Editor/Tab.js b/src/components/Editor/Tab.js
index <HASH>..<HASH> 100644
--- a/src/components/Editor/Tab.js
+++ b/src/components/Editor/Tab.js
@@ -188,7 +188,7 @@ class Tab extends PureComponent<Props> {
<div
className={className}
key={sourceId}
- onMouseUp={handleTabClick}
+ onClick={handleTabClick}
onContextMenu={e => this.onTabContextMenu(e, sourceId)}
title={getFileURL(source)}
>
|
Change Tab click handler event from onMouseUp to onClick to avoid conflict with CloseButton (#<I>)
|
diff --git a/classes/phing/tasks/system/condition/IsTrueCondition.php b/classes/phing/tasks/system/condition/IsTrueCondition.php
index <HASH>..<HASH> 100644
--- a/classes/phing/tasks/system/condition/IsTrueCondition.php
+++ b/classes/phing/tasks/system/condition/IsTrueCondition.php
@@ -35,11 +35,11 @@ class IsTrueCondition extends ProjectComponent implements Condition
/**
* Set the value to be tested.
*
- * @param boolean $value
+ * @param mixed $value
*/
- public function setValue(bool $value)
+ public function setValue($value)
{
- $this->value = $value;
+ $this->value = (bool) $value;
}
/**
|
Fixed IsTrueCondition (#<I>)
|
diff --git a/packages/@ember/-internals/runtime/lib/mixins/array.js b/packages/@ember/-internals/runtime/lib/mixins/array.js
index <HASH>..<HASH> 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/array.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/array.js
@@ -693,6 +693,13 @@ const ArrayMixin = Mixin.create(Enumerable, {
```javascript
function(item, index, array);
+ let arr = [1, 2, 3, 4, 5, 6];
+
+ arr.map(element => element * element);
+ // [1, 4, 9, 16, 25, 36];
+
+ arr.map((element, index) => element + index);
+ // [1, 3, 5, 7, 9, 11];
```
- `item` is the current item in the iteration.
@@ -725,6 +732,16 @@ const ArrayMixin = Mixin.create(Enumerable, {
Similar to map, this specialized function returns the value of the named
property on all items in the enumeration.
+ ```javascript
+ let people = [{name: 'Joe'}, {name: 'Matt'}];
+
+ people.mapBy('name');
+ // ['Joe', 'Matt'];
+
+ people.mapBy('unknownProperty');
+ // [undefined, undefined];
+ ```
+
@method mapBy
@param {String} key name of the property
@return {Array} The mapped array.
|
Adds doc for map and mapBy methods of EmberArray
|
diff --git a/packages/material-ui/src/Popper/Popper.js b/packages/material-ui/src/Popper/Popper.js
index <HASH>..<HASH> 100644
--- a/packages/material-ui/src/Popper/Popper.js
+++ b/packages/material-ui/src/Popper/Popper.js
@@ -183,7 +183,7 @@ const Popper = React.forwardRef(function Popper(props, ref) {
role="tooltip"
style={{
// Prevents scroll issue, waiting for Popper.js to add this style once initiated.
- position: 'absolute',
+ position: 'fixed',
}}
{...other}
>
|
[Popper] Fix scroll jump when content contains autofocus input (#<I>) (#<I>)
closes #<I>
|
diff --git a/cli.js b/cli.js
index <HASH>..<HASH> 100755
--- a/cli.js
+++ b/cli.js
@@ -13,7 +13,7 @@ var USAGE = 'Usage:\n' +
' ' + pkg.name + ' --config="path/to/browserlist/file"\n' +
' ' + pkg.name + ' --coverage "QUERIES"\n' +
' ' + pkg.name + ' --coverage=US "QUERIES"\n' +
- ' ' + pkg.name + ' --coverage=US,RU,world "QUERIES"\n' +
+ ' ' + pkg.name + ' --coverage=US,RU,global "QUERIES"\n' +
' ' + pkg.name + ' --env="environment name defined in config"\n' +
' ' + pkg.name + ' --stats="path/to/browserlist/stats/file"'
|
In `--help`, rename world to global (#<I>)
|
diff --git a/trailblazer/analyze/cli.py b/trailblazer/analyze/cli.py
index <HASH>..<HASH> 100644
--- a/trailblazer/analyze/cli.py
+++ b/trailblazer/analyze/cli.py
@@ -80,8 +80,10 @@ def start(context, ccp, config, executable, gene_list, email, priority, dryrun,
if email:
user = api.user(email)
new_entry.user = user
- commit_analysis(context.obj['manager'], new_entry)
- context.obj['manager'].commit()
+
+ if not dryrun:
+ commit_analysis(context.obj['manager'], new_entry)
+ context.obj['manager'].commit()
@analyze.command()
|
don't log pending if dryrun
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ setup(
author='Kyle Conroy',
author_email='help@twilio.com',
description='Simple framework for creating REST APIs',
- packages=find_packages(),
+ packages=find_packages(exclude=['tests']),
zip_safe=False,
include_package_data=True,
platforms='any',
|
Don't install 'tests' package
|
diff --git a/apiserver/common/crossmodel/interface.go b/apiserver/common/crossmodel/interface.go
index <HASH>..<HASH> 100644
--- a/apiserver/common/crossmodel/interface.go
+++ b/apiserver/common/crossmodel/interface.go
@@ -7,9 +7,8 @@ import (
"time"
"github.com/juju/charm/v8"
- "gopkg.in/macaroon.v2"
-
"github.com/juju/names/v4"
+ "gopkg.in/macaroon.v2"
"github.com/juju/juju/core/crossmodel"
"github.com/juju/juju/core/network"
|
fix incorrect change made to import ordering by my ide.
|
diff --git a/killer.py b/killer.py
index <HASH>..<HASH> 100644
--- a/killer.py
+++ b/killer.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
-__version__ = '0.1.4'
+__version__ = '0.1.4-1'
__author__ = 'Lvl4Sword'
import argparse
@@ -132,4 +132,5 @@ if __name__ == '__main__':
detect_usb()
detect_ac()
detect_battery()
+ detect_tray(cdrom_drive)
time.sleep(rest)
|
<I>-1 - Actually run detect_tray(cdrom_drive)
- detect_tray(cdrom_drive) wasn't actually running, it is now.
|
diff --git a/gtabview/dataio.py b/gtabview/dataio.py
index <HASH>..<HASH> 100644
--- a/gtabview/dataio.py
+++ b/gtabview/dataio.py
@@ -3,6 +3,7 @@ from __future__ import print_function, unicode_literals, absolute_import
import os
import sys
+import warnings
from .compat import *
@@ -79,6 +80,8 @@ def read_table(fd_or_path, enc, delimiter, hdr_rows, sheet_index=0):
try:
data = read_xlrd(fd_or_path, sheet_index)
except ImportError:
+ warnings.warn("xlrd module not installed")
+ except:
pass
if data is None:
data = read_csv(fd_or_path, enc, delimiter, hdr_rows)
|
Improved XLS[X] handling
- Issue a warning when xlrd is not available but an xls[x] file has been
provided.
- Fallback trying to read the xls[x] file with read_csv to handle disguised
files correctly (yes, this happens quite often in windows-land to simply use
excel as a viewer).
|
diff --git a/lib/metasploit_data_models/active_record_models/vuln_attempt.rb b/lib/metasploit_data_models/active_record_models/vuln_attempt.rb
index <HASH>..<HASH> 100755
--- a/lib/metasploit_data_models/active_record_models/vuln_attempt.rb
+++ b/lib/metasploit_data_models/active_record_models/vuln_attempt.rb
@@ -1,7 +1,7 @@
module MetasploitDataModels::ActiveRecordModels::VulnAttempt
def self.included(base)
base.class_eval {
- belongs_to :vuln, :class_name => "Mdm::VulnAttempt", :counter_cache => :vuln_attempt_count
+ belongs_to :vuln, :class_name => "Mdm::Vuln", :counter_cache => :vuln_attempt_count
validates :vuln_id, :presence => true
}
end
|
Fix a bad classname that prevented cache_counters from working
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -47,7 +47,7 @@ requirements = [
'tokenizers==0.8.1',
'click>=7.0', # Dependency of youtokentome
'youtokentome>=1.0.6',
- 'fasttext>=0.9.2'
+ 'fasttext>=0.9.1,!=0.9.2' # Fix to 0.9.1 due to https://github.com/facebookresearch/fastText/issues/1052
]
setup(
|
[Fix][SageMaker] Make sure that the installation works in SageMaker (#<I>)
* Fasttext to <I>
* Update setup.py
|
diff --git a/js/idex.js b/js/idex.js
index <HASH>..<HASH> 100644
--- a/js/idex.js
+++ b/js/idex.js
@@ -586,6 +586,8 @@ module.exports = class idex extends Exchange {
'type': undefined,
'name': name,
'active': undefined,
+ 'deposit': undefined,
+ 'withdraw': undefined,
'fee': undefined,
'precision': parseInt (precisionString),
'limits': {
|
idex: add deposit/withdraw flag in currencies ccxt/ccxt#<I>
|
diff --git a/concrete/src/Database/Driver/PDOStatement.php b/concrete/src/Database/Driver/PDOStatement.php
index <HASH>..<HASH> 100644
--- a/concrete/src/Database/Driver/PDOStatement.php
+++ b/concrete/src/Database/Driver/PDOStatement.php
@@ -29,15 +29,6 @@ class PDOStatement extends \Doctrine\DBAL\Driver\PDOStatement
/**
* @deprecated
- * alias to old ADODB method
- */
- public function free()
- {
- return $this->closeCursor();
- }
-
- /**
- * @deprecated
* alias to old ADODB result method
*/
public function numRows()
|
Remove deprecated PDOStatement::free()
Its signature is not compatible with the DBAL PDOStatement implementation
|
diff --git a/test/utils/TestContext.js b/test/utils/TestContext.js
index <HASH>..<HASH> 100644
--- a/test/utils/TestContext.js
+++ b/test/utils/TestContext.js
@@ -29,11 +29,11 @@ function initGL(){
antialias : true,
premultipliedAlpha : true,
preserveDrawingBuffer : false,
- preferLowPowerToHighPerformance : false,
+ preferLowPowerToHighPerformance : true,
failIfMajorPerformanceCaveat : false
}
- gl = cvs.getContext( 'webgl', opts ) || cvs.getContext( 'experimental-webgl', opts );
+ gl = cvs.getContext( 'webgl', opts ) || cvs.getContext( 'experimental-webgl', opts ) || cvs.getContext( 'webgl');
gl.viewport( 0,0,glSize, glSize )
gl.clearColor( 1, 0, 0, 1)
gl.clear( gl.COLOR_BUFFER_BIT )
|
try to fallback to context with no attributes in tests
|
diff --git a/src/selectors/entities/channels.js b/src/selectors/entities/channels.js
index <HASH>..<HASH> 100644
--- a/src/selectors/entities/channels.js
+++ b/src/selectors/entities/channels.js
@@ -20,6 +20,7 @@ import {
} from 'selectors/entities/preferences';
import {getLastPostPerChannel} from 'selectors/entities/posts';
import {getCurrentTeamId, getCurrentTeamMembership} from 'selectors/entities/teams';
+import {isCurrentUserSystemAdmin} from 'selectors/entities/users';
import {
buildDisplayableChannelList,
@@ -138,6 +139,19 @@ export const getCurrentChannelStats = createSelector(
}
);
+export function isCurrentChannelReadOnly(state) {
+ return isChannelReadOnly(state, getCurrentChannel(state));
+}
+
+export function isChannelReadOnlyById(state, channelId) {
+ return isChannelReadOnly(state, getChannel(state, channelId));
+}
+
+export function isChannelReadOnly(state, channel) {
+ return channel && channel.name === General.DEFAULT_CHANNEL &&
+ !isCurrentUserSystemAdmin(state) && getConfig(state).ExperimentalTownSquareIsReadOnly === 'true';
+}
+
export const getChannelSetInCurrentTeam = createSelector(
getCurrentTeamId,
getChannelsInTeam,
|
Add selectors to check if current channel and a channel is ReadOnly. (#<I>)
|
diff --git a/tests/Database/Core/DatabaseStatementTest.php b/tests/Database/Core/DatabaseStatementTest.php
index <HASH>..<HASH> 100644
--- a/tests/Database/Core/DatabaseStatementTest.php
+++ b/tests/Database/Core/DatabaseStatementTest.php
@@ -20,4 +20,14 @@ class DatabaseStatementTest extends TestCase
$row = $result->next();
self::assertEquals('superman', $row->name);
}
+
+ public function testEmptyResultSet()
+ {
+ $db = new Database(new DatabaseSource());
+ $db->query('CREATE TABLE heroes(id NUMERIC PRIMARY KEY, name TEXT NULL, enabled INTEGER, power REAL);');
+ $db->query("INSERT INTO heroes(id, name, enabled, power) VALUES (1, 'Batman', 1, 5.6);");
+ $result = $db->query("SELECT power FROM heroes WHERE id = 99");
+ self::assertEquals("SELECT power FROM heroes WHERE id = 99", $result->getPdoStatement()->queryString);
+ self::assertNull($result->next());
+ }
}
|
test: add tests for DatabaseStatement
|
diff --git a/src/js/core/drop.js b/src/js/core/drop.js
index <HASH>..<HASH> 100644
--- a/src/js/core/drop.js
+++ b/src/js/core/drop.js
@@ -109,6 +109,7 @@ export default {
disconnected() {
if (this.isActive()) {
+ this.hide(false);
active = null;
}
},
|
fix: ensure eventlisteners are removed on disconnect
|
diff --git a/fc/excel_io.py b/fc/excel_io.py
index <HASH>..<HASH> 100644
--- a/fc/excel_io.py
+++ b/fc/excel_io.py
@@ -11,7 +11,6 @@
import collections
import xlrd
-import xlwt
import openpyxl
def import_rows(workbook_name, worksheet_name):
|
xlwt dependency has been removed.
|
diff --git a/js/shared/javascript.js b/js/shared/javascript.js
index <HASH>..<HASH> 100755
--- a/js/shared/javascript.js
+++ b/js/shared/javascript.js
@@ -130,14 +130,23 @@ exports.getPromise = function() {
return promise
}
-exports.bytesToString = function(byteArray, offset) {
- return byteArray.toString();
- return String.fromCharCode.apply(String, Array.prototype.slice.call(byteArray, offset || 0))
-}
-
-exports.recall = function(self, args, timeout) {
- var fn = args.callee
- return function(){ return fn.apply(self, args) }
+exports.getDependable = function() {
+ var dependants = [],
+ dependable = {}
+
+ dependable.depend = function(onFulfilled) {
+ dependants.push(onFulfilled)
+ if (dependable.fulfillment) {
+ onFulfilled.apply(this, dependable.fulfillment)
+ }
+ }
+ dependable.fulfill = function() {
+ dependable.fulfillment = arguments
+ for (var i=0; i < dependants.length; i++) {
+ dependants[i].apply(this, dependable.fulfillment)
+ }
+ }
+ return dependable
}
exports.assert = function(shouldBeTrue, msg, values) {
|
Remove unused functions bytesToString and recall, and add new function getDependable, where a dependable is an object that may fulfill multiple times
|
diff --git a/mock.py b/mock.py
index <HASH>..<HASH> 100644
--- a/mock.py
+++ b/mock.py
@@ -15,6 +15,7 @@
__all__ = (
'Mock',
+ 'MagicMock',
'mocksignature',
'patch',
'patch_object',
|
Adding MagicMock to mock.__all__
|
diff --git a/tests/test_flac.py b/tests/test_flac.py
index <HASH>..<HASH> 100644
--- a/tests/test_flac.py
+++ b/tests/test_flac.py
@@ -1,9 +1,8 @@
import shutil, os
from tests import TestCase, add
-from mutagen.flac import (to_int_be, Padding, VCFLACDict, MetadataBlock,
- StreamInfo, SeekTable, CueSheet, FLAC, delete,
- Picture)
+from mutagen.flac import to_int_be, Padding, VCFLACDict, MetadataBlock
+from mutagen.flac import StreamInfo, SeekTable, CueSheet, FLAC, delete, Picture
from tests.test__vorbis import TVCommentDict, VComment
try: from os.path import devnull
except ImportError: devnull = "/dev/null"
|
Python <I> compatibility.
|
diff --git a/DependencyInjection/HttplugExtension.php b/DependencyInjection/HttplugExtension.php
index <HASH>..<HASH> 100644
--- a/DependencyInjection/HttplugExtension.php
+++ b/DependencyInjection/HttplugExtension.php
@@ -15,6 +15,7 @@ use Http\Message\Authentication\Wsse;
use Http\Mock\Client as MockClient;
use Psr\Http\Message\UriInterface;
use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\Alias;
use Symfony\Component\DependencyInjection\ChildDefinition;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Definition;
@@ -54,7 +55,7 @@ class HttplugExtension extends Extension
// Set main aliases
foreach ($config['main_alias'] as $type => $id) {
- $container->setAlias(sprintf('httplug.%s', $type), $id);
+ $container->setAlias(sprintf('httplug.%s', $type), new Alias($id, true));
}
// Configure toolbar
|
Make main aliases public
Symfony <I>+ is making services private by default, so this requires configuring the visibility explicitly.
|
diff --git a/packages/react-jsx-highcharts/src/components/PlotBandLine/UsePlotBandLineLifecycle.js b/packages/react-jsx-highcharts/src/components/PlotBandLine/UsePlotBandLineLifecycle.js
index <HASH>..<HASH> 100644
--- a/packages/react-jsx-highcharts/src/components/PlotBandLine/UsePlotBandLineLifecycle.js
+++ b/packages/react-jsx-highcharts/src/components/PlotBandLine/UsePlotBandLineLifecycle.js
@@ -29,10 +29,12 @@ export default function usePlotBandLineLifecycle(props, plotType) {
setPlotbandline({
id: myId,
getPlotBandLine: () => {
- const plotbandlineObject = axis.object.plotLinesAndBands.find(
- plb => plb.id === myId
- );
- return plotbandlineObject;
+ if (axis && axis.object && axis.object.plotLinesAndBands) {
+ const plotbandlineObject = axis.object.plotLinesAndBands.find(
+ plb => plb.id === myId
+ );
+ return plotbandlineObject;
+ }
}
});
}
|
Fix plotband label unmount crashing
|
diff --git a/app/src/main/java/org/jboss/hal/client/runtime/subsystem/jaxrs/RestResourcePreview.java b/app/src/main/java/org/jboss/hal/client/runtime/subsystem/jaxrs/RestResourcePreview.java
index <HASH>..<HASH> 100644
--- a/app/src/main/java/org/jboss/hal/client/runtime/subsystem/jaxrs/RestResourcePreview.java
+++ b/app/src/main/java/org/jboss/hal/client/runtime/subsystem/jaxrs/RestResourcePreview.java
@@ -69,7 +69,7 @@ import static org.jboss.hal.resources.CSS.*;
class RestResourcePreview extends PreviewContent<RestResource> {
private static final String LINK = "link";
- private static final JsRegExp REGEX = new JsRegExp("\\{([\\w-\\.]+)\\}", "g"); //NON-NLS
+ private static final JsRegExp REGEX = new JsRegExp("\\{(.+)\\}", "g"); //NON-NLS
private final Environment environment;
private final ServerActions serverActions;
|
Fix regexp in runtime rest preview
|
diff --git a/GCR/base.py b/GCR/base.py
index <HASH>..<HASH> 100644
--- a/GCR/base.py
+++ b/GCR/base.py
@@ -185,7 +185,14 @@ class BaseGenericCatalog(object):
Get information of a certain quantity.
If *key* is `None`, return the full dict for that quantity.
"""
- d = self._get_quantity_info_dict(quantity, default if key is None else dict())
+ d = self._get_quantity_info_dict(quantity, default=None)
+ if d is None and quantity in self._quantity_modifiers:
+ native = self._quantity_modifiers[quantity]
+ if native:
+ d = self._get_quantity_info_dict(native, default=None)
+
+ if d is None:
+ return default
if key is None:
return d
|
allow alias in get_quantity_info
|
diff --git a/src/mimerender.py b/src/mimerender.py
index <HASH>..<HASH> 100644
--- a/src/mimerender.py
+++ b/src/mimerender.py
@@ -286,7 +286,7 @@ try:
del flask.request.environ[key]
def _make_response(self, content, content_type, status):
- response = flask._make_response(content)
+ response = flask.make_response(content)
response.status = status
response.headers['Content-Type'] = content_type
return response
|
fixed call to flask.make_response
|
diff --git a/tests/test_orbit.py b/tests/test_orbit.py
index <HASH>..<HASH> 100644
--- a/tests/test_orbit.py
+++ b/tests/test_orbit.py
@@ -3031,6 +3031,7 @@ def test_SkyCoord():
assert numpy.all(numpy.fabs(decs-o.dec(times)) < 10.**-13.), 'Orbit SkyCoord dec and direct dec do not agree'
assert numpy.all(numpy.fabs(dists-o.dist(times)) < 10.**-13.), 'Orbit SkyCoord distance and direct distance do not agree'
# Check that the GC frame parameters are correctly propagated
+ if not _APY3: return None # not done in python 2
o= Orbit([120.,60.,2.,0.5,0.4,30.],radec=True,ro=10.,zo=1.,
solarmotion=[-10.,34.,12.])
assert numpy.fabs(o.SkyCoord().galcen_distance.to(units.kpc).value-numpy.sqrt(10.**2.+1.**2.)) < 10.**-13., 'Orbit SkyCoord GC frame attributes are incorrect'
|
Don't check galcen parameters in SkyCoord Orbit output for Python2 (because not done, because astropy does not support this)
|
diff --git a/app/models/fluentd/setting_archive/backup_file.rb b/app/models/fluentd/setting_archive/backup_file.rb
index <HASH>..<HASH> 100644
--- a/app/models/fluentd/setting_archive/backup_file.rb
+++ b/app/models/fluentd/setting_archive/backup_file.rb
@@ -2,15 +2,18 @@ class Fluentd
module SettingArchive
class BackupFile
include Archivable
+ attr_reader :note
FILE_EXTENSION = ".conf".freeze
def self.find_by_file_id(backup_dir, file_id)
- new(file_path_of(backup_dir, file_id))
+ note = Note.find_by_file_id(backup_dir, file_id) rescue nil
+ new(file_path_of(backup_dir, file_id), note)
end
- def initialize(file_path)
+ def initialize(file_path, note = nil)
@file_path = file_path
+ @note = note || Note.new(file_path.sub(/#{FILE_EXTENSION}$/, Note::FILE_EXTENSION))
end
end
end
|
Associate a note with a backup file.
|
diff --git a/src/main/java/org/codehaus/plexus/archiver/AbstractUnArchiver.java b/src/main/java/org/codehaus/plexus/archiver/AbstractUnArchiver.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/codehaus/plexus/archiver/AbstractUnArchiver.java
+++ b/src/main/java/org/codehaus/plexus/archiver/AbstractUnArchiver.java
@@ -128,4 +128,4 @@ public abstract class AbstractUnArchiver
protected abstract void execute()
throws ArchiverException, IOException;
-}
\ No newline at end of file
+}
|
o Adding newline at end of file.
|
diff --git a/railties/lib/rails/test_unit/reporter.rb b/railties/lib/rails/test_unit/reporter.rb
index <HASH>..<HASH> 100644
--- a/railties/lib/rails/test_unit/reporter.rb
+++ b/railties/lib/rails/test_unit/reporter.rb
@@ -5,7 +5,7 @@ module Rails
def report
return if passed?
io.puts
- io.puts "Failed test:"
+ io.puts "Failed tests:"
io.puts
io.puts aggregated_results
end
|
pluralize rerun snippet heading.
|
diff --git a/authCipher.js b/authCipher.js
index <HASH>..<HASH> 100644
--- a/authCipher.js
+++ b/authCipher.js
@@ -44,8 +44,7 @@ StreamCipher.prototype._update = function (chunk) {
if (!this._called && this._alen) {
var rump = 16 - (this._alen % 16)
if (rump < 16) {
- rump = Buffer.from(rump)
- rump.fill(0)
+ rump = Buffer.alloc(rump, 0)
this._ghash.update(rump)
}
}
|
authCipher: fix Buffer.from using from rather than alloc
|
diff --git a/visidata/basesheet.py b/visidata/basesheet.py
index <HASH>..<HASH> 100644
--- a/visidata/basesheet.py
+++ b/visidata/basesheet.py
@@ -145,7 +145,7 @@ class BaseSheet(DrawablePane):
cmd = self.getCommand(cmd or keystrokes)
if not cmd:
if keystrokes:
- vd.fail('no command for %s' % keystrokes)
+ vd.status('no command for %s' % keystrokes)
return False
escaped = False
|
[command-] do not fail/abort on unknown command
|
diff --git a/src/main/java/org/joda/beans/ser/SerDeserializerProvider.java b/src/main/java/org/joda/beans/ser/SerDeserializerProvider.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/joda/beans/ser/SerDeserializerProvider.java
+++ b/src/main/java/org/joda/beans/ser/SerDeserializerProvider.java
@@ -22,6 +22,9 @@ package org.joda.beans.ser;
* Implementations of this interface can introspect the bean type when choosing a deserializer.
* This allows deserializers to be provided that can handle multiple bean types, for example all beans
* in a particular package, any bean with a particular supertype or with a particular annotation.
+ * <p>
+ * In the simple case where an exact match is needed, the class implementing {@link SerDeserializer}
+ * can also implement {@link SerDeserializerProvider} with a singleton constant instance.
*
* @author Stephen Colebourne
*/
|
Add advice on implementing SerDeserializerProvider
|
diff --git a/Controller/Adminhtml/Node/UploadImage.php b/Controller/Adminhtml/Node/UploadImage.php
index <HASH>..<HASH> 100644
--- a/Controller/Adminhtml/Node/UploadImage.php
+++ b/Controller/Adminhtml/Node/UploadImage.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
namespace Snowdog\Menu\Controller\Adminhtml\Node;
use Magento\Backend\App\Action;
|
[<I>] Enable strict mode in node admin controller image upload action
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.