diff stringlengths 65 26.7k | message stringlengths 7 9.92k |
|---|---|
diff --git a/aerofiles/openair/reader.py b/aerofiles/openair/reader.py
index <HASH>..<HASH> 100644
--- a/aerofiles/openair/reader.py
+++ b/aerofiles/openair/reader.py
@@ -140,7 +140,7 @@ class LowLevelReader:
if len(values) != num:
raise ValueError()
- return [cast(value) for value, cast in zip(values, types)]
+ return [cast(v) for v, cast in zip(values, types)]
def coordinate(value): | openair: Fixed flake8 issues |
diff --git a/spec/puppetserver/ca/action/generate_spec.rb b/spec/puppetserver/ca/action/generate_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/puppetserver/ca/action/generate_spec.rb
+++ b/spec/puppetserver/ca/action/generate_spec.rb
@@ -52,6 +52,8 @@ RSpec.describe Puppetserver::Ca::Action::Generate do
expect(File.exist?(File.join(tmpdir, 'ca', 'root_key.pem'))).to be true
expect(File.exist?(File.join(tmpdir, 'ca', 'ca_crl.pem'))).to be true
expect(File.exist?(File.join(tmpdir, 'ssl', 'certs', 'foocert.pem'))).to be true
+ expect(File.exist?(File.join(tmpdir, 'ssl', 'private_keys', 'foocert.pem'))).to be true
+ expect(File.exist?(File.join(tmpdir, 'ssl', 'public_keys', 'foocert.pem'))).to be true
end
end
end | (maint) Test that we create master keys w/ generate |
diff --git a/src/react-webcam.js b/src/react-webcam.js
index <HASH>..<HASH> 100644
--- a/src/react-webcam.js
+++ b/src/react-webcam.js
@@ -148,7 +148,20 @@ export default class Webcam extends Component {
Webcam.mountedInstances.splice(index, 1);
if (Webcam.mountedInstances.length === 0 && this.state.hasUserMedia) {
- if (this.stream.stop) this.stream.stop();
+ if (this.stream.stop) {
+ this.stream.stop();
+ } else {
+ if (this.stream.getVideoTracks) {
+ for (let track of this.stream.getVideoTracks()) {
+ track.stop();
+ }
+ }
+ if (this.stream.getAudioTracks) {
+ for (let track of this.stream.getAudioTracks()) {
+ track.stop();
+ }
+ }
+ }
Webcam.userMediaRequested = false;
window.URL.revokeObjectURL(this.state.src);
} | add support for stopping audio and video tracks with new chrome API |
diff --git a/mir_eval/util.py b/mir_eval/util.py
index <HASH>..<HASH> 100644
--- a/mir_eval/util.py
+++ b/mir_eval/util.py
@@ -639,30 +639,6 @@ def validate_events(events, max_time=30000.):
raise ValueError('Events should be in increasing order.')
-def filter_labeled_intervals(intervals, labels):
- r'''Remove all invalid intervals (start >= end) and corresponding labels.
-
- :parameters:
- - intervals : np.ndarray
- Array of interval times (seconds)
-
- - labels : list
- List of labels
-
- :returns:
- - filtered_intervals : np.ndarray
- Valid interval times.
- - filtered_labels : list
- Corresponding filtered labels
- '''
- filt_intervals, filt_labels = [], []
- for interval, label in zip(intervals, labels):
- if interval[0] < interval[1]:
- filt_intervals.append(interval)
- filt_labels.append(label)
- return np.array(filt_intervals), filt_labels
-
-
def filter_kwargs(function, *args, **kwargs):
'''
Given a function and args and keyword args to pass to it, call the function | This function is no longer used in mir_eval |
diff --git a/interface.js b/interface.js
index <HASH>..<HASH> 100644
--- a/interface.js
+++ b/interface.js
@@ -86,7 +86,8 @@ function genericResult(err, value, buffer, offset) {
}
function fromBufferResult(rw, buffer, offset) {
- var res = rw.readFrom(buffer, offset || 0);
+ var start = offset || 0;
+ var res = rw.readFrom(buffer, start);
res = checkAllReadFrom(res, buffer);
return genericResult(res.err, res.value, buffer, res.offset);
} | interface: explicate out fromBufferResult start |
diff --git a/dev/com.ibm.ws.security.wim.adapter.ldap/src/com/ibm/ws/security/wim/adapter/ldap/context/ContextManager.java b/dev/com.ibm.ws.security.wim.adapter.ldap/src/com/ibm/ws/security/wim/adapter/ldap/context/ContextManager.java
index <HASH>..<HASH> 100644
--- a/dev/com.ibm.ws.security.wim.adapter.ldap/src/com/ibm/ws/security/wim/adapter/ldap/context/ContextManager.java
+++ b/dev/com.ibm.ws.security.wim.adapter.ldap/src/com/ibm/ws/security/wim/adapter/ldap/context/ContextManager.java
@@ -498,7 +498,8 @@ public class ContextManager {
if (isKerberosBindAuth()) {
try {
Subject subject = handleKerberos();
- env.put(javax.security.sasl.Sasl.CREDENTIALS, SubjectHelper.getGSSCredentialFromSubject(subject));
+ // Using javax.security.sasl.Sasl.CREDENTIALS caused intermittent compile failures on Java 8
+ env.put("javax.security.sasl.credentials", SubjectHelper.getGSSCredentialFromSubject(subject));
} catch (LoginException e) {
NamingException ne = new NamingException(e.getMessage());
ne.setRootCause(e); | Issue <I>: Swap out CRED constants for string on Ldap Kerberos |
diff --git a/symphony/content/content.publish.php b/symphony/content/content.publish.php
index <HASH>..<HASH> 100644
--- a/symphony/content/content.publish.php
+++ b/symphony/content/content.publish.php
@@ -622,6 +622,11 @@
$section = $sectionManager->fetch($entry->get('section_id'));
}
}
+
+ ###
+ # Delegate: EntryPreRender
+ # Description: Just prior to rendering of an Entry edit form. Entry object can be modified.
+ $this->_Parent->ExtensionManager->notifyMembers('EntryPreRender', '/publish/edit/', array('section' => $section, 'entry' => &$entry, 'fields' => $fields));
if(isset($this->_context['flag'])){ | Added EntryPreRender delegate allowing for modification of Entry object just before rendering the Edit form. To be used in Entry Revisions extension. |
diff --git a/core/committer/committer_impl.go b/core/committer/committer_impl.go
index <HASH>..<HASH> 100644
--- a/core/committer/committer_impl.go
+++ b/core/committer/committer_impl.go
@@ -17,8 +17,6 @@ limitations under the License.
package committer
import (
- "fmt"
-
"github.com/hyperledger/fabric/core/committer/txvalidator"
"github.com/hyperledger/fabric/core/ledger"
"github.com/hyperledger/fabric/events/producer"
@@ -65,8 +63,7 @@ func (lc *LedgerCommitter) Commit(block *common.Block) error {
// send block event *after* the block has been committed
if err := producer.SendProducerBlockEvent(block); err != nil {
- logger.Errorf("Error sending block event %s", err)
- return fmt.Errorf("Error sending block event %s", err)
+ logger.Errorf("Error publishing block %d, because: %v", block.Header.Number, err)
}
return nil | [FAB-<I>] Event publishing failure fails block commit
The committer implementation reports an error if the publishing
of a block committing event failures due to an error that is related
to the eventhub server.
The method shouldn't return a failure, but only log a message to the log,
because if it returns failure- the state transfer module in gossip/state/state.go
doesn't update its metadata.
Change-Id: I<I>f1ce<I>eb<I>fedfa2c<I>c<I>da |
diff --git a/state/metrics.go b/state/metrics.go
index <HASH>..<HASH> 100644
--- a/state/metrics.go
+++ b/state/metrics.go
@@ -31,7 +31,7 @@ type MetricBatch struct {
type metricBatchDoc struct {
UUID string `bson:"_id"`
- EnvUUID string `bson:"envuuid"`
+ EnvUUID string `bson:"env-uuid"`
Unit string `bson:"unit"`
CharmUrl string `bson:"charmurl"`
Sent bool `bson:"sent"` | Align metricsDoc.EnvUUID serialization.
Follow the multi-environment document convention of serializing EnvUUID
as "env-uuid". |
diff --git a/framework/core/src/Queue/QueueServiceProvider.php b/framework/core/src/Queue/QueueServiceProvider.php
index <HASH>..<HASH> 100644
--- a/framework/core/src/Queue/QueueServiceProvider.php
+++ b/framework/core/src/Queue/QueueServiceProvider.php
@@ -107,6 +107,13 @@ class QueueServiceProvider extends AbstractServiceProvider
protected function registerCommands()
{
$this->app['events']->listen(Configuring::class, function (Configuring $event) {
+ $queue = $this->app->make(Queue::class);
+
+ // There is no need to have the queue commands when using the sync driver.
+ if ($queue instanceof SyncQueue) {
+ return;
+ }
+
foreach ($this->commands as $command) {
$event->addCommand($command);
} | only show queue commands if using another driver than sync |
diff --git a/tests/unit/test_client.py b/tests/unit/test_client.py
index <HASH>..<HASH> 100644
--- a/tests/unit/test_client.py
+++ b/tests/unit/test_client.py
@@ -1,6 +1,7 @@
import unittest
from mock import patch
+from quickbooks.exceptions import QuickbooksException
from quickbooks import client
@@ -141,3 +142,23 @@ class ClientTest(unittest.TestCase):
qbService.get_auth_session.assert_called_with('token', 'secret', data={'oauth_verifier': 'oauth_verifier'})
self.assertFalse(session is None)
+
+ def test_get_instance(self):
+ qb_client = client.QuickBooks()
+
+ instance = qb_client.get_instance()
+ self.assertEquals(qb_client, instance)
+
+ @patch('quickbooks.client.OAuth1Session')
+ def test_create_session(self, auth_Session):
+ qb_client = client.QuickBooks()
+ session = qb_client.create_session()
+
+ self.assertTrue(auth_Session.called)
+ self.assertFalse(session is None)
+
+ def test_create_session_missing_auth_info_exception(self):
+ qb_client = client.QuickBooks()
+ qb_client.consumer_secret = None
+
+ self.assertRaises(QuickbooksException, qb_client.create_session) | Added tests for create_session and get_instance in client. |
diff --git a/rope/__init__.py b/rope/__init__.py
index <HASH>..<HASH> 100644
--- a/rope/__init__.py
+++ b/rope/__init__.py
@@ -1,7 +1,7 @@
"""rope, a python refactoring library"""
INFO = __doc__
-VERSION = '0.10.6'
+VERSION = '0.10.7'
COPYRIGHT = """\
Copyright (C) 2015-2016 Nicholas Smith
Copyright (C) 2014-2015 Matej Cepl | Update version to match bump to <I> |
diff --git a/girder/utility/plugin_utilities.py b/girder/utility/plugin_utilities.py
index <HASH>..<HASH> 100644
--- a/girder/utility/plugin_utilities.py
+++ b/girder/utility/plugin_utilities.py
@@ -85,9 +85,11 @@ def loadPlugin(name, root):
:param root: The root node of the web API.
"""
pluginDir = os.path.join(ROOT_DIR, 'plugins', name)
+ isPluginDir = os.path.isdir(os.path.join(pluginDir, 'server'))
+ isPluginFile = os.path.isfile(os.path.join(pluginDir, 'server.py'))
if not os.path.exists(pluginDir):
raise Exception('Plugin directory does not exist: {}'.format(pluginDir))
- if not os.path.isdir(os.path.join(pluginDir, 'server')):
+ if not isPluginDir and not isPluginFile:
# This plugin does not have any server-side python code.
return | Adding support for server.py instead of a server folder in plugins. |
diff --git a/sklearn_evaluation/report.py b/sklearn_evaluation/report.py
index <HASH>..<HASH> 100644
--- a/sklearn_evaluation/report.py
+++ b/sklearn_evaluation/report.py
@@ -3,10 +3,14 @@ import plots
from cStringIO import StringIO
import base64
import os
-import mistune
from datetime import datetime
from utils import get_model_name
+try:
+ import mistune
+except:
+ raise Exception('You need to install mistune to use the report module')
+
from matplotlib.backends.backend_agg import FigureCanvasAgg as FigureCanvas
from matplotlib.figure import Figure | adds exception when trying to use the report module without mistune installed |
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index <HASH>..<HASH> 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -3,6 +3,7 @@ require 'action_mailer/tmail_compat'
require 'action_mailer/collector'
require 'active_support/core_ext/array/wrap'
require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/proc'
module ActionMailer #:nodoc:
# Action Mailer allows you to send email from your application using a mailer model and views. | Added missing require, we are using bind method defined on active_support/core_ext/proc
[#<I> state:committed] |
diff --git a/activemodel/lib/active_model/attribute_assignment.rb b/activemodel/lib/active_model/attribute_assignment.rb
index <HASH>..<HASH> 100644
--- a/activemodel/lib/active_model/attribute_assignment.rb
+++ b/activemodel/lib/active_model/attribute_assignment.rb
@@ -19,10 +19,10 @@ module ActiveModel
# cat = Cat.new
# cat.assign_attributes(name: "Gorby", status: "yawning")
# cat.name # => 'Gorby'
- # cat.status => 'yawning'
+ # cat.status # => 'yawning'
# cat.assign_attributes(status: "sleeping")
# cat.name # => 'Gorby'
- # cat.status => 'sleeping'
+ # cat.status # => 'sleeping'
def assign_attributes(new_attributes)
if !new_attributes.respond_to?(:stringify_keys)
raise ArgumentError, "When assigning attributes, you must pass a hash as an argument." | Docs: Fix output representation [ci skip]
The output of two string attributes is displayed differently in the docs. Standardize the output by always showing it as a comment. |
diff --git a/build/dice.js b/build/dice.js
index <HASH>..<HASH> 100644
--- a/build/dice.js
+++ b/build/dice.js
@@ -1,5 +1,5 @@
dice = {
- version: "0.5.0",
+ version: "0.7.0",
roll: function(str, scope){
var parsed = dice.parse.parse(str); | Fixed and bumped version number. |
diff --git a/dss/events/chunkedtask/_awsimpl.py b/dss/events/chunkedtask/_awsimpl.py
index <HASH>..<HASH> 100644
--- a/dss/events/chunkedtask/_awsimpl.py
+++ b/dss/events/chunkedtask/_awsimpl.py
@@ -40,6 +40,3 @@ class AWSRuntime(Runtime[dict, typing.Any]):
@staticmethod
def log(client_key: str, task_id: str, message: str):
log_message(awsconstants.get_worker_sns_topic(client_key), task_id, message)
- # TODO: (ttung) remove this when the existing branches that depend on the old log group have landed.
- # Additionally, the chunked_task_worker perm for the ci-cd user should be removed.
- log_message("chunked_task_worker", task_id, message) | remove old logger (#<I>) |
diff --git a/electionnight/management/commands/bootstrap_elex.py b/electionnight/management/commands/bootstrap_elex.py
index <HASH>..<HASH> 100644
--- a/electionnight/management/commands/bootstrap_elex.py
+++ b/electionnight/management/commands/bootstrap_elex.py
@@ -131,12 +131,18 @@ class Command(BaseCommand):
else:
party = None
- return election.Election.objects.get(
- election_day=election_day,
- division=race.office.division,
- race=race,
- party=party
- )
+ try:
+ election.Election.objects.get(
+ election_day=election_day,
+ division=race.office.division,
+ race=race,
+ party=party
+ )
+ except:
+ print('Could not find election for {0} {1} {2}'.format(
+ race, party, row['last']
+ ))
+ return None
def get_or_create_party(self, row):
"""
@@ -261,6 +267,9 @@ class Command(BaseCommand):
race = self.get_race(row, division)
election = self.get_election(row, race)
+ if not election:
+ return None
+
party = self.get_or_create_party(row)
candidate = self.get_or_create_candidate(row, party, race)
candidate_election = self.get_or_create_candidate_election( | don't error out if we don't find an election during bootstrap |
diff --git a/cmd/githubwiki/githubwiki.go b/cmd/githubwiki/githubwiki.go
index <HASH>..<HASH> 100644
--- a/cmd/githubwiki/githubwiki.go
+++ b/cmd/githubwiki/githubwiki.go
@@ -72,7 +72,7 @@ func (g git) exec(args ...string) (string, error) {
cmd.Dir = string(g)
output, err := cmd.CombinedOutput()
if err != nil {
- return "", fmt.Errorf("%v failed: %v", cmd.Args, err)
+ return "", fmt.Errorf("%v failed\nError: %v\nOutput: %s", cmd.Args, err, string(output))
}
return strings.TrimSpace(string(output)), nil
} | Add more detailed output for github-wiki task (#<I>)
Print output of git command in addition to error in error output. |
diff --git a/lib/ood_core/job/adapters/slurm.rb b/lib/ood_core/job/adapters/slurm.rb
index <HASH>..<HASH> 100644
--- a/lib/ood_core/job/adapters/slurm.rb
+++ b/lib/ood_core/job/adapters/slurm.rb
@@ -74,7 +74,7 @@ module OodCore
def get_jobs(id: "", filters: [])
delim = ";" # don't use "|" because FEATURES uses this
options = filters.empty? ? fields : fields.slice(*filters)
- args = ["--all", "--array", "--states=all", "--noconvert"]
+ args = ["--all", "--states=all", "--noconvert"]
args += ["-o", "#{options.values.join(delim)}"]
args += ["-j", id.to_s] unless id.to_s.empty?
lines = call("squeue", *args).split("\n").map(&:strip) | don't break up job arrays
A job array initially starts off as a single job with a single job id.
But as one of those jobs in the array changes state (e.g., runs) then it
will be given a new job id and be treated as a separate job. This new
job will be on a new line in `squeue` and we don't need to use
`--array`. |
diff --git a/lib/config.js b/lib/config.js
index <HASH>..<HASH> 100644
--- a/lib/config.js
+++ b/lib/config.js
@@ -6,6 +6,11 @@ module.exports = function(c){
_(config).extend(c);
+ // attempt to prime the creds by getting them now instead of on
+ // the first request.
+ var creds = new AWS.Credentials();
+ creds.get();
+
AWS.config.update({
accessKeyId: c.accessKeyId,
secretAccessKey: c.secretAccessKey,
@@ -17,6 +22,6 @@ module.exports = function(c){
if (c.endpoint && c.endpoint !== '') opts.endpoint = new AWS.Endpoint(c.endpoint);
config.dynamo = new AWS.DynamoDB(opts);
-
+
return config;
}; | by calling creds.get() this give a chance for creds to get cached before many requests at once try to get them [live test] |
diff --git a/tests/hexadecimal-utils/test_is_hexstr.py b/tests/hexadecimal-utils/test_is_hexstr.py
index <HASH>..<HASH> 100644
--- a/tests/hexadecimal-utils/test_is_hexstr.py
+++ b/tests/hexadecimal-utils/test_is_hexstr.py
@@ -15,6 +15,7 @@ from eth_utils import is_hexstr
("0xabcdef1234567890", True),
("0xABCDEF1234567890", True),
("0xAbCdEf1234567890", True),
+ ("0XAbCdEf1234567890", True),
("12345", True), # odd length
("0x12345", True), # odd length
("123456xx", False), # non-hex character
@@ -22,7 +23,7 @@ from eth_utils import is_hexstr
("0\u0080", False), # triggers different exceptions in py2 and py3
(1, False), # int
(b"", False), # bytes
- ({}, False), # dicitionary
+ ({}, False), # dictionary
(lambda: None, False) # lambda function
),
) | Typo fix and added test with '0X' prefix |
diff --git a/lib/active_decorator/decorator.rb b/lib/active_decorator/decorator.rb
index <HASH>..<HASH> 100644
--- a/lib/active_decorator/decorator.rb
+++ b/lib/active_decorator/decorator.rb
@@ -17,14 +17,14 @@ module ActiveDecorator
obj.each do |r|
decorate r
end
- elsif defined?(ActiveRecord) && obj.is_a?(ActiveRecord::Relation) && !obj.is_a?(ActiveDecorator::RelationDecorator) && !obj.is_a?(ActiveDecorator::RelationDecoratorLegacy)
+ elsif defined?(ActiveRecord) && obj.is_a?(ActiveRecord::Relation)
# don't call each nor to_a immediately
if obj.respond_to?(:records)
# Rails 5.0
- obj.extend ActiveDecorator::RelationDecorator
+ obj.extend ActiveDecorator::RelationDecorator unless obj.is_a? ActiveDecorator::RelationDecorator
else
# Rails 3.x and 4.x
- obj.extend ActiveDecorator::RelationDecoratorLegacy
+ obj.extend ActiveDecorator::RelationDecoratorLegacy unless obj.is_a? ActiveDecorator::RelationDecoratorLegacy
end
else
d = decorator_for obj.class | Should not fallback to `else` when the Relation is already decorated |
diff --git a/src/org/jgroups/protocols/UNICAST.java b/src/org/jgroups/protocols/UNICAST.java
index <HASH>..<HASH> 100644
--- a/src/org/jgroups/protocols/UNICAST.java
+++ b/src/org/jgroups/protocols/UNICAST.java
@@ -32,7 +32,7 @@ import java.util.concurrent.atomic.AtomicInteger;
* whenever a message is received: the new message is added and then we try to remove as many messages as
* possible (until we stop at a gap, or there are no more messages).
* @author Bela Ban
- * @version $Id: UNICAST.java,v 1.135 2009/04/29 12:36:06 belaban Exp $
+ * @version $Id: UNICAST.java,v 1.136 2009/04/29 12:48:27 belaban Exp $
*/
@MBean(description="Reliable unicast layer")
@DeprecatedProperty(names={"immediate_ack", "use_gms", "enabled_mbrs_timeout", "eager_lock_release"})
@@ -435,6 +435,7 @@ public class UNICAST extends Protocol implements AckSenderWindow.RetransmitComma
/**
* This method is public only so it can be invoked by unit testing, but should not otherwise be used !
*/
+ @ManagedOperation(description="Trashes all connections to other nodes. This is only used for testing")
public void removeAllConnections() {
synchronized(connections) {
for(Entry entry: connections.values()) { | made removeAllConnections() a managed op |
diff --git a/ui/src/data_explorer/reducers/timeRange.js b/ui/src/data_explorer/reducers/timeRange.js
index <HASH>..<HASH> 100644
--- a/ui/src/data_explorer/reducers/timeRange.js
+++ b/ui/src/data_explorer/reducers/timeRange.js
@@ -1,5 +1,3 @@
-import update from 'react-addons-update';
-
const initialState = {
upper: null,
lower: 'now() - 15m',
@@ -9,11 +7,12 @@ export default function timeRange(state = initialState, action) {
switch (action.type) {
case 'SET_TIME_RANGE': {
const {upper, lower} = action.payload;
+ const newState = {
+ upper,
+ lower,
+ };
- return update(state, {
- ['lower']: {$set: lower},
- ['upper']: {$set: upper},
- });
+ return {...state, ...newState};
}
}
return state; | Use es6 flavorz in timeRange reducer |
diff --git a/ratethisapp/src/main/java/com/kobakei/ratethisapp/RateThisApp.java b/ratethisapp/src/main/java/com/kobakei/ratethisapp/RateThisApp.java
index <HASH>..<HASH> 100644
--- a/ratethisapp/src/main/java/com/kobakei/ratethisapp/RateThisApp.java
+++ b/ratethisapp/src/main/java/com/kobakei/ratethisapp/RateThisApp.java
@@ -170,6 +170,14 @@ public class RateThisApp {
showRateDialog(context, builder);
}
+ /**
+ * Stop showing the rate dialog
+ * @param context
+ */
+ public static void stopRateDialog(final Context context){
+ setOptOut(context, true);
+ }
+
private static void showRateDialog(final Context context, AlertDialog.Builder builder) {
int titleId = sConfig.mTitleId != 0 ? sConfig.mTitleId : R.string.rta_dialog_title;
int messageId = sConfig.mMessageId != 0 ? sConfig.mMessageId : R.string.rta_dialog_message; | Update RateThisApp.java
Create a stop showing method |
diff --git a/spec/functional/resource/env_spec.rb b/spec/functional/resource/env_spec.rb
index <HASH>..<HASH> 100755
--- a/spec/functional/resource/env_spec.rb
+++ b/spec/functional/resource/env_spec.rb
@@ -126,7 +126,7 @@ describe Chef::Resource::Env, :windows_only do
context 'when using PATH' do
let(:random_name) { Time.now.to_i }
let(:env_val) { "#{env_value_expandable}_#{random_name}"}
- let!(:path_before) { test_resource.provider_for_action(test_resource.action).env_value('PATH') }
+ let!(:path_before) { test_resource.provider_for_action(test_resource.action).env_value('PATH') || '' }
let!(:env_path_before) { ENV['PATH'] }
it 'should expand PATH' do
@@ -143,9 +143,6 @@ describe Chef::Resource::Env, :windows_only do
test_resource.key_name('PATH')
test_resource.value(path_before)
test_resource.run_action(:create)
- if test_resource.provider_for_action(test_resource.action).env_value('PATH') != path_before
- raise 'Failed to cleanup after ourselves'
- end
ENV['PATH'] = env_path_before
end
end | Deal with nil system path in env_spec |
diff --git a/init/index.js b/init/index.js
index <HASH>..<HASH> 100644
--- a/init/index.js
+++ b/init/index.js
@@ -48,7 +48,11 @@ util.inherits(Generator, BBBGenerator);
Generator.prototype.askFor = function askFor() {
var done = this.async();
- var force = (this.constructor._name === "bbb:init") || grunt.file.isFile(".bbb-rc.json");
+ var force = false;
+ if (this.constructor._name === "bbb:init"
+ || !grunt.file.isFile(path.join(this.destinationRoot(), ".bbb-rc.json"))) {
+ force = true;
+ }
// Display the BBB ASCII
console.log(grunt.file.read(path.join(__dirname, "../ascii.txt"))); | Fix question prompt so it does not reask answered question when .bbb-rc.json file is present. |
diff --git a/src/feat/extern/log/log.py b/src/feat/extern/log/log.py
index <HASH>..<HASH> 100644
--- a/src/feat/extern/log/log.py
+++ b/src/feat/extern/log/log.py
@@ -20,6 +20,7 @@ Maintainer: U{Thomas Vander Stichele <thomas at apestaart dot org>}
import errno
import sys
import os
+import shutil
import fnmatch
import time
import types
@@ -710,8 +711,8 @@ def moveLogFiles(out_filename, err_filename):
def doMove(src, dst):
try:
- os.rename(src, dst)
- except OSError as e:
+ shutil.move(src, dst)
+ except IOError as e:
error('log', 'Error moving file %s -> %s. Error: %r',
src, dst, e)
@@ -721,6 +722,7 @@ def moveLogFiles(out_filename, err_filename):
_stdout = out_filename
_stderr = err_filename
+ reopenOutputFiles()
def outputToFiles(stdout=None, stderr=None): | Avoid cross-device link errors renaming file over 2 filesystems |
diff --git a/spec/unit/util/network_device/transport/ssh_spec.rb b/spec/unit/util/network_device/transport/ssh_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/unit/util/network_device/transport/ssh_spec.rb
+++ b/spec/unit/util/network_device/transport/ssh_spec.rb
@@ -4,8 +4,7 @@ require File.dirname(__FILE__) + '/../../../../spec_helper'
require 'puppet/util/network_device/transport/ssh'
-describe Puppet::Util::NetworkDevice::Transport::Ssh do
- confine "Missing net/ssh" => Puppet.features.ssh?
+describe Puppet::Util::NetworkDevice::Transport::Ssh, :if => Puppet.features.ssh? do
before(:each) do
@transport = Puppet::Util::NetworkDevice::Transport::Ssh.new()
@@ -209,4 +208,4 @@ describe Puppet::Util::NetworkDevice::Transport::Ssh do
end
end
-end
\ No newline at end of file
+end | Updated confine in Spec test for RSpec 2 |
diff --git a/registry/tokentransport.go b/registry/tokentransport.go
index <HASH>..<HASH> 100644
--- a/registry/tokentransport.go
+++ b/registry/tokentransport.go
@@ -69,7 +69,7 @@ func (t *TokenTransport) auth(authService *authService) (string, *http.Response,
}
func (t *TokenTransport) retry(req *http.Request, token string) (*http.Response, error) {
- req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", token))
+ req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", token))
resp, err := t.Transport.RoundTrip(req)
return resp, err
} | Replace basic auth with bearer
I found that this was necessary to get it to work with registry-1.docker.io.
Otherwise it sends two Authorization headers, one Basic and one Bearer, and I think the server only looks at the first. |
diff --git a/classes/Boom/Model/Asset.php b/classes/Boom/Model/Asset.php
index <HASH>..<HASH> 100644
--- a/classes/Boom/Model/Asset.php
+++ b/classes/Boom/Model/Asset.php
@@ -206,7 +206,7 @@ class Boom_Model_Asset extends Model_Taggable
{
// Add files for previous versions of the asset.
// Wrap the glob in array_reverse() so that we end up with an array with the most recent first.
- foreach (array_reverse(glob($this->directory().".*.bak")) as $file)
+ foreach (array_reverse(glob($this->path().".*.bak")) as $file)
{
// Get the version ID out of the filename.
preg_match('/' . $this->id . '.(\d+).bak$/', $file, $matches); | Fixed viewing an asset's previous files |
diff --git a/lib/config/config.go b/lib/config/config.go
index <HASH>..<HASH> 100644
--- a/lib/config/config.go
+++ b/lib/config/config.go
@@ -135,8 +135,9 @@ func NewWithFreePorts(myID protocol.DeviceID) (Configuration, error) {
cfg.Options.RawListenAddresses = []string{"default"}
} else {
cfg.Options.RawListenAddresses = []string{
- fmt.Sprintf("tcp://%s", net.JoinHostPort("0.0.0.0", strconv.Itoa(port))),
+ util.Address("tcp", net.JoinHostPort("0.0.0.0", strconv.Itoa(port))),
"dynamic+https://relays.syncthing.net/endpoint",
+ util.Address("quic", net.JoinHostPort("0.0.0.0", strconv.Itoa(port))),
}
} | lib/config: Add missing quic address in case of non-default port (fixes #<I>) (#<I>)
* Add quic listener on instance of port blockage
* Update lib/config/config.go |
diff --git a/jfoenix/src/main/java/com/jfoenix/controls/JFXDecorator.java b/jfoenix/src/main/java/com/jfoenix/controls/JFXDecorator.java
index <HASH>..<HASH> 100644
--- a/jfoenix/src/main/java/com/jfoenix/controls/JFXDecorator.java
+++ b/jfoenix/src/main/java/com/jfoenix/controls/JFXDecorator.java
@@ -322,6 +322,7 @@ public class JFXDecorator extends VBox {
return; // maximized mode does not support resize
}
if (!primaryStage.isResizable()) {
+ updateInitMouseValues(mouseEvent);
return;
}
double x = mouseEvent.getX(); | fixed #<I> moving JFXDecorator window causes it to get snapped to mouse pointer if stage is not re-sizable |
diff --git a/tests/legacy/background-events.js b/tests/legacy/background-events.js
index <HASH>..<HASH> 100644
--- a/tests/legacy/background-events.js
+++ b/tests/legacy/background-events.js
@@ -686,6 +686,21 @@ describe('background events', function() {
$('#cal').fullCalendar(options);
});
});
+
+ describe('when out of view range', function() {
+ it('should still render', function(done) {
+ options.events = [ {
+ start: '2014-01-01T01:00:00',
+ end: '2014-01-01T05:00:00',
+ rendering: 'inverse-background'
+ } ];
+ options.eventAfterAllRender = function() {
+ expect($('.fc-bgevent').length).toBe(7);
+ done();
+ };
+ $('#cal').fullCalendar(options);
+ });
+ });
});
it('can have custom Event Object color', function(done) { | added test for out of range inverse-background events |
diff --git a/lib/itamae/recipe.rb b/lib/itamae/recipe.rb
index <HASH>..<HASH> 100644
--- a/lib/itamae/recipe.rb
+++ b/lib/itamae/recipe.rb
@@ -49,10 +49,15 @@ module Itamae
false
end
- def method_missing(method, name, &block)
+ def method_missing(*args, &block)
+ super unless args.size == 2
+
+ method, name = args
klass = Resource.get_resource_class(method)
resource = klass.new(self, name, &block)
@children << resource
+ rescue
+ super
end
def include_recipe(recipe) | method_missing should accepts any num of args. |
diff --git a/tourney.js b/tourney.js
index <HASH>..<HASH> 100644
--- a/tourney.js
+++ b/tourney.js
@@ -45,9 +45,12 @@ Tourney.inherit = function (Klass, Initial) {
// ignore inherited `sub`, `inherit`, and `from` for now for sanity
};
-Tourney.sub = function (name, init, Initial) {
- // Preserve Tournament API. This ultimately calls (Initial || Tourney).inherit
- Tournament.sub(name, init, Initial || Tourney);
+Tourney.defaults = Tournament.defaults;
+Tourney.invalid = Tournament.invalid;
+
+Tourney.sub = function (name, init) {
+ // Preserve Tournament API. This ultimately calls Tourney.inherit
+ return Tournament.sub(name, init, Tourney);
};
// TODO: Tourney.from should be almost identical to Tournament's | make sub work properly and implement Initial defaults and invalid |
diff --git a/connector.go b/connector.go
index <HASH>..<HASH> 100644
--- a/connector.go
+++ b/connector.go
@@ -26,7 +26,7 @@ type HostConfig struct {
type TransportConfig struct {
SslVerify bool
certPool *x509.CertPool
- HttpRequestTimeout int // in seconds
+ HttpRequestTimeout time.Duration // in seconds
HttpPoolConnections int
}
@@ -127,7 +127,7 @@ func (whr *WapiHttpRequestor) Init(cfg TransportConfig) {
TLSClientConfig: &tls.Config{InsecureSkipVerify: !cfg.SslVerify,
RootCAs: cfg.certPool},
MaxIdleConnsPerHost: cfg.HttpPoolConnections,
- ResponseHeaderTimeout: time.Duration(cfg.HttpRequestTimeout * 1000000000), // ResponseHeaderTimeout is in nanoseconds
+ ResponseHeaderTimeout: cfg.HttpRequestTimeout * time.Second,
}
whr.client = http.Client{Transport: tr} | Replace hardcoded <I> with time.Second.
While here declare HttpRequestTimeout as a time.Duration so there is no
need for a type conversion. |
diff --git a/lib/rules/security/not-rely-on-time.js b/lib/rules/security/not-rely-on-time.js
index <HASH>..<HASH> 100644
--- a/lib/rules/security/not-rely-on-time.js
+++ b/lib/rules/security/not-rely-on-time.js
@@ -28,7 +28,7 @@ class NotRelyOnTimeChecker extends BaseChecker {
}
MemberAccess(node) {
- if (node.memberName === 'timestamp' && node.expression.name === 'block') {
+ if (node.expression.name === 'block' && node.memberName === 'timestamp') {
this._warn(node)
}
} | Update lib/rules/security/not-rely-on-time.js |
diff --git a/bika/lims/exportimport/setupdata/__init__.py b/bika/lims/exportimport/setupdata/__init__.py
index <HASH>..<HASH> 100644
--- a/bika/lims/exportimport/setupdata/__init__.py
+++ b/bika/lims/exportimport/setupdata/__init__.py
@@ -399,7 +399,7 @@ class Lab_Products(WorksheetImporter):
# Iterate through the rows
for row in self.get_rows(3):
# Check for required columns
- check_for_required_columns('SRTemplate', row, [
+ check_for_required_columns('LabProduct', row, [
'title', 'volume', 'unit', 'price'
])
# Create the SRTemplate object | SRTemplate should be LabProduct in Lab_Products importer |
diff --git a/tests/test_web_runner.py b/tests/test_web_runner.py
index <HASH>..<HASH> 100644
--- a/tests/test_web_runner.py
+++ b/tests/test_web_runner.py
@@ -55,9 +55,10 @@ async def test_runner_setup_without_signal_handling(make_runner) -> None:
async def test_site_double_added(make_runner) -> None:
+ _sock = get_unused_port_socket('127.0.0.1')
runner = make_runner()
await runner.setup()
- site = web.TCPSite(runner)
+ site = web.SockSite(runner, _sock)
await site.start()
with pytest.raises(RuntimeError):
await site.start() | Fix test_site_double_added to use ephemeral port |
diff --git a/lib/flor/core/executor.rb b/lib/flor/core/executor.rb
index <HASH>..<HASH> 100644
--- a/lib/flor/core/executor.rb
+++ b/lib/flor/core/executor.rb
@@ -404,6 +404,11 @@ module Flor
def process(message)
+ fail ArgumentError.new("incoming message has non nil or Hash payload") \
+ unless message['payload'] == nil || message['payload'].is_a?(Hash)
+ #
+ # weed out messages with non-conforming payloads
+
begin
message['m'] = counter_next('msgs') # number messages | Fail early on messages with non nil/Hash payloads |
diff --git a/modules/orionode/server.js b/modules/orionode/server.js
index <HASH>..<HASH> 100644
--- a/modules/orionode/server.js
+++ b/modules/orionode/server.js
@@ -16,6 +16,7 @@ var auth = require('./lib/middleware/auth'),
fs = require('fs'),
mkdirp = require('mkdirp'),
os = require('os'),
+ constants = require('constants'),
log4js = require('log4js'),
compression = require('compression'),
path = require('path'),
@@ -103,6 +104,7 @@ function startServer(cb) {
var app = express();
if (configParams.get("orion.https.key") && configParams.get("orion.https.cert")) {
server = https.createServer({
+ secureOptions: constants.SSL_OP_NO_TLSv1,
key: fs.readFileSync(configParams.get("orion.https.key")),
cert: fs.readFileSync(configParams.get("orion.https.cert"))
}, app); | [vulnerability] Disable TLS <I> in orion servers in public org-ids/web-ide-issues#<I> |
diff --git a/coaster/views/classview.py b/coaster/views/classview.py
index <HASH>..<HASH> 100644
--- a/coaster/views/classview.py
+++ b/coaster/views/classview.py
@@ -181,8 +181,6 @@ class ViewDecorator(object):
use_options.update(class_options)
endpoint = use_options.pop('endpoint', self.endpoint)
self.endpoints.add(endpoint)
- # If there are multiple rules with custom endpoint names, the last route's prevails here
- self.endpoint = endpoint
use_rule = rulejoin(class_rule, method_rule)
app.add_url_rule(use_rule, endpoint, view_func, **use_options)
if callback: | We broke endpoints. Unbreak. |
diff --git a/mousedb/data/views.py b/mousedb/data/views.py
index <HASH>..<HASH> 100644
--- a/mousedb/data/views.py
+++ b/mousedb/data/views.py
@@ -230,17 +230,19 @@ def experiment_details_csv(request, pk):
response = HttpResponse(content_type='text/csv')
response['Content-Disposition'] = 'attachment; filename=experiment.csv'
writer = csv.writer(response)
- writer.writerow(["Animal","Cage", "Strain", "Genotype", "Age", "Assay", "Values", "Feeding", "Treatment"])
+ writer.writerow(["Animal","Cage", "Strain", "Genotype", "Gender","Age", "Assay", "Values", "Feeding", "Experiment Date", "Treatment"])
for measurement in experiment.measurement_set.iterator():
writer.writerow([
measurement.animal,
measurement.animal.Cage,
measurement.animal.Strain,
measurement.animal.Genotype,
+ measurement.animal.Gender,
measurement.age(),
measurement.assay,
measurement.values,
measurement.experiment.feeding_state,
+ measurement.experiment.date,
measurement.animal.treatment_set.all()
])
return response | Added Gender and Date to Experiment csv file. Closes #<I> |
diff --git a/netpyne/sim/utils.py b/netpyne/sim/utils.py
index <HASH>..<HASH> 100644
--- a/netpyne/sim/utils.py
+++ b/netpyne/sim/utils.py
@@ -897,6 +897,7 @@ def clearAll():
matplotlib.pyplot.close('all')
# clean rxd components
+ '''
if hasattr(sim.net, 'rxd'):
sim.clearObj(sim.net.rxd)
@@ -928,9 +929,10 @@ def clearAll():
rxd.species._has_3d = False
rxd.rxd._zero_volume_indices = np.ndarray(0, dtype=np.int_)
rxd.set_solve_type(dimension=1)
- print('cleared all')
+
#except:
# pass
+ '''
if hasattr(sim, 'net'):
del sim.net | remove rxd clearing until fixed |
diff --git a/lib/steam/java.rb b/lib/steam/java.rb
index <HASH>..<HASH> 100644
--- a/lib/steam/java.rb
+++ b/lib/steam/java.rb
@@ -28,6 +28,7 @@ module Steam
import('java.util.Arrays', :Arrays)
import('java.util.ArrayList', :ArrayList)
import('org.apache.commons.httpclient.NameValuePair', :NameValuePair)
+ # import('com.gargoylesoftware.htmlunit.util.NameValuePair', :NameValuePair) # HtmlUnit 2.7
end
def set_classpath! | import statement as needed from htmlunit <I> on |
diff --git a/Gruntfile.js b/Gruntfile.js
index <HASH>..<HASH> 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -18,7 +18,7 @@ module.exports = function (grunt) {
* Some basic information e.g. to create a banner
*/
basicInformation: {
- author: 'Michael Raith <Bruce17@users.noreply.github.com>',
+ author: 'Michael Raith <mia87@web.de>',
url: 'https://github.com/Bruce17',
date: '<%= grunt.template.today("yyyy-mm-dd hh:MM:ss") %>'
}, | Gruntfile: changed e-mail |
diff --git a/tools/lbd_lock_test/testrunner.py b/tools/lbd_lock_test/testrunner.py
index <HASH>..<HASH> 100755
--- a/tools/lbd_lock_test/testrunner.py
+++ b/tools/lbd_lock_test/testrunner.py
@@ -83,13 +83,12 @@ def runTest(i):
prevnow = now
sys.stdout.write(" %d seconds " % ((now - start).seconds))
- # if no dots read in 10 seconds, then we assume the java proc has hung
- if (now - lastdotprinted).seconds > 20:
- print("\nSorry, this platfrom may have reproduced the issue. If you do not see more dots, it's sadness time.")
- possiblyFailed = True
+ # if no dots read in 10 seconds, then we assume the java proc has hung
+ if (now - lastdotprinted).seconds > 20:
+ print("\nSorry, this platfrom may have reproduced the issue. If you do not see more dots, it's sadness time.")
+ possiblyFailed = True
- # if all's gone well for DURATION_IN_SECONDS, we kill the proc and return true
- if possiblyFailed == False:
+ # if all's gone well for DURATION_IN_SECONDS, we kill the proc and return true
if (now - start).seconds > DURATION_IN_SECONDS:
print("\nThis run (%d) did not reproduce the issue." % (i))
killProcess(p) | Updating test runner so it won't print out the error message ad nauseam. |
diff --git a/cardinal_pythonlib/tests/dogpile_cache_tests.py b/cardinal_pythonlib/tests/dogpile_cache_tests.py
index <HASH>..<HASH> 100644
--- a/cardinal_pythonlib/tests/dogpile_cache_tests.py
+++ b/cardinal_pythonlib/tests/dogpile_cache_tests.py
@@ -52,6 +52,7 @@ log = logging.getLogger(__name__)
class DogpileCacheTests(unittest.TestCase):
+ @pytest.mark.xfail(reason="Needs investigating")
def test_dogpile_cache(self) -> None:
"""
Test our extensions to dogpile.cache. | xfail dogpile cache tests for now |
diff --git a/src/Task/Common/DisplayException.php b/src/Task/Common/DisplayException.php
index <HASH>..<HASH> 100644
--- a/src/Task/Common/DisplayException.php
+++ b/src/Task/Common/DisplayException.php
@@ -24,7 +24,7 @@
$div->append(Tag::h2('File'), Tag::pre($exception->getFile())->append(':', $exception->getLine())->setSeparator(''));
// shorten Trace
- $trace = String::cast($exception->getTraceAsString())->replace(getcwd(), '');
+ $trace = String::cast($exception->getTraceAsString())->replace(getcwd() . '/', '');
$div->append(Tag::h2('Trace'), Tag::pre($trace)); | Remove leading '/' in relative paths of exception trace in DisplayException |
diff --git a/model/execution/Counter/DeliveryExecutionCounterService.php b/model/execution/Counter/DeliveryExecutionCounterService.php
index <HASH>..<HASH> 100644
--- a/model/execution/Counter/DeliveryExecutionCounterService.php
+++ b/model/execution/Counter/DeliveryExecutionCounterService.php
@@ -55,14 +55,15 @@ class DeliveryExecutionCounterService extends ConfigurableService implements Del
$toStatusKey = $this->getStatusKey($event->getState());
$persistence = $this->getPersistence();
- if ($this->count($event->getPreviousState()) > 0) {
+ if ($persistence->exists($fromStatusKey) && $persistence->get($fromStatusKey) > 0) {
$persistence->decr($fromStatusKey);
}
- if ($persistence->get($toStatusKey) === false) {
- $persistence->set($toStatusKey, 0);
+ if (!$persistence->exists($toStatusKey)) {
+ $persistence->set($toStatusKey, 1);
+ } else {
+ $persistence->incr($toStatusKey);
}
- $persistence->incr($toStatusKey);
}
/** | ckeck existence of key in KV storage in DeliveryExecutionCounterService |
diff --git a/lib/search_engine.py b/lib/search_engine.py
index <HASH>..<HASH> 100644
--- a/lib/search_engine.py
+++ b/lib/search_engine.py
@@ -2636,7 +2636,7 @@ def get_nearest_terms_in_bibrec(p, f, n_below, n_above):
col = 'modification_date'
res_above = run_sql("""SELECT DATE_FORMAT(%s,'%%%%Y-%%%%m-%%%%d %%%%H:%%%%i:%%%%s')
FROM bibrec WHERE %s < %%s
- ORDER BY %s ASC LIMIT %%s""" % (col, col, col),
+ ORDER BY %s DESC LIMIT %%s""" % (col, col, col),
(p, n_above))
res_below = run_sql("""SELECT DATE_FORMAT(%s,'%%%%Y-%%%%m-%%%%d %%%%H:%%%%i:%%%%s')
FROM bibrec WHERE %s > %%s
@@ -2647,7 +2647,9 @@ def get_nearest_terms_in_bibrec(p, f, n_below, n_above):
out.add(row[0])
for row in res_below:
out.add(row[0])
- return list(out)
+ out_list = list(out)
+ out_list.sort()
+ return list(out_list)
def get_nbhits_in_bibrec(term, f):
"""Return number of hits in bibrec table. term is usually a date, | WebSearch: fix nearest terms offer for date search
* Fix nearest terms offer for datecreated/datemodified searches.
(closes #<I>) |
diff --git a/docroot/modules/custom/ymca_camp_du_nord/modules/ymca_cdn_product/src/CdnPrsProductRepository.php b/docroot/modules/custom/ymca_camp_du_nord/modules/ymca_cdn_product/src/CdnPrsProductRepository.php
index <HASH>..<HASH> 100644
--- a/docroot/modules/custom/ymca_camp_du_nord/modules/ymca_cdn_product/src/CdnPrsProductRepository.php
+++ b/docroot/modules/custom/ymca_camp_du_nord/modules/ymca_cdn_product/src/CdnPrsProductRepository.php
@@ -109,6 +109,9 @@ class CdnPrsProductRepository implements CdnPrsProductRepositoryInterface {
'field_cdn_prd_id' => $product['ProductID'],
'field_cdn_prd_object' => serialize($product),
'field_cdn_prd_start_date' => $dateTime->format(DATETIME_DATETIME_STORAGE_FORMAT),
+ 'field_cdn_prd_cabin_id' => substr($product['ProductCode'], 6, 4),
+ 'field_cdn_prd_capacity' => abs(substr($product['ProductCode'], 11, 2)),
+ 'field_cdn_prd_cabin_number' => abs(substr($product['ProductCode'], 7, 4)),
];
foreach ($popsToSave as $fieldName => $fieldValue) { | [YTCD-6] Fill product fields while sync |
diff --git a/src/App.php b/src/App.php
index <HASH>..<HASH> 100644
--- a/src/App.php
+++ b/src/App.php
@@ -481,7 +481,7 @@ class App
if (!$this->html) {
throw new Exception(['App does not know how to add style']);
}
- $this->html->template->appendHTML('HEAD', $this->getTag('style', $style));
+ $this->html->template->appendHTML('HEAD', $this->getTag('style', null, $style, false));
}
/**
@@ -882,10 +882,11 @@ class App
* @param string|array $tag
* @param string $attr
* @param string|array $value
+ * @param bool $encodeValue
*
* @return string
*/
- public function getTag($tag = null, $attr = null, $value = null)
+ public function getTag($tag = null, $attr = null, $value = null, bool $encodeValue = true)
{
if ($tag === null) {
$tag = 'div';
@@ -928,7 +929,7 @@ class App
}
if (is_string($value)) {
- $value = $this->encodeHTML($value);
+ $value = $this->encodeHTML($encodeValue ? $value : strip_tags($value));
} elseif (is_array($value)) {
$result = [];
foreach ($value as $v) { | App::addStyle should not encode value (#<I>)
* fix #<I>
* as fallback use strip_tags anyway to avoid attacks |
diff --git a/eZ/Publish/Core/Repository/ObjectStateService.php b/eZ/Publish/Core/Repository/ObjectStateService.php
index <HASH>..<HASH> 100644
--- a/eZ/Publish/Core/Repository/ObjectStateService.php
+++ b/eZ/Publish/Core/Repository/ObjectStateService.php
@@ -440,7 +440,7 @@ class ObjectStateService implements ObjectStateServiceInterface
*/
public function setObjectState( ContentInfo $contentInfo, APIObjectStateGroup $objectStateGroup, APIObjectState $objectState )
{
- if ( $this->repository->hasAccess( 'state', 'assign' ) !== true )
+ if ( $this->repository->canUser( 'state', 'assign', $contentInfo, $objectState ) !== true )
throw new UnauthorizedException( 'state', 'assign' );
if ( !is_numeric( $contentInfo->id ) ) | Fixed: state/assign permission function has limitations |
diff --git a/src/test/java/picocli/CommandLineTest.java b/src/test/java/picocli/CommandLineTest.java
index <HASH>..<HASH> 100644
--- a/src/test/java/picocli/CommandLineTest.java
+++ b/src/test/java/picocli/CommandLineTest.java
@@ -2804,7 +2804,7 @@ public class CommandLineTest {
@Test
public void testAtFileSimplifiedWithQuotesTrimmed() {
- System.setProperty("picocli.useSimplifiedAtFiles", "true");
+ System.setProperty("picocli.useSimplifiedAtFiles", "");
System.setProperty("picocli.trimQuotes", "true");
class App {
@Option(names = "--quotedArg") | #<I> added Interpreter tests - simplified at files with empty sysprop |
diff --git a/lib/outputlib.php b/lib/outputlib.php
index <HASH>..<HASH> 100644
--- a/lib/outputlib.php
+++ b/lib/outputlib.php
@@ -1016,7 +1016,7 @@ class theme_config {
*/
public function post_process($css) {
// now resolve all image locations
- if (preg_match_all('/\[\[pix:([a-z_]+\|)?([^\]]+)\]\]/', $css, $matches, PREG_SET_ORDER)) {
+ if (preg_match_all('/\[\[pix:([a-z0-9_]+\|)?([^\]]+)\]\]/', $css, $matches, PREG_SET_ORDER)) {
$replaced = array();
foreach ($matches as $match) {
if (isset($replaced[$match[0]])) {
@@ -1033,7 +1033,7 @@ class theme_config {
}
// Now resolve all font locations.
- if (preg_match_all('/\[\[font:([a-z_]+\|)?([^\]]+)\]\]/', $css, $matches, PREG_SET_ORDER)) {
+ if (preg_match_all('/\[\[font:([a-z0-9_]+\|)?([^\]]+)\]\]/', $css, $matches, PREG_SET_ORDER)) {
$replaced = array();
foreach ($matches as $match) {
if (isset($replaced[$match[0]])) { | MDL-<I> allow numbers in components used in CSS placeholders |
diff --git a/lib/chef/resource/windows_firewall_rule.rb b/lib/chef/resource/windows_firewall_rule.rb
index <HASH>..<HASH> 100644
--- a/lib/chef/resource/windows_firewall_rule.rb
+++ b/lib/chef/resource/windows_firewall_rule.rb
@@ -43,11 +43,11 @@ class Chef
```ruby
windows_firewall_rule 'MyRule' do
- description "testing out remote address arrays"
+ description 'Testing out remote address arrays'
enabled false
local_port 1434
remote_address %w(10.17.3.101 172.7.7.53)
- protocol "TCP"
+ protocol 'TCP'
action :create
end
```
@@ -111,6 +111,7 @@ class Chef
description: "The local port the firewall rule applies to."
property :remote_address, [String, Array],
+ coerce: proc { |d| d.is_a?(String) ? d.split(/\s*,\s*/).sort : Array(d).sort.map(&:to_s) },
description: "The remote address(es) the firewall rule applies to."
property :remote_port, [String, Integer, Array], | Updated the firewall rule resource to allow for multiple remote addresses, updated the spec file to account for the change in data types |
diff --git a/benchexec/tablegenerator/__init__.py b/benchexec/tablegenerator/__init__.py
index <HASH>..<HASH> 100755
--- a/benchexec/tablegenerator/__init__.py
+++ b/benchexec/tablegenerator/__init__.py
@@ -972,9 +972,13 @@ def create_tables(name, runSetResults, filenames, rows, rowsDiff, outputPath, ou
# read template
Template = tempita.HTMLTemplate if format == 'html' else tempita.Template
- template = Template.from_filename(TEMPLATE_FILE_NAME.format(format=format),
- namespace=templateNamespace,
- encoding=TEMPLATE_ENCODING)
+ template_file = TEMPLATE_FILE_NAME.format(format=format)
+ try:
+ template_content = __loader__.get_data(template_file).decode(TEMPLATE_ENCODING)
+ except NameError:
+ with open(template_file, mode='r') as f:
+ template_content = f.read()
+ template = Template(template_content, namespace=templateNamespace)
# write file
with open(outfile, 'w') as file: | Let tablegenerator find its templates even when packaged inside an Egg. |
diff --git a/lib/recharge/http_request.rb b/lib/recharge/http_request.rb
index <HASH>..<HASH> 100644
--- a/lib/recharge/http_request.rb
+++ b/lib/recharge/http_request.rb
@@ -66,7 +66,8 @@ module Recharge
connection.start do |http|
res = http.request(req)
- data = res["Content-Type"] == "application/json" ? parse_json(res.body) : {}
+ # API returns 204 but content-type header is set to application/json so check body
+ data = res.body && res["Content-Type"] == "application/json" ? parse_json(res.body) : {}
data["meta"] = { "id" => res["X-Request-Id"], "limit" => res["X-Recharge-Limit"] }
return data if res.code[0] == "2" && !data["warning"] && !data["error"] | Don't parse <I>s even when content type is present |
diff --git a/test/test_persistence.py b/test/test_persistence.py
index <HASH>..<HASH> 100644
--- a/test/test_persistence.py
+++ b/test/test_persistence.py
@@ -249,7 +249,7 @@ class TableTestCase(unittest.TestCase):
tbl = self.tbl
tbl.create_column('foo', FLOAT)
assert 'foo' in tbl.table.c, tbl.table.c
- assert FLOAT == type(tbl.table.c['foo'].type), tbl.table.c['foo'].type
+ assert isinstance(tbl.table.c['foo'].type, FLOAT), tbl.table.c['foo'].type
assert 'foo' in tbl.columns, tbl.columns
def test_key_order(self): | Fix type comparison to isinstance check |
diff --git a/test/validators.js b/test/validators.js
index <HASH>..<HASH> 100644
--- a/test/validators.js
+++ b/test/validators.js
@@ -1,4 +1,4 @@
-var validator = require('../index'),
+var validator = require('../index'),
format = require('util').format,
assert = require('assert'),
path = require('path'), | Remove U+FEFF from the begin of file.
orz |
diff --git a/lib/icedfrisby.js b/lib/icedfrisby.js
index <HASH>..<HASH> 100644
--- a/lib/icedfrisby.js
+++ b/lib/icedfrisby.js
@@ -801,6 +801,8 @@ Frisby.prototype.toss = function(retry) {
failedCount: 0
};
+ it.request = self.current.outgoing;
+
// launch request
// repeat request for self.current.retry times if request does not respond with self._timeout ms (except for POST requests)
var tries = 0;
@@ -850,6 +852,7 @@ Frisby.prototype.toss = function(retry) {
// called from makeRequest if request has finished successfully
function assert() {
var i;
+ it.response = self.current.response;
self.current.expectsFailed = true;
// if you have no expects, they can't fail | Add contextual information to be used in mocha reporters |
diff --git a/compliance/autobahn/server.py b/compliance/autobahn/server.py
index <HASH>..<HASH> 100644
--- a/compliance/autobahn/server.py
+++ b/compliance/autobahn/server.py
@@ -22,6 +22,11 @@ class App:
'bytes': event['bytes'],
'text': event['text'],
})
+ elif event['type'] == 'lifespan.startup':
+ await send({'type': 'lifespan.startup.complete'})
+ elif event['type'] == 'lifespan.shutdown':
+ await send({'type': 'lifespan.shutdown.complete'})
+ break
if __name__ == '__main__':
diff --git a/compliance/h2spec/server.py b/compliance/h2spec/server.py
index <HASH>..<HASH> 100644
--- a/compliance/h2spec/server.py
+++ b/compliance/h2spec/server.py
@@ -17,6 +17,11 @@ class App:
elif event['type'] == 'http.request' and not event.get('more_body', False):
await self.send_data(send)
break
+ elif event['type'] == 'lifespan.startup':
+ await send({'type': 'lifespan.startup.complete'})
+ elif event['type'] == 'lifespan.shutdown':
+ await send({'type': 'lifespan.shutdown.complete'})
+ break
async def send_data(self, send):
await send({ | Bugfix support the lifespan protocol in the compliance servers
This allows the compliance tests to proceed, and ideally pass... |
diff --git a/duke-core/src/main/java/no/priv/garshol/duke/CompactRecord.java b/duke-core/src/main/java/no/priv/garshol/duke/CompactRecord.java
index <HASH>..<HASH> 100644
--- a/duke-core/src/main/java/no/priv/garshol/duke/CompactRecord.java
+++ b/duke-core/src/main/java/no/priv/garshol/duke/CompactRecord.java
@@ -1,10 +1,10 @@
package no.priv.garshol.duke;
+import java.util.Arrays;
import java.util.HashSet;
import java.util.ArrayList;
import java.util.Collection;
-
import java.io.Serializable;
/**
@@ -73,4 +73,14 @@ public class CompactRecord implements ModifiableRecord, Serializable {
public String[] getArray() {
return s;
}
+
+ public String toString() {
+ StringBuilder builder = new StringBuilder("{");
+ for (int ix = 0; ix < free; ix += 2) {
+ if (ix > 0) builder.append(", ");
+ builder.append(s[ix]).append("=[").append(s[ix + 1]).append(']');
+ }
+ builder.append("}");
+ return "[CompactRecord " + builder + "]";
+ }
}
\ No newline at end of file | minor: added toString() method to CompactRecord |
diff --git a/src/createApp.js b/src/createApp.js
index <HASH>..<HASH> 100644
--- a/src/createApp.js
+++ b/src/createApp.js
@@ -53,11 +53,7 @@ function createApp (views) {
var view = views[key];
if (!view) return this.getViewNotFound();
- var givenProps = this.state[key + '_props'];
- var props = xtend({
- key: key,
- app: this
- }, givenProps);
+ var props = xtend({ key: key, app: this }, this.state.currentViewProps);
if (this.getViewProps) {
xtend(props, this.getViewProps());
@@ -96,12 +92,11 @@ function createApp (views) {
var newState = {
currentView: key,
+ currentViewProps: props || {},
previousView: this.state.currentView,
viewTransition: this.getCSSTransition(transition)
};
- newState[key + '_props'] = props || {};
-
xtend(newState, state);
this.setState(newState); | createApp: don't store view props longer than necessary |
diff --git a/.importjs.js b/.importjs.js
index <HASH>..<HASH> 100644
--- a/.importjs.js
+++ b/.importjs.js
@@ -1,6 +1,7 @@
module.exports = {
environments: ['node'],
ignorePackagePrefixes: ['lodash.'],
+ declarationKeyword: 'import',
logLevel: 'debug',
excludes: [
'./build/**', | Use `declarationKeyword: 'import'` locally
With version <I> of import-js, node projects now get `const` as the
default declarationKeyword. We use babel here, so we don't want the
default. |
diff --git a/tests/test_channels.py b/tests/test_channels.py
index <HASH>..<HASH> 100644
--- a/tests/test_channels.py
+++ b/tests/test_channels.py
@@ -161,3 +161,28 @@ class BufferedChannelTests(BaseTests, ChanTestMixin):
self.assertEqual(markers, [1])
chan.send(2)
self.assertEqual(markers, [1, 2])
+
+
+class BackendChannelSenderReceiverPriorityTest(BaseTests):
+ """
+ Tests if the current backend channel implementation has the correct
+ sender/receiver priority (aka preference in stackless).
+ Current implementations of goless channels depend on receiver having the execution priotity!
+ """
+
+ def test_be_has_correct_sender_receiver_priority(self):
+ c = be.channel()
+ r = []
+ def do_send():
+ r.append("s1")
+ c.send(None)
+ r.append("s2")
+ def do_receive():
+ r.append("r1")
+ c.receive()
+ r.append("r2")
+
+ be.run(do_receive)
+ be.run(do_send)
+ be.yield_()
+ self.assertEqual(["r1", "s1", "r2", "s2"], r)
\ No newline at end of file | New test to check for the correct backend channel sender/receiver priority |
diff --git a/coursera/coursera_dl.py b/coursera/coursera_dl.py
index <HASH>..<HASH> 100755
--- a/coursera/coursera_dl.py
+++ b/coursera/coursera_dl.py
@@ -396,6 +396,7 @@ def download_lectures(wget_bin,
lecture_filter=None,
path='',
verbose_dirs=False,
+ hooks=[]
):
"""
Downloads lecture resources described by sections.
@@ -440,6 +441,8 @@ def download_lectures(wget_bin,
open(lecfn, 'w').close() # touch
else:
logging.info('%s already downloaded', lecfn)
+ for hook in hooks:
+ os.system("cd \"%s\"; %s" % (sec, hook))
def download_file(url,
@@ -701,6 +704,11 @@ def parseArgs():
action='store_true',
default=False,
help='download sections in reverse order')
+ parser.add_argument('--hook',
+ dest='hooks',
+ action='append',
+ default=[],
+ help='hooks to run when finished')
args = parser.parse_args()
@@ -771,6 +779,7 @@ def download_class(args, class_name):
args.lecture_filter,
args.path,
args.verbose_dirs,
+ args.hooks
)
if not args.cookies_file: | Added hooks for post-processing |
diff --git a/safesql.go b/safesql.go
index <HASH>..<HASH> 100644
--- a/safesql.go
+++ b/safesql.go
@@ -43,7 +43,7 @@ func main() {
os.Exit(2)
}
s := ssautil.CreateProgram(p, 0)
- s.BuildAll()
+ s.Build()
qms := FindQueryMethods(p.Package("database/sql").Pkg, s)
if verbose { | Update usage of go tools ssa
In particular, use Build, renamed from BuildAll in
golang/tools@afcda<I>b<I>c7af<I>a<I>f0b6bdb9c<I>a<I> |
diff --git a/elasticsearch/connection/http_urllib3.py b/elasticsearch/connection/http_urllib3.py
index <HASH>..<HASH> 100644
--- a/elasticsearch/connection/http_urllib3.py
+++ b/elasticsearch/connection/http_urllib3.py
@@ -50,13 +50,17 @@ class Urllib3HttpConnection(Connection):
ssl_assert_fingerprint=None, maxsize=10, headers=None, **kwargs):
super(Urllib3HttpConnection, self).__init__(host=host, port=port, use_ssl=use_ssl, **kwargs)
- self.headers = headers.copy() if headers else {}
- self.headers.update(urllib3.make_headers(keep_alive=True))
+ self.headers = urllib3.make_headers(keep_alive=True)
if http_auth is not None:
if isinstance(http_auth, (tuple, list)):
http_auth = ':'.join(http_auth)
self.headers.update(urllib3.make_headers(basic_auth=http_auth))
+ # update headers in lowercase to allow overriding of auth headers
+ if headers:
+ for k in headers:
+ self.headers[k.lower()] = headers[k]
+
ca_certs = CA_CERTS if ca_certs is None else ca_certs
pool_class = urllib3.HTTPConnectionPool
kw = {} | update headers in lowercase to allow overriding of auth headers |
diff --git a/spec/Suite/Http/ResponseSpec.php b/spec/Suite/Http/ResponseSpec.php
index <HASH>..<HASH> 100644
--- a/spec/Suite/Http/ResponseSpec.php
+++ b/spec/Suite/Http/ResponseSpec.php
@@ -250,6 +250,10 @@ EOD;
it("creates a response with some set-cookies", function() {
+ Monkey::patch('time', function() {
+ return strtotime('24 Dec 2015');
+ });
+
$message = join("\r\n", [
'HTTP/1.1 200 OK',
'Connection: close', | Fixes a spec depending on a timestamp. |
diff --git a/rest_framework_swagger/views.py b/rest_framework_swagger/views.py
index <HASH>..<HASH> 100644
--- a/rest_framework_swagger/views.py
+++ b/rest_framework_swagger/views.py
@@ -92,19 +92,12 @@ class SwaggerResourcesView(APIDocView):
'basePath': self.host.rstrip('/'),
'apis': apis,
'info': SWAGGER_SETTINGS.get('info', {
- 'contact': 'apiteam@wordnik.com',
- 'description': 'This is a sample server Petstore server. '
- 'You can find out more about Swagger at '
- '<a href="http://swagger.wordnik.com">'
- 'http://swagger.wordnik.com</a> '
- 'or on irc.freenode.net, #swagger. '
- 'For this sample, you can use the api key '
- '"special-key" to test '
- 'the authorization filters',
- 'license': 'Apache 2.0',
- 'licenseUrl': 'http://www.apache.org/licenses/LICENSE-2.0.html',
- 'termsOfServiceUrl': 'http://helloreverb.com/terms/',
- 'title': 'Swagger Sample App',
+ 'contact': '',
+ 'description': '',
+ 'license': '',
+ 'licenseUrl': '',
+ 'termsOfServiceUrl': '',
+ 'title': '',
}),
}) | Default to empty strings instead of Petstore example for backwards compatibility.
The title and description are "required", so we should probably provide them instead of an empty dictionary as suggested earlier.
Thanks @ariovistus
<URL> |
diff --git a/wdiffhtml/__init__.py b/wdiffhtml/__init__.py
index <HASH>..<HASH> 100644
--- a/wdiffhtml/__init__.py
+++ b/wdiffhtml/__init__.py
@@ -46,7 +46,7 @@ def wdiff(settings, wrap_with_html=False, fold_breaks=False):
`<br />` tags.
"""
- diff = generate_wdiff(settings.org_file, settings.new_file)
+ diff = generate_wdiff(settings.org_file, settings.new_file, fold_breaks)
if wrap_with_html:
return wrap_content(diff, settings, fold_breaks)
else: | fix: `generate_wdiff` call |
diff --git a/src/python/dxpy/exceptions.py b/src/python/dxpy/exceptions.py
index <HASH>..<HASH> 100644
--- a/src/python/dxpy/exceptions.py
+++ b/src/python/dxpy/exceptions.py
@@ -45,7 +45,11 @@ class DXJobFailureError(DXError):
'''Exception produced by :class:`dxpy.bindings.dxjob.DXJob` when a job fails.'''
pass
-class AppError(DXError):
+class ProgramError(DXError):
+ '''Deprecated. Use :class:`AppError` instead.'''
+ pass
+
+class AppError(ProgramError):
'''
Base class for fatal exceptions to be raised while using :mod:`dxpy` inside
DNAnexus execution containers.
@@ -58,10 +62,6 @@ class AppError(DXError):
'''
pass
-class ProgramError(AppError):
- '''Deprecated. Use :class:`AppError` instead.'''
- pass
-
class AppInternalError(DXError):
'''
Base class for fatal exceptions to be raised while using :mod:`dxpy` inside | Reverse dependency order of AppError-ProgramError
Make AppError temporarily depend on (deprecated) ProgramError to work around try..catch logic in python<I>_template that was not updated and tries to catch ProgramError. This results in apps that use the old template with AppError throwing AppInternalError instead. |
diff --git a/utils/compiler/src/Command/DowngradePathsCommand.php b/utils/compiler/src/Command/DowngradePathsCommand.php
index <HASH>..<HASH> 100644
--- a/utils/compiler/src/Command/DowngradePathsCommand.php
+++ b/utils/compiler/src/Command/DowngradePathsCommand.php
@@ -59,8 +59,8 @@ final class DowngradePathsCommand extends Command
$downgradePaths = array_merge([
// must be separated to cover container get() trait + psr container contract get()
- 'vendor/symfony/dependency-injection vendor/symfony/service-contracts vendor/psr/container',
- 'vendor/symplify vendor/symfony vendor/nikic vendor/psr bin src packages rector.php',
+ 'vendor/symfony vendor/psr',
+ 'vendor/symplify vendor/nikic bin src packages rector.php',
], $downgradePaths);
$downgradePaths = array_values($downgradePaths); | [prefixed] re-order paths |
diff --git a/cli/api/daemon.go b/cli/api/daemon.go
index <HASH>..<HASH> 100644
--- a/cli/api/daemon.go
+++ b/cli/api/daemon.go
@@ -843,7 +843,7 @@ func (d *daemon) startAgent() error {
err = masterClient.UpdateHost(updatedHost)
if err != nil {
log.WithError(err).Warn("Unable to update master with delegate host information. Retrying silently")
- go func(masterClient *master.Client, updatedHost host.Host) {
+ go func(masterClient *master.Client, myHost *host.Host) {
err := errors.New("")
for err != nil {
select {
@@ -852,10 +852,13 @@ func (d *daemon) startAgent() error {
default:
time.Sleep(5 * time.Second)
}
- err = masterClient.UpdateHost(updatedHost)
+ updatedHost, err = host.UpdateHostInfo(*myHost)
+ if err == nil {
+ err = masterClient.UpdateHost(updatedHost)
+ }
}
log.Info("Updated master with delegate host information")
- }(masterClient, updatedHost)
+ }(masterClient, myHost)
}
return poolID
}() | pull the latest host object into retry loop |
diff --git a/heron/tools/ui/src/python/handlers/topology.py b/heron/tools/ui/src/python/handlers/topology.py
index <HASH>..<HASH> 100644
--- a/heron/tools/ui/src/python/handlers/topology.py
+++ b/heron/tools/ui/src/python/handlers/topology.py
@@ -260,9 +260,6 @@ class ContainerFileDownloadHandler(base.BaseHandler):
def initialize(self, baseUrl):
self.baseUrl = baseUrl
- def initialize(self, baseUrl):
- self.baseUrl = baseUrl
-
@tornado.gen.coroutine
def get(self, cluster, environ, topology, container):
''' | Remove extra initialize method from ContainerFileDownloadHandler. (#<I>) |
diff --git a/bin/runner.js b/bin/runner.js
index <HASH>..<HASH> 100755
--- a/bin/runner.js
+++ b/bin/runner.js
@@ -136,7 +136,7 @@ function launchBrowser(browser, url) {
});
}
-function launchBrowsers(config, browser) {
+var launchBrowsers = function(config, browser) {
setTimeout(function () {
if(Object.prototype.toString.call(config.test_path) === '[object Array]'){
config.test_path.forEach(function(path){ | minor fix, 1 more ogging |
diff --git a/core/runtime.js b/core/runtime.js
index <HASH>..<HASH> 100644
--- a/core/runtime.js
+++ b/core/runtime.js
@@ -195,9 +195,11 @@ var boot_class = function(superklass, constructor) {
ctor.prototype = superklass.prototype;
constructor.prototype = new ctor();
+ var prototype = constructor.prototype;
- constructor.prototype._klass = constructor;
- constructor.prototype._real = constructor;
+ prototype._klass = constructor;
+ prototype._real = constructor;
+ prototype.constructor = constructor;
constructor._included_in = [];
constructor._isClass = true; | Make sure class prototypes have the right constructor |
diff --git a/src/Controller/SavedSearchesController.php b/src/Controller/SavedSearchesController.php
index <HASH>..<HASH> 100644
--- a/src/Controller/SavedSearchesController.php
+++ b/src/Controller/SavedSearchesController.php
@@ -33,6 +33,7 @@ class SavedSearchesController extends AppController
$query = $this->SavedSearches->find('all')
->where(['name IS NOT' => null])
+ ->where(['name !=' => ''])
->where($this->request->getQueryParams());
$entities = $this->paginate($query); | Exclude saved searches with empty name (task #<I>) |
diff --git a/gruntfile.js b/gruntfile.js
index <HASH>..<HASH> 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -16,8 +16,7 @@ module.exports = function(grunt) {
jshint: {
all: [
'Gruntfile.js',
- 'tasks/*.js',
- '<%= nodeunit.tests %>'
+ 'tasks/*.js'
],
options: {
jshintrc: '.jshintrc' | chore: Remoe bad jshint files |
diff --git a/python/rosette/api.py b/python/rosette/api.py
index <HASH>..<HASH> 100644
--- a/python/rosette/api.py
+++ b/python/rosette/api.py
@@ -16,7 +16,6 @@ with `restricted rights' as those terms are defined in DAR and ASPR
_ACCEPTABLE_SERVER_VERSION = "0.5"
_GZIP_KEY = [0x1F, 0x8b, 0x08]
N_RETRIES = 3
-RETRY_DELAY = 5
import sys
_IsPy3 = sys.version_info[0] == 3 | RCB-<I> Remove dead line |
diff --git a/atomic_reactor/utils/retries.py b/atomic_reactor/utils/retries.py
index <HASH>..<HASH> 100644
--- a/atomic_reactor/utils/retries.py
+++ b/atomic_reactor/utils/retries.py
@@ -50,7 +50,10 @@ def hook_log_error_response_content(response, *args, **kwargs):
:type response: requests.Response
"""
if 400 <= response.status_code <= 599:
- logger.error('Error response from %s: %s', response.url, response.content)
+ logger.debug(
+ 'HTTP %d response from %s: %s',
+ response.status_code, response.url, response.content
+ )
def get_retrying_requests_session(client_statuses=HTTP_CLIENT_STATUS_RETRY,
diff --git a/tests/utils/test_retries.py b/tests/utils/test_retries.py
index <HASH>..<HASH> 100644
--- a/tests/utils/test_retries.py
+++ b/tests/utils/test_retries.py
@@ -84,7 +84,7 @@ def test_log_error_response(http_code, caplog):
session.get(api_url)
content = json.dumps(json_data).encode()
- expected = f"Error response from {api_url}: {content}"
+ expected = f"HTTP {http_code} response from {api_url}: {content}"
if 400 <= http_code <= 599:
assert expected in caplog.text
else: | Do not log error responses from retries as errors
Sometimes error code is expected and shouldn't be treated as error. In
fact everything logged from retries should be just DEBUG.
Many errors in logs scary users.
Removing "Error" from log string and replacing it with http status code.
CLOUDBLD-<I> |
diff --git a/issue.py b/issue.py
index <HASH>..<HASH> 100755
--- a/issue.py
+++ b/issue.py
@@ -65,7 +65,9 @@ def list_issues(flags, tag):
print(str(issue["number"]).ljust(lens["number"] + padding), end='')
print(issue["tag"].ljust(lens["tag"] + padding), end='')
print(issue["date"].ljust(lens["date"] + padding), end='')
- print(issue["description"].ljust(lens["description"] + padding), end='')
+ desc = issue["description"].ljust(lens["description"])
+ desc = desc.splitlines()[0]
+ print(desc, end='')
print()
def edit_issue(number, message="", tag="", close=False, reopen=False): | Only print first line of each issue on issue listing |
diff --git a/src/Resource/Sync/Repository.php b/src/Resource/Sync/Repository.php
index <HASH>..<HASH> 100644
--- a/src/Resource/Sync/Repository.php
+++ b/src/Resource/Sync/Repository.php
@@ -27,6 +27,11 @@ class Repository extends BaseRepository
return $this->wait($this->observableToPromise($this->callAsync('commits')->toArray()));
}
+ public function isActive(): bool
+ {
+ return $this->wait($this->callAsync('isActive'));
+ }
+
public function enable(): Repository
{
return $this->wait($this->callAsync('enable')); | Added isActive method to sync repo |
diff --git a/torf/_magnet.py b/torf/_magnet.py
index <HASH>..<HASH> 100644
--- a/torf/_magnet.py
+++ b/torf/_magnet.py
@@ -45,6 +45,7 @@ class Magnet():
| https://en.wikipedia.org/wiki/Magnet_URL
| http://magnet-uri.sourceforge.net/magnet-draft-overview.txt
| https://wiki.theory.org/index.php/BitTorrent_Magnet-URI_Webseeding
+ | http://shareaza.sourceforge.net/mediawiki/index.php/Magnet_URI_scheme
"""
_INFOHASH_REGEX = re.compile(r'^[0-9a-f]{40}|[a-z2-7]{32}$', flags=re.IGNORECASE) | Magnet: Add reference to docstring |
diff --git a/src/EventExport/Format/HTML/PDFWebArchiveFileWriter.php b/src/EventExport/Format/HTML/PDFWebArchiveFileWriter.php
index <HASH>..<HASH> 100644
--- a/src/EventExport/Format/HTML/PDFWebArchiveFileWriter.php
+++ b/src/EventExport/Format/HTML/PDFWebArchiveFileWriter.php
@@ -34,7 +34,13 @@ class PDFWebArchiveFileWriter extends WebArchiveFileWriter
$originDirectory = $this->createWebArchiveDirectory($events);
$originFile = $this->expandTmpPath($originDirectory) . '/index.html';
- $this->prince->convert_file_to_file($originFile, $filePath);
+ $messages = array();
+ $result = $this->prince->convert_file_to_file($originFile, $filePath, $messages);
+
+ if (!$result) {
+ $message = implode(PHP_EOL, $messages);
+ throw new \RuntimeException($message);
+ }
$this->removeTemporaryArchiveDirectory($originDirectory);
} | III-<I>: Rudimentary error handling when converting to PDF. |
diff --git a/test/type.js b/test/type.js
index <HASH>..<HASH> 100644
--- a/test/type.js
+++ b/test/type.js
@@ -12,7 +12,7 @@ describe('type', function() {
, ['undefined', void 0]
].forEach(function(test) {
describe('when called with ' + test[1], function() {
- it('should return `' + test[0] + '`', function() {
+ it('should return \'' + test[0] + '\'', function() {
expect(type(test[1])).to.equal(test[0])
})
}) | Changed from backticks to single quote |
diff --git a/test/endtoend/create-react-app/test.js b/test/endtoend/create-react-app/test.js
index <HASH>..<HASH> 100644
--- a/test/endtoend/create-react-app/test.js
+++ b/test/endtoend/create-react-app/test.js
@@ -34,20 +34,20 @@ describe('React: Dashboard', () => {
// close
browser.click('#inline-dashboard-toggle')
- browser.pause(50)
+ browser.pause(250)
// open
browser.click('#inline-dashboard-toggle')
- browser.pause(50)
+ browser.pause(250)
// close
browser.click('#inline-dashboard-toggle')
- browser.pause(50)
+ browser.pause(250)
// open
browser.click('#inline-dashboard-toggle')
- browser.pause(50)
+ browser.pause(250)
// open GDrive panel
browser.click('.uppy-DashboardTab:nth-child(2) button')
- browser.pause(50)
+ browser.pause(500)
// side effecting property access, not a function!
// eslint-disable-next-line no-unused-expressions | Wait a bit longer between dashboard toggling |
diff --git a/src/tests/acceptance/AdminCest.php b/src/tests/acceptance/AdminCest.php
index <HASH>..<HASH> 100644
--- a/src/tests/acceptance/AdminCest.php
+++ b/src/tests/acceptance/AdminCest.php
@@ -20,7 +20,8 @@ class AdminCest extends BaseAcceptance {
public function tryToGotoAdminIndex(AcceptanceTester $I) {
$I->amOnPage ( "/Admin/index" );
$I->seeInCurrentUrl ( "Admin/index" );
- $I->see ( 'Used to perform CRUD operations on data', [ 'css' => 'body' ] );
+ $this->waitAndclick ( $I, '#validate-btn' );
+ $I->waitForText ( 'Used to perform CRUD operations on data', [ 'css' => 'body' ] );
}
private function gotoAdminModule(string $url, AcceptanceTester $I) { | [ci-tests] fix config not created pb |
diff --git a/core/src/main/java/org/springframework/ldap/pool/factory/PoolingContextSource.java b/core/src/main/java/org/springframework/ldap/pool/factory/PoolingContextSource.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/org/springframework/ldap/pool/factory/PoolingContextSource.java
+++ b/core/src/main/java/org/springframework/ldap/pool/factory/PoolingContextSource.java
@@ -138,7 +138,6 @@ import org.springframework.ldap.pool.validation.DirContextValidator;
* </tr>
* </table>
*
- *
* @author Eric Dalquist
*/
public class PoolingContextSource implements ContextSource, DisposableBean {
@@ -363,7 +362,7 @@ public class PoolingContextSource implements ContextSource, DisposableBean {
/**
* @param contextSource the contextSource to set
- * @Required
+ * Required
*/
public void setContextSource(ContextSource contextSource) {
this.dirContextPoolableObjectFactory.setContextSource(contextSource);
@@ -371,7 +370,7 @@ public class PoolingContextSource implements ContextSource, DisposableBean {
/**
* @param dirContextValidator the dirContextValidator to set
- * @Required
+ * Required
*/
public void setDirContextValidator(DirContextValidator dirContextValidator) {
this.dirContextPoolableObjectFactory.setDirContextValidator(dirContextValidator); | Got rid of javadoc warning. |
diff --git a/src/Element.php b/src/Element.php
index <HASH>..<HASH> 100644
--- a/src/Element.php
+++ b/src/Element.php
@@ -33,6 +33,8 @@ use DOMElement;
class Element extends DOMElement implements PropertyAttribute {
use LiveProperty, NonDocumentTypeChildNode, ChildNode, ParentNode;
+ const VALUE_ELEMENTS = ["BUTTON", "INPUT", "METER", "OPTION", "PROGRESS", "PARAM"];
+
/** @var TokenList */
protected $liveProperty_classList;
/** @var StringMap */
@@ -121,14 +123,20 @@ class Element extends DOMElement implements PropertyAttribute {
return $this->$methodName();
}
- return $this->getAttribute("value");
+ if(in_array(strtoupper($this->tagName), self::VALUE_ELEMENTS)) {
+ return $this->nodeValue;
+ }
+
+ return null;
}
public function prop_set_value(string $newValue) {
- $methodName = 'value_set_' . strtolower($this->tagName);
+ $methodName = 'value_set_' . $this->tagName;
if(method_exists($this, $methodName)) {
return $this->$methodName($newValue);
}
+
+ $this->nodeValue = $newValue;
}
public function prop_get_id():?string { | Default value getter/setter property (#<I>)
* Provide mechanism for getting/setting default Element value property
* Only set value attribute for whitelist of element types |
diff --git a/controls/js/src/kirki.js b/controls/js/src/kirki.js
index <HASH>..<HASH> 100644
--- a/controls/js/src/kirki.js
+++ b/controls/js/src/kirki.js
@@ -49,7 +49,7 @@ var kirki = {
'data-palette': control.params.palette,
'data-default-color': control.params['default'],
'data-alpha': control.params.choices.alpha,
- value: control.setting._value
+ value: kirki.setting.get( control.id )
} ) );
}
},
@@ -96,7 +96,7 @@ var kirki = {
'data-id': control.id,
inputAttrs: control.params.inputAttrs,
choices: control.params.choices,
- value: control.setting._value
+ value: kirki.setting.get( control.id )
};
if ( ! _.isUndefined( control.params ) && ! _.isUndefined( control.params.choices ) && ! _.isUndefined( control.params.choices.element ) && 'textarea' === control.params.choices.element ) { | Use kirki.setting.get() method |
diff --git a/lib/app.js b/lib/app.js
index <HASH>..<HASH> 100644
--- a/lib/app.js
+++ b/lib/app.js
@@ -87,7 +87,7 @@ var makeApp = function(configBase, callback) {
res: Logger.stdSerializers.res,
err: function(err) {
var obj = Logger.stdSerializers.err(err);
- // only show properties without an initial lodash
+ // only show properties without an initial underscore
return _.pickBy(obj, _.filter(_.keys(obj), function(key) { return key[0] !== "_"; }));
},
principal: function(principal) { | Fix accidental commnt rewrite |
diff --git a/spec/em/em_spec.rb b/spec/em/em_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/em/em_spec.rb
+++ b/spec/em/em_spec.rb
@@ -121,13 +121,13 @@ begin
callbacks_run << :errback
end
EM.add_timer(0.1) do
+ callbacks_run.should == [:callback]
lambda {
client.close
}.should_not raise_error(/invalid binding to detach/)
EM.stop_event_loop
end
end
- callbacks_run.should == [:callback]
end
end
rescue LoadError | match callbacks_run inside event loop |
diff --git a/lib/reporters/markdown.js b/lib/reporters/markdown.js
index <HASH>..<HASH> 100644
--- a/lib/reporters/markdown.js
+++ b/lib/reporters/markdown.js
@@ -23,7 +23,6 @@ function Markdown(runner) {
var self = this
, stats = this.stats
- , total = runner.total
, level = 0
, buf = ''; | Remove dead code
total variable in markdown wasn't ever used |
diff --git a/spec/mongo/server/monitor_spec.rb b/spec/mongo/server/monitor_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/mongo/server/monitor_spec.rb
+++ b/spec/mongo/server/monitor_spec.rb
@@ -22,7 +22,7 @@ describe Mongo::Server::Monitor do
start = Time.now
monitor.scan!
monitor.scan!
- expect(Time.now - start).to be > 0.5
+ expect(Time.now - start).to be >= 0.5
end
end | Scans are throttled to exactly <I>ms on JRuby sometimes |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.