diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/lib/instana/version.rb b/lib/instana/version.rb
index <HASH>..<HASH> 100644
--- a/lib/instana/version.rb
+++ b/lib/instana/version.rb
@@ -1,4 +1,4 @@
module Instana
- VERSION = "1.11.0"
+ VERSION = "1.11.1"
VERSION_FULL = "instana-#{VERSION}"
end
|
Bump gem version to <I>
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -2,6 +2,7 @@
from setuptools import setup
setup(name='servicemanager',
+ python_requires='>2.7.13',
version='1.2.0',
description='A python tool to manage developing and testing with lots of microservices',
url='https://github.com/hmrc/service-manager',
|
Update setup.py
Set the minimum python version
|
diff --git a/lib/reterm/layout.rb b/lib/reterm/layout.rb
index <HASH>..<HASH> 100644
--- a/lib/reterm/layout.rb
+++ b/lib/reterm/layout.rb
@@ -110,8 +110,8 @@ module RETerm
if h.key?(:component)
c = h[:component]
- h.merge! :rows => c.requested_rows + c.extra_padding,
- :cols => c.requested_cols + c.extra_padding
+ h = {:rows => c.requested_rows + c.extra_padding,
+ :cols => c.requested_cols + c.extra_padding}.merge(h)
end
raise ArgumentError, "must specify x/y" unless h.key?(:x) &&
|
Merge layout params into default hash, allowing user to always explicitly set rows/cols
|
diff --git a/action/Request.php b/action/Request.php
index <HASH>..<HASH> 100644
--- a/action/Request.php
+++ b/action/Request.php
@@ -161,11 +161,9 @@ class Request extends \lithium\net\http\Request {
if (isset($this->_config['url'])) {
$this->url = rtrim($this->_config['url'], '/');
- } elseif (!empty($_GET['url']) ) {
+ } elseif (isset($_GET['url'])) {
$this->url = rtrim($_GET['url'], '/');
unset($_GET['url']);
- } elseif (isset($_SERVER['REQUEST_URI']) && strlen(trim($_SERVER['REQUEST_URI'])) > 0) {
- $this->url = parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH);
}
if (!empty($this->_config['query'])) {
$this->query = $this->_config['query'];
|
Rolling back extra nginx support that breaks subdirectory installs under non-nginx servers in `\action\Request`.
|
diff --git a/app/controllers/socializer/notifications_controller.rb b/app/controllers/socializer/notifications_controller.rb
index <HASH>..<HASH> 100644
--- a/app/controllers/socializer/notifications_controller.rb
+++ b/app/controllers/socializer/notifications_controller.rb
@@ -25,6 +25,5 @@ module Socializer
current_user.activity_object.save!
end
end
-
end
end
diff --git a/app/models/socializer/notification.rb b/app/models/socializer/notification.rb
index <HASH>..<HASH> 100644
--- a/app/models/socializer/notification.rb
+++ b/app/models/socializer/notification.rb
@@ -12,6 +12,5 @@ module Socializer
# Validations
validates_presence_of :activity_id
validates_presence_of :activity_object_id
-
end
end
|
Extra empty line detected at body end.
|
diff --git a/dvc/__init__.py b/dvc/__init__.py
index <HASH>..<HASH> 100644
--- a/dvc/__init__.py
+++ b/dvc/__init__.py
@@ -5,7 +5,7 @@ Make your data science projects reproducible and shareable.
"""
import os
-VERSION_BASE = '0.15.3'
+VERSION_BASE = '0.16.0'
__version__ = VERSION_BASE
PACKAGEPATH = os.path.abspath(os.path.dirname(__file__))
|
dvc: bump to <I>
|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index <HASH>..<HASH> 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -67,3 +67,9 @@ def inspect_source(cop, file, source)
ast, tokens = Rubocop::CLI.rip_source(source.join("\n"))
cop.inspect(file, source, tokens, ast)
end
+
+class Rubocop::Cop::Cop
+ def messages
+ offences.map(&:message)
+ end
+end
|
Add messages method to Cop in specs only
|
diff --git a/pandas/tests/reshape/merge/test_multi.py b/pandas/tests/reshape/merge/test_multi.py
index <HASH>..<HASH> 100644
--- a/pandas/tests/reshape/merge/test_multi.py
+++ b/pandas/tests/reshape/merge/test_multi.py
@@ -195,6 +195,27 @@ class TestMergeMulti:
tm.assert_frame_equal(merged_left_right, merge_right_left)
+ def test_merge_multiple_cols_with_mixed_cols_index(self):
+ # GH29522
+ s = pd.Series(
+ range(6),
+ pd.MultiIndex.from_product([["A", "B"], [1, 2, 3]], names=["lev1", "lev2"]),
+ name="Amount",
+ )
+ df = pd.DataFrame(
+ {"lev1": list("AAABBB"), "lev2": [1, 2, 3, 1, 2, 3], "col": 0}
+ )
+ result = pd.merge(df, s.reset_index(), on=["lev1", "lev2"])
+ expected = pd.DataFrame(
+ {
+ "lev1": list("AAABBB"),
+ "lev2": [1, 2, 3, 1, 2, 3],
+ "col": [0] * 6,
+ "Amount": range(6),
+ }
+ )
+ tm.assert_frame_equal(result, expected)
+
def test_compress_group_combinations(self):
# ~ 40000000 possible unique groups
|
TST: Merge multiple cols with mixed columns/index (#<I>)
|
diff --git a/labsuite/engine/context.py b/labsuite/engine/context.py
index <HASH>..<HASH> 100644
--- a/labsuite/engine/context.py
+++ b/labsuite/engine/context.py
@@ -25,10 +25,6 @@ class Context():
Traverses through child components until it finds something that
has the same method name, then passes the arguments and returns
the response.
-
- This essentially provides full machine-level permissions to anyone
- with web console access. Fine for now because this runs on a local
- server hosted on the robot.
"""
deck_method = getattr(self.deck, method, None)
if callable(deck_method):
|
Context: Well, this is no longer true.
|
diff --git a/tests/_util.py b/tests/_util.py
index <HASH>..<HASH> 100644
--- a/tests/_util.py
+++ b/tests/_util.py
@@ -5,7 +5,7 @@ from docutils.nodes import (
list_item, paragraph,
)
from mock import Mock
-from spec import eq_
+from spec import eq_, ok_
from sphinx.application import Sphinx
import six
import sphinx
@@ -153,4 +153,10 @@ def expect_releases(entries, release_map, skip_initial=False):
changelog = changelog2dict(releases(*entries, **kwargs))
err = "Got unexpected contents for {0}: wanted {1}, got {2}"
for rel, issues in six.iteritems(release_map):
- eq_(changelog[rel], issues, err.format(rel, issues, changelog[rel]))
+ found = changelog.pop(rel)
+ eq_(found, issues, err.format(rel, issues, found))
+ # Sanity: ensure no leftover issue lists exist (empty ones are OK)
+ for key in changelog.keys():
+ if not changelog[key]:
+ del changelog[key]
+ ok_(not changelog, "Found leftovers: {0}".format(changelog))
|
Have expect_releases complain about leftovers
|
diff --git a/slither/core/declarations/contract.py b/slither/core/declarations/contract.py
index <HASH>..<HASH> 100644
--- a/slither/core/declarations/contract.py
+++ b/slither/core/declarations/contract.py
@@ -69,6 +69,14 @@ class Contract(ChildSlither, SourceMapping):
self._inheritance = inheritance
@property
+ def derived_contracts(self):
+ '''
+ list(Contract): Return the list of contracts derived from self
+ '''
+ candidates = self.slither.contracts
+ return [c for c in candidates if self in c.inheritance]
+
+ @property
def structures(self):
'''
list(Structure): List of the structures
@@ -163,6 +171,18 @@ class Contract(ChildSlither, SourceMapping):
'''
return self.functions_not_inherited + self.modifiers_not_inherited
+ def get_functions_overridden_by(self, function):
+ '''
+ Return the list of functions overriden by the function
+ Args:
+ (core.Function)
+ Returns:
+ list(core.Function)
+
+ '''
+ candidates = [c.functions_not_inherited for c in self.inheritance]
+ candidates = [candidate for sublist in candidates for candidate in sublist]
+ return [f for f in candidates if f.full_name == function.full_name]
@property
def all_functions_called(self):
|
API:
- Add contract.derived_contracts
|
diff --git a/test/auto_session_timeout_helper_test.rb b/test/auto_session_timeout_helper_test.rb
index <HASH>..<HASH> 100644
--- a/test/auto_session_timeout_helper_test.rb
+++ b/test/auto_session_timeout_helper_test.rb
@@ -2,17 +2,21 @@ require File.dirname(__FILE__) + '/test_helper'
describe AutoSessionTimeoutHelper do
- class ActionView::Base
+ class StubView
+ include AutoSessionTimeoutHelper
+ include ActionView::Helpers::JavaScriptHelper
+ include ActionView::Helpers::TagHelper
+
def timeout_path
- '/timeout'
+ "/timeout"
end
-
+
def active_path
- '/active'
+ "/active"
end
end
- subject { ActionView::Base.new }
+ subject { StubView.new }
describe "#auto_session_timeout_js" do
it "returns correct JS" do
|
Fix tests to work with Rails 6
|
diff --git a/RisFieldsMapping.php b/RisFieldsMapping.php
index <HASH>..<HASH> 100644
--- a/RisFieldsMapping.php
+++ b/RisFieldsMapping.php
@@ -27,7 +27,7 @@ class RisFieldsMapping implements RisFieldsMappingInterface
* @param string $field
* @return null|string
*/
- public function findTagByField(string $field)
+ public function findRisFieldByFieldName(string $field)
{
return $this->arrayFind($field);
}
diff --git a/RisFieldsMappingInterface.php b/RisFieldsMappingInterface.php
index <HASH>..<HASH> 100644
--- a/RisFieldsMappingInterface.php
+++ b/RisFieldsMappingInterface.php
@@ -13,5 +13,5 @@ interface RisFieldsMappingInterface
* @param string $field
* @return null|string
*/
- public function findTagByField(string $field);
+ public function findRisFieldByFieldName(string $field);
}
\ No newline at end of file
|
Rename function findTagByField by findRisFieldByFieldName
|
diff --git a/lib/Opauth/Strategy/Facebook.php b/lib/Opauth/Strategy/Facebook.php
index <HASH>..<HASH> 100644
--- a/lib/Opauth/Strategy/Facebook.php
+++ b/lib/Opauth/Strategy/Facebook.php
@@ -17,8 +17,5 @@ class Facebook extends OpauthStrategy{
public function __construct(&$Opauth, $strategy){
parent::__construct($Opauth, $strategy);
-
- $this->expects('app_id');
- $this->expects('app_id');
}
}
\ No newline at end of file
|
Removed unnecessary expects() in Facebook
|
diff --git a/ceph_deploy/mon.py b/ceph_deploy/mon.py
index <HASH>..<HASH> 100644
--- a/ceph_deploy/mon.py
+++ b/ceph_deploy/mon.py
@@ -44,7 +44,7 @@ def mon_status_check(conn, logger, hostname, args):
logger.error(line)
try:
- return json.loads(b''.join(out).decode('utf-8'))
+ return json.loads(''.join(out))
except ValueError:
return {}
@@ -589,8 +589,8 @@ def is_running(conn, args):
conn,
args
)
- result_string = b' '.join(stdout)
- for run_check in [b': running', b' start/running']:
+ result_string = ' '.join(stdout)
+ for run_check in [': running', b' start/running']:
if run_check in result_string:
return True
return False
|
mon: no need to decode - already done by remoto
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ import sys, os
from setuptools import setup, find_packages
import subprocess
-version = "0.3.5"
+version = "0.3.6"
base_reqs = [
"requests"
diff --git a/waybackpack/version.py b/waybackpack/version.py
index <HASH>..<HASH> 100644
--- a/waybackpack/version.py
+++ b/waybackpack/version.py
@@ -1 +1 @@
-__version__ = "0.3.5"
+__version__ = "0.3.6"
|
Bump to v <I>
|
diff --git a/src/Support/SelectFields.php b/src/Support/SelectFields.php
index <HASH>..<HASH> 100644
--- a/src/Support/SelectFields.php
+++ b/src/Support/SelectFields.php
@@ -358,7 +358,7 @@ class SelectFields
/**
* @param array $select
- * @param mixed $relation
+ * @param Relation $relation
* @param string|null $parentTable
* @param array $field
*/
|
chore: phpstan: fix "Cannot call method getForeignKey() on class-string|object."
|
diff --git a/src/engines/class-twig-engine.php b/src/engines/class-twig-engine.php
index <HASH>..<HASH> 100644
--- a/src/engines/class-twig-engine.php
+++ b/src/engines/class-twig-engine.php
@@ -69,7 +69,7 @@ class Twig_Engine extends Engine {
*
* @return \Twig_Environment
*/
- private function instance() {
+ public function instance() {
if ( ! isset( self::$environment ) ) {
self::$environment = $this->boot();
}
|
Update class-twig-engine.php
|
diff --git a/tasks/jsduck.js b/tasks/jsduck.js
index <HASH>..<HASH> 100644
--- a/tasks/jsduck.js
+++ b/tasks/jsduck.js
@@ -12,8 +12,8 @@ module.exports = function(grunt) {
var helpers = require('grunt-lib-contrib').init(grunt),
cmd = 'jsduck',
options = helpers.options(this),
- src = this.file.src,
- dest = outDir || this.file.dest,
+ src = this.hasOwnProperty('file') == true ? this.file.src : this.data.src,
+ dest = outDir || (this.hasOwnProperty('dest') == true ? this.file.dest : this.data.dest),
args,
done = this.async(),
jsduck;
|
Update tasks/jsduck.js
Adds support for newer version of grunt. Fixes #1.
|
diff --git a/tasks/shared-config.js b/tasks/shared-config.js
index <HASH>..<HASH> 100644
--- a/tasks/shared-config.js
+++ b/tasks/shared-config.js
@@ -97,20 +97,21 @@ module.exports = function( grunt ) {
function generateStyle( data, type ) {
var content = "";
var pattern = outputPattern[ type ];
- var name, key;
- function generateContent( data, type, parent ) {
- for (var key in data ) {
- if ( typeof(data[key]) === "object" ) {
- generateContent( data[key], type, key );
+ function generateContent( data, parentKey ) {
+ var name, key;
+ for ( key in data ) {
+ name = parentKey ? format( parentKey + "-" + key, options.cssFormat ) : format( key, options.cssFormat );
+
+ if ( typeof( data[ key ] ) === "object" ) {
+ generateContent( data[ key ], name );
}else{
- name = format( key, options.cssFormat );
- content += pattern.replace( '{{key}}', parent ? parent + "-" + name : name ).replace( '{{value}}', data[ key ] );
+ content += pattern.replace( '{{key}}', name ).replace( '{{value}}', data[ key ] );
}
}
}
- generateContent( data, type );
+ generateContent( data );
return content;
}
|
fixed issue with more then 2 dimensions.
|
diff --git a/tests/testremote_storage.py b/tests/testremote_storage.py
index <HASH>..<HASH> 100644
--- a/tests/testremote_storage.py
+++ b/tests/testremote_storage.py
@@ -8,7 +8,7 @@ class RemoteStorageTestCase(unittest.TestCase):
VALID_UGCID = 650994986817657344
VALID_UGC_SIZE = 134620
VALID_UGC_FILENAME = "steamworkshop/tf2/_thumb.jpg"
- VALID_UGC_URL = "http://cloud-3.steampowered.com/ugc/650994986817657344/D2ADAD7F19BFA9A99BD2B8850CC317DC6BA01BA9/" #Silly tea hat made by RJ
+ VALID_UGC_URL = "http://cloud-4.steampowered.com/ugc/650994986817657344/D2ADAD7F19BFA9A99BD2B8850CC317DC6BA01BA9/" #Silly tea hat made by RJ
@classmethod
def setUpClass(cls):
|
Updated testremote_storage with updated UGC URL (volvo changed it)
|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index <HASH>..<HASH> 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -21,7 +21,6 @@ if ENV["COVERAGE"]
end
end
-development = !!ENV['GUARD_NOTIFY'] || !ENV["RAILS_ENV"]
ENV['RAILS_ENV'] ||= 'test'
require File.expand_path("../dummy/config/environment.rb", __FILE__)
@@ -68,9 +67,7 @@ RSpec.configure do |config|
config.color = true
- if development
- config.add_formatter(:documentation)
- else
+ if ENV['COVERAGE']
config.add_formatter(:progress)
end
|
Explicitly define rspec output only when coverage generated
|
diff --git a/src/Phpoaipmh/RecordIterator.php b/src/Phpoaipmh/RecordIterator.php
index <HASH>..<HASH> 100644
--- a/src/Phpoaipmh/RecordIterator.php
+++ b/src/Phpoaipmh/RecordIterator.php
@@ -220,6 +220,9 @@ class RecordIterator implements \Iterator
$t = $resp->$verb->resumptionToken['expirationDate'];
$this->expireDate = \DateTime::createFromFormat(\DateTime::ISO8601, $t);
}
+ } else {
+ //Unset the resumption token when we're at the end of the list
+ $this->resumptionToken = null;
}
//Return a count
|
Stop iteration at the end of list
|
diff --git a/tests/TestCase/Network/Email/SmtpTransportTest.php b/tests/TestCase/Network/Email/SmtpTransportTest.php
index <HASH>..<HASH> 100644
--- a/tests/TestCase/Network/Email/SmtpTransportTest.php
+++ b/tests/TestCase/Network/Email/SmtpTransportTest.php
@@ -407,6 +407,7 @@ class SmtpTransportTest extends TestCase
->will($this->returnValue(['First Line', 'Second Line', '.Third Line', '']));
$data = "From: CakePHP Test <noreply@cakephp.org>\r\n";
+ $data .= "Return-Path: CakePHP Return <pleasereply@cakephp.org>\r\n";
$data .= "To: CakePHP <cake@cakephp.org>\r\n";
$data .= "Cc: Mark Story <mark@cakephp.org>, Juan Basso <juan@cakephp.org>\r\n";
$data .= "Date: " . $date . "\r\n";
|
Tests upgraded to accept the parameter ReturnPath
|
diff --git a/examples/platformer2/js/entities/HUD.js b/examples/platformer2/js/entities/HUD.js
index <HASH>..<HASH> 100644
--- a/examples/platformer2/js/entities/HUD.js
+++ b/examples/platformer2/js/entities/HUD.js
@@ -28,11 +28,13 @@ game.HUD.Container = me.Container.extend({
// add our child score object at position
this.addChild(new game.HUD.ScoreItem(-10, -40));
- // add our fullscreen control object
- this.addChild(new game.HUD.FSControl(10, 10));
-
// add our audio control object
- this.addChild(new game.HUD.AudioControl(10 + 48 + 10, 10));
+ this.addChild(new game.HUD.AudioControl(10, 10));
+
+ if (!me.device.isMobile) {
+ // add our fullscreen control object
+ this.addChild(new game.HUD.FSControl(10 + 48 + 10, 10));
+ }
}
});
|
[#<I>] do not add the fullscreen control on mobile devices
btw, is the `me.device.isMobile` still up-to-date in terms of UA
matching ?
|
diff --git a/lxd/api_metrics.go b/lxd/api_metrics.go
index <HASH>..<HASH> 100644
--- a/lxd/api_metrics.go
+++ b/lxd/api_metrics.go
@@ -182,7 +182,7 @@ func metricsGet(d *Daemon, r *http.Request) response.Response {
for project, entries := range newMetrics {
metricsCache[project] = metricsCacheEntry{
- expiry: time.Now().Add(15 * time.Second),
+ expiry: time.Now().Add(8 * time.Second),
metrics: entries,
}
|
lxd/metrics: Reduce cache to 8s to accomodate <I>s intervals
Closes #<I>
|
diff --git a/ipwhois/ipwhois.py b/ipwhois/ipwhois.py
index <HASH>..<HASH> 100644
--- a/ipwhois/ipwhois.py
+++ b/ipwhois/ipwhois.py
@@ -105,7 +105,7 @@ class IPWhois:
asn_alts: Array of additional lookup types to attempt if the
ASN dns lookup fails. Allow permutations must be enabled.
Defaults to all ['whois', 'http']. *WARNING* deprecated in
- favor of new argument methods.
+ favor of new argument asn_methods.
extra_org_map: Dictionary mapping org handles to RIRs. This is for
limited cases where ARIN REST (ASN fallback HTTP lookup) does
not show an RIR as the org handle e.g., DNIC (which is now the
@@ -222,7 +222,7 @@ class IPWhois:
asn_alts: Array of additional lookup types to attempt if the
ASN dns lookup fails. Allow permutations must be enabled.
Defaults to all ['whois', 'http']. *WARNING* deprecated in
- favor of new argument methods.
+ favor of new argument asn_methods.
extra_org_map: Dictionary mapping org handles to RIRs. This is for
limited cases where ARIN REST (ASN fallback HTTP lookup) does
not show an RIR as the org handle e.g., DNIC (which is now the
|
asn_methods docstring fix (#<I>)
|
diff --git a/core/dbt/adapters/base/connections.py b/core/dbt/adapters/base/connections.py
index <HASH>..<HASH> 100644
--- a/core/dbt/adapters/base/connections.py
+++ b/core/dbt/adapters/base/connections.py
@@ -139,7 +139,7 @@ class BaseConnectionManager(metaclass=abc.ABCMeta):
.format(conn.name)
)
else:
- conn.handle = LazyHandle(self.open)
+ conn.handle = LazyHandle(self.open)
conn.name = conn_name
return conn
@@ -161,6 +161,11 @@ class BaseConnectionManager(metaclass=abc.ABCMeta):
This should be thread-safe, or hold the lock if necessary. The given
connection should not be in either in_use or available.
"""
+ logger.debug(
+ 'Opening a new connection, currently in state {}'
+ .format(connection.state)
+ )
+
raise dbt.exceptions.NotImplementedException(
'`open` is not implemented for this adapter!'
)
|
(#<I>) Move opening connection message inside open method
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ import sys
setup(
name="rig",
- version="0.1.1",
+ version="0.1.2",
packages=find_packages(),
# Metadata for PyPi
|
Increment version number to <I>.
|
diff --git a/src/Models/Tag.php b/src/Models/Tag.php
index <HASH>..<HASH> 100644
--- a/src/Models/Tag.php
+++ b/src/Models/Tag.php
@@ -106,7 +106,7 @@ class Tag extends BaseTag
$this->setTable(config('rinvex.tags.tables.tags'));
$this->setRules([
- 'slug' => 'required|alpha_dash|max:150|unique_model:'.config('rinvex.tags.models.tag').',slug',
+ 'slug' => 'required|alpha_dash|max:150|unique:'.config('rinvex.tags.tables.tags').',slug',
'name' => 'required|string|max:150',
'description' => 'nullable|string|max:10000',
'sort_order' => 'nullable|integer|max:10000000',
|
Revert unique & exists validation rules to native after overriding presence verifier to use eloquent by default
|
diff --git a/test/create.js b/test/create.js
index <HASH>..<HASH> 100644
--- a/test/create.js
+++ b/test/create.js
@@ -25,6 +25,7 @@ describe('create cli', function() {
});
it('installs dependencies', function (done) {
+ this.timeout(60000);
spawnCliInSandbox(['create', 'cli', 'test-app'])
.run(function(err) {
if (err) done(err);
diff --git a/test/example.js b/test/example.js
index <HASH>..<HASH> 100644
--- a/test/example.js
+++ b/test/example.js
@@ -7,7 +7,7 @@ var sandbox = require('./helpers/sandbox.js');
var spawnCliInSandbox = require('./helpers/runner.js').spawnCliInSandbox;
describe('suite example', function() {
- this.timeout(5000);
+ this.timeout(60000);
before(function(done) {
sandbox.reset();
|
Increase git/npm timeouts
npm install and git clone can be very slow, increase the timeouts to <I>
secs to avoid ephemeral irrelevant failures.
|
diff --git a/lib/linguist/blob_helper.rb b/lib/linguist/blob_helper.rb
index <HASH>..<HASH> 100644
--- a/lib/linguist/blob_helper.rb
+++ b/lib/linguist/blob_helper.rb
@@ -8,6 +8,11 @@ require 'pygments'
require 'yaml'
module Linguist
+ # DEPRECATED Avoid mixing into Blob classes. Prefer functional interfaces
+ # like `Language.detect` over `Blob#language`.
+ #
+ # Avoid adding additional bloat to this module.
+ #
# BlobHelper is a mixin for Blobish classes that respond to "name",
# "data" and "size" such as Grit::Blob.
module BlobHelper
|
Note that BlobHelper is a turd
|
diff --git a/src/DataTables/AbstractDataTable.php b/src/DataTables/AbstractDataTable.php
index <HASH>..<HASH> 100644
--- a/src/DataTables/AbstractDataTable.php
+++ b/src/DataTables/AbstractDataTable.php
@@ -313,7 +313,7 @@ CDATA;
* Map ajax response to columns definition.
*
* @param array|\Illuminate\Support\Collection $columns
- * @param string $type
+ * @param string $type
*
* @return array
*/
|
Apply fixes from StyleCI (#<I>)
|
diff --git a/Gruntfile.js b/Gruntfile.js
index <HASH>..<HASH> 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -271,7 +271,7 @@ module.exports = function (grunt) {
wrap: {
start: '/*! Console-only distribution */\n' +
'(function(root, rootDefine, rootRequire, rootModule) {\n',
- end: 'require(["./woodman"], function (woodman) {\n' +
+ end: 'require(["./woodman-console"], function (woodman) {\n' +
' if (rootDefine) rootDefine(woodman);\n' +
' if (root) root.woodman = woodman;\n' +
' if (rootModule) rootModule.exports = woodman;\n' +
|
Fixed console distribution wrapping code
The newly introduced "console" distribution did not work because
of an invalid require code in the initial wrapping code.
|
diff --git a/src/main/java/net/bootsfaces/component/ajax/AJAXRenderer.java b/src/main/java/net/bootsfaces/component/ajax/AJAXRenderer.java
index <HASH>..<HASH> 100644
--- a/src/main/java/net/bootsfaces/component/ajax/AJAXRenderer.java
+++ b/src/main/java/net/bootsfaces/component/ajax/AJAXRenderer.java
@@ -562,7 +562,11 @@ public class AJAXRenderer extends CoreRenderer {
} else {
process = ExpressionResolver.getComponentIDs(context, (UIComponent) component, process);
}
- update = ExpressionResolver.getComponentIDs(context, (UIComponent) component, update);
+ if (update==null) {
+ update="";
+ } else {
+ update = ExpressionResolver.getComponentIDs(context, (UIComponent) component, update);
+ }
cJS.append(encodeClick((UIComponent)component)).append("BsF.ajax.callAjax(this, event")
.append(update == null ? ",''" : (",'" + update + "'"))
.append(process == null ? ",'@this'" : (",'" + process.trim() + "'"));
|
#<I> and #<I> the default value of the update attribute is always @none
|
diff --git a/lib/atomy/pattern/attribute.rb b/lib/atomy/pattern/attribute.rb
index <HASH>..<HASH> 100644
--- a/lib/atomy/pattern/attribute.rb
+++ b/lib/atomy/pattern/attribute.rb
@@ -14,7 +14,8 @@ class Atomy::Pattern
end
def assign(scope, val)
- @receiver.send(:"#{@attribute}=", val)
+ # don't use send; Generator implements #send, other things might too.
+ @receiver.__send__(:"#{@attribute}=", val)
end
end
end
diff --git a/spec/atomy/pattern/attribute_spec.rb b/spec/atomy/pattern/attribute_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/atomy/pattern/attribute_spec.rb
+++ b/spec/atomy/pattern/attribute_spec.rb
@@ -31,5 +31,14 @@ describe Atomy::Pattern::Attribute do
subject.assign(Rubinius::VariableScope.current, 42)
expect(receiver.abc).to eq(42)
end
+
+ context "when the receiver implements #send" do
+ before { allow(receiver).to receive(:send).and_raise("hell") }
+
+ it "still assigns the correct attribute" do
+ subject.assign(Rubinius::VariableScope.current, 42)
+ expect(receiver.abc).to eq(42)
+ end
+ end
end
end
|
attribute pattern uses #__send__, not #send
...because some things override that, which is very confusing (e.g.
CodeTools::Generator)
|
diff --git a/src/JWKConverter.php b/src/JWKConverter.php
index <HASH>..<HASH> 100644
--- a/src/JWKConverter.php
+++ b/src/JWKConverter.php
@@ -22,7 +22,7 @@ class JWKConverter
/** @var Base64UrlDecoder */
private $base64UrlDecoder;
- public function __construct(?Base64UrlDecoder $base64UrlDecoder = null)
+ public function __construct(Base64UrlDecoder $base64UrlDecoder = null)
{
$this->base64UrlDecoder = $base64UrlDecoder ?? new Base64UrlDecoder();
}
|
Remove nullable type for PHP >=<I> support
|
diff --git a/test/support/tcp_proxy.rb b/test/support/tcp_proxy.rb
index <HASH>..<HASH> 100644
--- a/test/support/tcp_proxy.rb
+++ b/test/support/tcp_proxy.rb
@@ -91,7 +91,7 @@ class TCPProxy
dst.send(data, 0)
end
elsif disabled? && pause_behavior == :return
- clean_data = data.encode("UTF-8", invalid: :replace, undef: :replace, replace: "")
+ clean_data = data.gsub(/[^\w. ]/, '').strip
if schema_query?(clean_data)
dst.send(data, 0)
@@ -108,6 +108,10 @@ class TCPProxy
# FIXME: We should not allow fetching schema information from the primary DB.
def schema_query?(data)
data.include?("information_schema.tables") ||
+ data.include?("information_schema.statistics") ||
+ data.include?("information_schema.key_column_usage") ||
+ data.include?("SHOW TABLES") ||
+ data.include?("SHOW CREATE TABLE") ||
data.include?("SHOW FULL FIELDS FROM")
end
|
Include more schema-loading code, to fix tests
There are more schema related queries than I first assumed. This commit
adds three more things to look when determining whether a query is
(temporarily) allowed to bypass the paused TCP Proxy and have the query
sent to a primary database.
|
diff --git a/javascript/firefox-driver/js/wrappedElement.js b/javascript/firefox-driver/js/wrappedElement.js
index <HASH>..<HASH> 100644
--- a/javascript/firefox-driver/js/wrappedElement.js
+++ b/javascript/firefox-driver/js/wrappedElement.js
@@ -83,6 +83,7 @@ WebElement.clickElement = function(respond, parameters) {
if (!isOption && this.enableNativeEvents && nativeMouse && node && useNativeClick && thmgr_cls) {
fxdriver.logging.info('Using native events for click');
+ element.scrollIntoView();
var inViewAfterScroll = bot.action.scrollIntoView(
unwrapped,
new goog.math.Coordinate(elementHalfWidth, elementHalfHeight));
|
Fixing one of the tests broken by recent atoms update (scrolling to an
element in a frame that is out of view)
|
diff --git a/tests/test_fast/test_timeout.py b/tests/test_fast/test_timeout.py
index <HASH>..<HASH> 100644
--- a/tests/test_fast/test_timeout.py
+++ b/tests/test_fast/test_timeout.py
@@ -112,7 +112,13 @@ def test_stop_wait():
proc = EasyProcess(["python", "-c", ignore_term]).start()
time.sleep(1)
proc.stop(timeout=1)
- assert proc.is_alive() is True
+ # On windows, Popen.terminate actually behaves like kill,
+ # so don't check that our hanging process code is actually hanging.
+ # The end result is still what we want. On other platforms, leave
+ # this assertion to make sure we are correctly testing the ability
+ # to stop a hung process
+ if not sys.platform.startswith("win"):
+ assert proc.is_alive() is True
proc.stop(kill_after=1)
assert proc.is_alive() is False
assert proc.return_code != 0
|
Remove hung process assertion on windows where it is unneeded
|
diff --git a/src/Exscriptd/Order.py b/src/Exscriptd/Order.py
index <HASH>..<HASH> 100644
--- a/src/Exscriptd/Order.py
+++ b/src/Exscriptd/Order.py
@@ -64,7 +64,7 @@ class Order(DBObject):
descr_node = order_node.find('description')
order = Order(order_node.get('service'))
order.id = order_node.get('id')
- order.status = order_node.get('status')
+ order.status = order_node.get('status', order.status)
order.created_by = order_node.get('created-by', order.created_by)
created = order_node.get('created')
closed = order_node.get('closed')
|
Exscriptd.Order: default status to 'new' if the XML does not contain one.
|
diff --git a/firetv/__init__.py b/firetv/__init__.py
index <HASH>..<HASH> 100644
--- a/firetv/__init__.py
+++ b/firetv/__init__.py
@@ -86,6 +86,8 @@ class FireTV:
def app_state(self, app):
""" Informs if application is running """
+ if self.state != STATE_PLAYING:
+ return STATE_OFF
if len(self._ps(app)) > 0:
return STATE_ON
return STATE_OFF
|
Change so that apps arnt on unless firetv is playing
|
diff --git a/src/Factories/Entity/Environment.php b/src/Factories/Entity/Environment.php
index <HASH>..<HASH> 100644
--- a/src/Factories/Entity/Environment.php
+++ b/src/Factories/Entity/Environment.php
@@ -30,13 +30,20 @@ class Environment extends AbstractEntity
public $accountId;
/**
- * Current state of container
+ * Current state of environment
*
* @var string
*/
public $state;
/**
+ * Current health of environment
+ *
+ * @var string
+ */
+ public $healthState;
+
+ /**
* The docker-compose.yml file
* for the Environment
*
|
Expose the health state of an Environment
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -86,7 +86,7 @@ var torrentStream = function(link, opts) {
var engine = new events.EventEmitter();
var swarm = pws(infoHash, opts.id, {size:opts.connections || opts.size});
- var torrentPath = path.join(opts.path, 'cache.torrent');
+ var torrentPath = path.join(opts.path, infoHash + '.torrent');
var wires = swarm.wires;
var critical = [];
|
Include infoHash in torrent cache file path
|
diff --git a/builder/amazon/ebs/step_stop_instance.go b/builder/amazon/ebs/step_stop_instance.go
index <HASH>..<HASH> 100644
--- a/builder/amazon/ebs/step_stop_instance.go
+++ b/builder/amazon/ebs/step_stop_instance.go
@@ -34,8 +34,7 @@ func (s *stepStopInstance) Run(state map[string]interface{}) multistep.StepActio
Refresh: awscommon.InstanceStateRefreshFunc(ec2conn, instance),
StepState: state,
}
- instanceRaw, err := awscommon.WaitForState(&stateChange)
- instance = instanceRaw.(*ec2.Instance)
+ _, err = awscommon.WaitForState(&stateChange)
if err != nil {
err := fmt.Errorf("Error waiting for instance to stop: %s", err)
state["error"] = err
|
builder/amazon/ebs: don't need this variable
|
diff --git a/api/src/main/java/org/jboss/arquillian/persistence/ApplyScriptAfter.java b/api/src/main/java/org/jboss/arquillian/persistence/ApplyScriptAfter.java
index <HASH>..<HASH> 100644
--- a/api/src/main/java/org/jboss/arquillian/persistence/ApplyScriptAfter.java
+++ b/api/src/main/java/org/jboss/arquillian/persistence/ApplyScriptAfter.java
@@ -26,7 +26,7 @@ import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
/**
- * Defines SQL scripts applied on test database before test method execution.
+ * Defines SQL scripts applied on test database after test method execution.
* <br />
* If files are not specified explicitly, following strategy is applied:
* <ul>
|
JavaDoc mistake corrected (#<I>)
|
diff --git a/apps/pattern-lab/src/index.js b/apps/pattern-lab/src/index.js
index <HASH>..<HASH> 100644
--- a/apps/pattern-lab/src/index.js
+++ b/apps/pattern-lab/src/index.js
@@ -1,10 +1,10 @@
import 'core-js/modules/es6.string.starts-with';
import 'iframe-resizer/js/iframeResizer.contentWindow.min.js';
-// automatically remove the min-height default set to the body element when viewing PL pages from inside an iframe on the docs site.
+// automatically remove the min-height default set to the body element when viewing PL pages from inside an iframe on the docs site, but via a utility class
window.iFrameResizer = {
readyCallback() {
- document.body.setAttribute('style', 'min-height: 0;');
+ document.body.classList.add('u-bolt-min-height-none');
},
};
|
refactor: update previous iframe resize logic to handle via a utility class vs inline style
|
diff --git a/memote/support/basic.py b/memote/support/basic.py
index <HASH>..<HASH> 100644
--- a/memote/support/basic.py
+++ b/memote/support/basic.py
@@ -253,6 +253,7 @@ def find_unique_metabolites(model):
return set(met.id.split("_", 1)[0] for met in model.metabolites)
+@lrudecorator(size=2)
def find_duplicate_metabolites_in_compartments(model):
"""
Return list of metabolites with duplicates in the same compartment.
@@ -273,14 +274,15 @@ def find_duplicate_metabolites_in_compartments(model):
A list of tuples of duplicate metabolites.
"""
+ unique_identifiers = ["inchikey", "inchi"]
duplicates = []
- for compartment in model.compartments:
- ann_mets = [(met, met.annotation) for met in model.metabolites
- if met.compartment == compartment and
- "inchikey" in met.annotation]
- for a, b in combinations(ann_mets, 2):
- if a[1]["inchikey"] == b[1]["inchikey"]:
- duplicates.append((a[0].id, b[0].id))
+ for met_1, met_2 in combinations(model.metabolites, 2):
+ if met_1.compartment == met_2.compartment:
+ for key in unique_identifiers:
+ if key in met_1.annotation and key in met_2.annotation:
+ if met_1.annotation[key] == met_2.annotation[key]:
+ duplicates.append((met_1.id, met_2.id))
+ break
return duplicates
|
refactor: expand find_duplicate_metabolites to include inchi strings
|
diff --git a/.eslintrc.js b/.eslintrc.js
index <HASH>..<HASH> 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -6,12 +6,13 @@ module.exports = {
"mocha": true
},
"rules": {
+ "import/no-unresolved": 0, // fails at travis
+ "import/extensions": 0, // fails at travis
"prefer-arrow-callback": 0, // mocha tests (recommendation)
"func-names": 0, // mocha tests (recommendation)
"comma-dangle": ["error", "never"], // personal preference
- "no-param-reassign": 0, // consider enabling this again
- "no-underscore-dangle": 0, // implementation detail (_highlights etc.)
+ "no-param-reassign": 0, // the plugin needs this (webpack design :( )
"no-use-before-define": 0, // personal preference
- "no-console": 0 // Allow logging
+ "no-console": 0 // allow logging
}
};
|
chore - Simplify eslint rules
|
diff --git a/test/spec/LiveDevelopment-test.js b/test/spec/LiveDevelopment-test.js
index <HASH>..<HASH> 100644
--- a/test/spec/LiveDevelopment-test.js
+++ b/test/spec/LiveDevelopment-test.js
@@ -880,6 +880,9 @@ define(function (require, exports, module) {
// Edit a JavaScript doc
jsdoc.setText("window.onload = function () {document.getElementById('testId').style.backgroundColor = '#090'}");
+ // Make sure the live development dirty dot shows
+ expect(LiveDevelopment.status).toBe(LiveDevelopment.STATUS_OUT_OF_SYNC);
+
// Save changes to the test file
loadEventPromise = saveAndWaitForLoadEvent(jsdoc);
});
|
Add unit test for <I> (JS portion)
|
diff --git a/sources/EngineWorks/DBAL/Pager.php b/sources/EngineWorks/DBAL/Pager.php
index <HASH>..<HASH> 100644
--- a/sources/EngineWorks/DBAL/Pager.php
+++ b/sources/EngineWorks/DBAL/Pager.php
@@ -31,7 +31,7 @@ class Pager
/** @var string SQL to query the data */
private $queryData;
- /** @var string|false SQL to query the count */
+ /** @var string SQL to query the count */
private $queryCount;
/** @var int */
@@ -92,7 +92,7 @@ class Pager
$this->totalRecords = null;
$this->recordset = null;
// request
- $page = min($this->getTotalPages(), max(1, intval($requestedPage)));
+ $page = (int) min($this->getTotalPages(), max(1, intval($requestedPage)));
$query = $this->dbal->sqlLimit($this->getQueryData(), $page, $this->getPageSize());
$recordset = $this->dbal->queryRecordset($query);
if (! $recordset instanceof Recordset) {
|
docblock: $queryCount cannot be false
|
diff --git a/http3/server.go b/http3/server.go
index <HASH>..<HASH> 100644
--- a/http3/server.go
+++ b/http3/server.go
@@ -709,19 +709,20 @@ func ListenAndServe(addr, certFile, keyFile string, handler http.Handler) error
tlsConn := tls.NewListener(tcpConn, config)
defer tlsConn.Close()
+ if handler == nil {
+ handler = http.DefaultServeMux
+ }
// Start the servers
- httpServer := &http.Server{}
quicServer := &Server{
TLSConfig: config,
+ Handler: handler,
}
-
- if handler == nil {
- handler = http.DefaultServeMux
+ httpServer := &http.Server{
+ Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+ quicServer.SetQuicHeaders(w.Header())
+ handler.ServeHTTP(w, r)
+ }),
}
- httpServer.Handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
- quicServer.SetQuicHeaders(w.Header())
- handler.ServeHTTP(w, r)
- })
hErr := make(chan error)
qErr := make(chan error)
|
http3: fix listening on both QUIC and TCP (#<I>)
|
diff --git a/zappa/cli.py b/zappa/cli.py
index <HASH>..<HASH> 100644
--- a/zappa/cli.py
+++ b/zappa/cli.py
@@ -147,7 +147,7 @@ class ZappaCLI(object):
# Version requires no arguments
if args.version: # pragma: no cover
self.print_version()
- sys.exit(-1)
+ sys.exit(0)
# Parse the input
command_env = vargs['command_env']
|
print version should be exit code 0. fix #<I>
|
diff --git a/sessions/startup.go b/sessions/startup.go
index <HASH>..<HASH> 100644
--- a/sessions/startup.go
+++ b/sessions/startup.go
@@ -6,10 +6,7 @@ import (
"os"
)
-const (
- startupSessionIDKey = "BUGSNAG_STARTUP_SESSION_ID"
- startupSessionTimestampKey = "BUGSNAG_STARTUP_SESSION_TIMESTAMP"
-)
+const startupSessionIDKey = "BUGSNAG_STARTUP_SESSION_ID"
// SendStartupSession is called by Bugsnag on startup, which will send a
// session to Bugsnag and return a context to represent the session of the main
@@ -36,6 +33,5 @@ func isApplicationProcess(session *Session) bool {
// the monitoring process runs
envID := os.Getenv(startupSessionIDKey)
os.Setenv(startupSessionIDKey, session.ID.String())
- os.Setenv(startupSessionTimestampKey, session.StartedAt.String())
return envID == ""
}
|
[chore] Simplify process check
|
diff --git a/lib/webspicy.rb b/lib/webspicy.rb
index <HASH>..<HASH> 100644
--- a/lib/webspicy.rb
+++ b/lib/webspicy.rb
@@ -89,9 +89,9 @@ module Webspicy
module_function :test_case
def handle_finitio_error(ex, scope)
- # msg = "#{ex.message}:\n #{ex.root_cause.message}"
- # msg = Support::Colorize.colorize_error(msg, scope.config)
- # fatal(msg)
+ msg = "#{ex.message}:\n #{ex.root_cause.message}"
+ msg = Support::Colorize.colorize_error(msg, scope.config)
+ fatal(msg)
raise
end
module_function :handle_finitio_error
|
Show root cause when specification cannot be loaded.
|
diff --git a/src/V5/DTO/Report/Payload.php b/src/V5/DTO/Report/Payload.php
index <HASH>..<HASH> 100644
--- a/src/V5/DTO/Report/Payload.php
+++ b/src/V5/DTO/Report/Payload.php
@@ -7,9 +7,9 @@ use JMS\Serializer\Annotation as Serializer;
class Payload
{
/**
- * @var string
+ * @var int
*
- * @Serializer\Type("string")
+ * @Serializer\Type("integer")
*/
private $fiscalReceiptNumber;
|
Fix Payload $fiscalReceiptNumber serialized type in V5
|
diff --git a/Kwf/Setup.php b/Kwf/Setup.php
index <HASH>..<HASH> 100644
--- a/Kwf/Setup.php
+++ b/Kwf/Setup.php
@@ -164,6 +164,7 @@ class Kwf_Setup
switch (php_sapi_name()) {
case 'apache2handler':
$requestPath = $_SERVER['REQUEST_URI'];
+ $requestPath = strtok($requestPath, '?');
break;
case 'cli':
$requestPath = false;
|
Fix REQUEST_URI usage, it also contains query parameters
Simply cut them off
Fixes bug introduced with <I>d9e<I>c<I>b<I>ba<I>cecabb<I>d<I>fb<I>
|
diff --git a/packages/teraslice/lib/cluster/storage/backends/elasticsearch_store.js b/packages/teraslice/lib/cluster/storage/backends/elasticsearch_store.js
index <HASH>..<HASH> 100644
--- a/packages/teraslice/lib/cluster/storage/backends/elasticsearch_store.js
+++ b/packages/teraslice/lib/cluster/storage/backends/elasticsearch_store.js
@@ -243,23 +243,16 @@ module.exports = function elasticsearchStorage(backendConfig) {
}
async function bulkSend(bulkRequest) {
- let recordCount = 0;
- await pRetry(async () => {
- const results = await elasticsearch.bulkSend(bulkRequest);
- recordCount = results.items.length;
- }, {
+ const recordCount = (bulkRequest.length / 2);
+
+ await pRetry(async () => elasticsearch.bulkSend(bulkRequest), {
reason: `Failure to bulk create "${recordType}"`,
logError: logger.warn,
delay: isTest ? 100 : 1000,
backoff: 5,
retries: 100,
});
- // since this library only supports bulk updates by pairs
- // we can log when the expected count is different
- const expectedCount = (bulkRequest.length / 2);
- if (recordCount !== expectedCount) {
- logger.warn(`expected to bulk send ${expectedCount} records but got ${count}`);
- }
+
return recordCount;
}
|
Avoid being too smart with the bulk result count since bulkSend may not send all of the records when partially retrying
|
diff --git a/django_user_agents/middleware.py b/django_user_agents/middleware.py
index <HASH>..<HASH> 100644
--- a/django_user_agents/middleware.py
+++ b/django_user_agents/middleware.py
@@ -1,9 +1,10 @@
from django.utils.functional import SimpleLazyObject
+from django.utils.deprecation import MiddlewareMixin
from .utils import get_user_agent
-class UserAgentMiddleware(object):
+class UserAgentMiddleware(MiddlewareMixin):
# A middleware that adds a "user_agent" object to request
def process_request(self, request):
request.user_agent = SimpleLazyObject(lambda: get_user_agent(request))
|
Update middleware to be django<I>-compatible
|
diff --git a/dev/com.ibm.ws.kernel.boot_fat/fat/src/com/ibm/ws/kernel/service/ServerEndpointControlMBeanTest.java b/dev/com.ibm.ws.kernel.boot_fat/fat/src/com/ibm/ws/kernel/service/ServerEndpointControlMBeanTest.java
index <HASH>..<HASH> 100644
--- a/dev/com.ibm.ws.kernel.boot_fat/fat/src/com/ibm/ws/kernel/service/ServerEndpointControlMBeanTest.java
+++ b/dev/com.ibm.ws.kernel.boot_fat/fat/src/com/ibm/ws/kernel/service/ServerEndpointControlMBeanTest.java
@@ -127,7 +127,7 @@ public class ServerEndpointControlMBeanTest {
if (restoreSavedConfig) {
server.setMarkToEndOfLog();
server.updateServerConfiguration(savedConfig);
- assertNotNull("Didn't get expected config update log messages", server.waitForConfigUpdateInLogUsingMark(null, true));
+ assertNotNull("Didn't get expected config update log messages", server.waitForConfigUpdateInLogUsingMark(null));
}
Log.exiting(c, METHOD_NAME);
|
A previous change removed a feature update, so don't wait for it anymore
|
diff --git a/lib/parenting/boss.rb b/lib/parenting/boss.rb
index <HASH>..<HASH> 100644
--- a/lib/parenting/boss.rb
+++ b/lib/parenting/boss.rb
@@ -79,7 +79,7 @@ module Parenting
# watch the children, and assign new chores if any get free
until self.done?
- sleep 0.25
+ sleep 0.05
self.handle_complaints
self.check_children
|
shorten sleep to <I> ms
|
diff --git a/Eloquent/Builder.php b/Eloquent/Builder.php
index <HASH>..<HASH> 100755
--- a/Eloquent/Builder.php
+++ b/Eloquent/Builder.php
@@ -351,10 +351,12 @@ class Builder
{
$instance = $this->newModelInstance();
- return $instance->newCollection(array_map(function ($item) use ($instance) {
+ return $instance->newCollection(array_map(function ($item) use ($items, $instance) {
$model = $instance->newFromBuilder($item);
- $model->preventsLazyLoading = Model::preventsLazyLoading();
+ if (count($items) > 1) {
+ $model->preventsLazyLoading = Model::preventsLazyLoading();
+ }
return $model;
}, $items));
|
relax the lazy loading restrictions (#<I>)
|
diff --git a/classes/Gems/Auth.php b/classes/Gems/Auth.php
index <HASH>..<HASH> 100644
--- a/classes/Gems/Auth.php
+++ b/classes/Gems/Auth.php
@@ -152,11 +152,12 @@ class Gems_Auth extends Zend_Auth
} else {
if ($values['gula_failed_logins']) {
// MUtil_Echo::track($result->getCode(), self::ERROR_PASSWORD_DELAY);
- // Only increment when we have no password delay
- // if ($result->getCode() <> self::ERROR_PASSWORD_DELAY) {
+ // Only increment when we have no password delay as the right password
+ // will not be accepted when we are in the delay.
+ if ($result->getCode() <> self::ERROR_PASSWORD_DELAY) {
$values['gula_failed_logins'] += 1;
$values['gula_last_failed'] = new Zend_Db_Expr('CURRENT_TIMESTAMP');
- // }
+ }
} else {
$values['gula_failed_logins'] = 1;
$values['gula_last_failed'] = new Zend_Db_Expr('CURRENT_TIMESTAMP');
|
No extra delay when auth fails because of delay
|
diff --git a/webpack.config.js b/webpack.config.js
index <HASH>..<HASH> 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -22,6 +22,9 @@ module.exports = (argv = {}) => ({
libraryTarget: 'umd',
umdNamedDefine: true,
},
+ resolve: {
+ extensions: ['.js'],
+ },
module: {
rules: [
{
|
Webpack: resolve .js extension
|
diff --git a/snide/models.py b/snide/models.py
index <HASH>..<HASH> 100644
--- a/snide/models.py
+++ b/snide/models.py
@@ -41,7 +41,3 @@ class Slide(object):
'config': self.config,
}
-
-def parse_slide(slide):
- slide = Slide(slide)
- return slide
diff --git a/tests/test_snide.py b/tests/test_snide.py
index <HASH>..<HASH> 100644
--- a/tests/test_snide.py
+++ b/tests/test_snide.py
@@ -25,10 +25,17 @@ class TestDeck(BaseTestCase):
class TestSlide(BaseTestCase):
+ def setUp(self):
+ self.expected_slide = Slide('# first slide\n\n- and\n- then\n- this')
+
def test_slide(self):
- pass
- def test_slide_parse(self):
+ slide_text = '# first slide\n\n- and\n- then\n- this'
+ self.assertEquals(
+ self.expected_slide.to_json(),
+ Slide(slide_text).to_json()
+ )
+
pass
def test_slide_render(self):
|
Remove parse_slide and test slide construction
|
diff --git a/backend/views/product/add-video.php b/backend/views/product/add-video.php
index <HASH>..<HASH> 100644
--- a/backend/views/product/add-video.php
+++ b/backend/views/product/add-video.php
@@ -51,6 +51,16 @@ use yii\widgets\ActiveForm;
<?= $video->file_name; ?>
</td>
<td class="text-center">
+ <?php if ($video->resource == 'youtube') : ?>
+ <iframe width="100%" height="200" src="https://www.youtube.com/embed/<?=$video->file_name; ?>" frameborder="0" allowfullscreen></iframe>
+ <?php elseif ($video->resource == 'vimeo') : ?>
+ <iframe src="https://player.vimeo.com/video/<?=$video->file_name; ?>" width="100%" height="200" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+ <?php elseif ($video->resource == 'videofile') : ?>
+ <video width="100%" height="200" controls>
+ <source src="/video/<?=$video->file_name; ?>" type="video/mp4">
+ Your browser does not support the video tag.
+ </video>
+ <?php endif; ?>
</td>
<td class="text-center">
<a href="<?= Url::toRoute(['delete-video', 'id' => $video->id]); ?>"
|
Video players added for product editing page.
|
diff --git a/src/main/java/com/stratio/qa/specs/ThenGSpec.java b/src/main/java/com/stratio/qa/specs/ThenGSpec.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/stratio/qa/specs/ThenGSpec.java
+++ b/src/main/java/com/stratio/qa/specs/ThenGSpec.java
@@ -370,8 +370,6 @@ public class ThenGSpec extends BaseGSpec {
try {
if (exitStatus != null) {
assertThat(commonspec.getRemoteSSHConnection().getExitStatus()).isEqualTo(exitStatus);
- } else {
- assertThat(commonspec.getRemoteSSHConnection().getExitStatus()).isEqualTo(0);
}
assertThat(commonspec.getCommandResult()).as("Contains " + search + ".").contains(search);
found = true;
|
[QATM-<I>] Remove check status 0 by default (#<I>)
|
diff --git a/core/src/main/java/jenkins/security/QueueItemAuthenticatorProvider.java b/core/src/main/java/jenkins/security/QueueItemAuthenticatorProvider.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/jenkins/security/QueueItemAuthenticatorProvider.java
+++ b/core/src/main/java/jenkins/security/QueueItemAuthenticatorProvider.java
@@ -2,6 +2,7 @@ package jenkins.security;
import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
+import hudson.ExtensionList;
import hudson.ExtensionPoint;
import jenkins.model.Jenkins;
@@ -32,10 +33,7 @@ public abstract class QueueItemAuthenticatorProvider implements ExtensionPoint {
private Iterator<QueueItemAuthenticator> delegate = null;
private IteratorImpl() {
- final Jenkins jenkins = Jenkins.getInstanceOrNull();
- providers = new ArrayList<QueueItemAuthenticatorProvider>(jenkins == null
- ? Collections.<QueueItemAuthenticatorProvider>emptyList()
- : jenkins.getExtensionList(QueueItemAuthenticatorProvider.class)).iterator();
+ providers = ExtensionList.lookup(QueueItemAuthenticatorProvider.class).iterator();
}
@Override
|
Should have been using `ExtensionList.lookup(Class)` anyway
|
diff --git a/tests/resource/server_test.php b/tests/resource/server_test.php
index <HASH>..<HASH> 100644
--- a/tests/resource/server_test.php
+++ b/tests/resource/server_test.php
@@ -67,7 +67,7 @@ class Resource_Server_test extends PHPUnit_Framework_TestCase {
function test_init_header()
{
// Test with authorisation header
- //$this->markTestIncomplete('Authorisation header test has not been implemented yet.');
+ $this->markTestIncomplete('Authorisation header test has not been implemented yet.');
}
/**
|
Marked test_init_header as incomplete
|
diff --git a/libkbfs/init.go b/libkbfs/init.go
index <HASH>..<HASH> 100644
--- a/libkbfs/init.go
+++ b/libkbfs/init.go
@@ -713,6 +713,10 @@ func doInit(
}
config.SetMDServer(mdServer)
+ // Must do this after setting the md server, since it depends on
+ // being able to fetch MDs.
+ go kbfsOps.initSyncedTlfs()
+
// Initialize KeyServer connection. MDServer is the KeyServer at the
// moment.
keyServer, err := makeKeyServer(config, params.MDServerAddr, log)
diff --git a/libkbfs/kbfs_ops.go b/libkbfs/kbfs_ops.go
index <HASH>..<HASH> 100644
--- a/libkbfs/kbfs_ops.go
+++ b/libkbfs/kbfs_ops.go
@@ -78,7 +78,6 @@ func NewKBFSOpsStandard(appStateUpdater env.AppStateUpdater, config Config) *KBF
}
kops.currentStatus.Init()
go kops.markForReIdentifyIfNeededLoop()
- go kops.initSyncedTlfs()
return kops
}
|
kbfs_ops: fix race when initing TLFs before mdserver is set
|
diff --git a/registry.go b/registry.go
index <HASH>..<HASH> 100644
--- a/registry.go
+++ b/registry.go
@@ -279,6 +279,9 @@ func (graph *Graph) PullRepository(stdout io.Writer, remote, askedTag string, re
return err
}
defer res.Body.Close()
+ if res.StatusCode == 401 {
+ return fmt.Errorf("Please login first (HTTP code %d)", res.StatusCode)
+ }
// TODO: Right now we're ignoring checksums in the response body.
// In the future, we need to use them to check image validity.
if res.StatusCode != 200 {
|
Added help message to invite to login when getting a <I>
|
diff --git a/addon/components/date-picker-month.js b/addon/components/date-picker-month.js
index <HASH>..<HASH> 100644
--- a/addon/components/date-picker-month.js
+++ b/addon/components/date-picker-month.js
@@ -355,7 +355,7 @@ export default Component.extend({
actions: {
selectDate(date) {
- let action = get(this, 'attrs.selectDate');
+ let action = get(this, 'selectDate');
if (action) {
action(date);
}
diff --git a/addon/components/date-picker.js b/addon/components/date-picker.js
index <HASH>..<HASH> 100644
--- a/addon/components/date-picker.js
+++ b/addon/components/date-picker.js
@@ -598,7 +598,7 @@ export default Component.extend({
* @private
*/
_sendAction() {
- let action = get(this, 'attrs.action');
+ let action = get(this, 'action');
let vals = get(this, '_dates');
let isRange = get(this, 'range');
@@ -703,7 +703,7 @@ export default Component.extend({
},
_sendCloseAction() {
- let action = get(this, 'attrs.closeAction');
+ let action = get(this, 'closeAction');
let vals = get(this, '_dates');
let isRange = get(this, 'range');
|
Stop using attrs on component
|
diff --git a/lib/install.js b/lib/install.js
index <HASH>..<HASH> 100644
--- a/lib/install.js
+++ b/lib/install.js
@@ -31,7 +31,7 @@ module.exports = co.wrap(function* (version) {
// extract both zip and tarball
const from = `${cacheDir}/${version}.${ext}`
if (os.platform === 'linux') {
- exec(`tar -xzvf ${from}`, {silent: true})
+ exec(`tar -xzvf ${from} -C ${cacheDir}`, {silent: true})
} else {
yield pify(extract)(from, {dir: cacheDir})
}
|
extract to cacheDir, fixed #8
|
diff --git a/core/server/src/main/java/alluxio/master/file/FileSystemMaster.java b/core/server/src/main/java/alluxio/master/file/FileSystemMaster.java
index <HASH>..<HASH> 100644
--- a/core/server/src/main/java/alluxio/master/file/FileSystemMaster.java
+++ b/core/server/src/main/java/alluxio/master/file/FileSystemMaster.java
@@ -2490,6 +2490,10 @@ public final class FileSystemMaster extends AbstractMaster {
if ((ownerGroupChanged || permissionChanged) && inode.isPersisted()) {
MountTable.Resolution resolution = mMountTable.resolve(inodePath.getUri());
String ufsUri = resolution.getUri().toString();
+ if (CommonUtils.isUfsObjectStorage(ufsUri)) {
+ throw new AccessControlException(
+ "setOwner/setMode is not supported to object storage UFS via Alluxio. UFS: " + ufsUri);
+ }
UnderFileSystem ufs = resolution.getUfs();
if (ownerGroupChanged) {
try {
|
check the object storage UFS for setOwner/setMode
|
diff --git a/awesomplete.js b/awesomplete.js
index <HASH>..<HASH> 100644
--- a/awesomplete.js
+++ b/awesomplete.js
@@ -12,6 +12,8 @@ var _ = function (input, o) {
// Setup
+ this.isOpened = false;
+
this.input = $(input);
this.input.setAttribute("autocomplete", "off");
this.input.setAttribute("aria-autocomplete", "list");
@@ -143,7 +145,7 @@ _.prototype = {
},
get opened() {
- return !this.ul.hasAttribute("hidden");
+ return this.isOpened;
},
close: function (o) {
@@ -152,6 +154,7 @@ _.prototype = {
}
this.ul.setAttribute("hidden", "");
+ this.isOpened = false;
this.index = -1;
$.fire(this.input, "awesomplete-close", o || {});
@@ -159,6 +162,7 @@ _.prototype = {
open: function () {
this.ul.removeAttribute("hidden");
+ this.isOpened = true;
if (this.autoFirst && this.index === -1) {
this.goto(0);
|
Change getter for opened to use instance variable
|
diff --git a/code/cms/ShopConfig.php b/code/cms/ShopConfig.php
index <HASH>..<HASH> 100644
--- a/code/cms/ShopConfig.php
+++ b/code/cms/ShopConfig.php
@@ -34,6 +34,11 @@ class ShopConfig extends DataObjectDecorator{
$countriestab->setTitle("Allowed Countries");
}
+ /**
+ * Get list of allowed countries
+ * @param boolean $prefixisocode - prefix the country code
+ * @return array
+ */
function getCountriesList($prefixisocode = false){
$countries = Geoip::getCountryDropDown();
if($allowed = $this->owner->AllowedCountries){
@@ -49,4 +54,13 @@ class ShopConfig extends DataObjectDecorator{
return $countries;
}
+ /**
+ * Alias function for getting SiteConfig
+ * @return SiteConfig
+ */
+ static function current($locale = null){
+ return SiteConfig::current_site_config($locale);
+ }
+
+
}
\ No newline at end of file
|
API: created alias ShopConfig::current() which is just SiteConfig::current_site_config()
|
diff --git a/infra/aws/cluster/ips.js b/infra/aws/cluster/ips.js
index <HASH>..<HASH> 100644
--- a/infra/aws/cluster/ips.js
+++ b/infra/aws/cluster/ips.js
@@ -104,7 +104,7 @@ const ips = {
});
let params = {
- AllocationId: options.params.id
+ AllocationId: options.params.name
};
ec2.releaseAddress(params, cb);
|
slight modification in deletepublicip for aws
|
diff --git a/fireplace/card.py b/fireplace/card.py
index <HASH>..<HASH> 100644
--- a/fireplace/card.py
+++ b/fireplace/card.py
@@ -664,7 +664,8 @@ class Aura(BaseCard):
if self.isValidTarget(target):
if not target in self._buffed:
self._buff(target)
- for target in self._buffed:
+ # Make sure to copy the list as it can change during iteration
+ for target in self._buffed[:]:
# Remove auras no longer valid
if not self.isValidTarget(target):
for buff in self._buffs:
|
Fix an error due to aura list changing during iteration
|
diff --git a/web3/solidity/ureal.py b/web3/solidity/ureal.py
index <HASH>..<HASH> 100644
--- a/web3/solidity/ureal.py
+++ b/web3/solidity/ureal.py
@@ -8,8 +8,10 @@ class SolidityTypeUReal(types.SolidityType):
self._inputFormatter = f.formatInputReal
self._outputFormatter = f.formatOutputReal
+ @classmethod
def isType(self, name):
return re.match(r"^ureal([0-9]*)?(\[([0-9]*)\])*$", name) is not None
+ @classmethod
def staticPartLength(self, name):
return 32 * self.staticArrayLength(name)
\ No newline at end of file
|
Make isType, staticPartLength classmethods
|
diff --git a/app/medication/edit/route.js b/app/medication/edit/route.js
index <HASH>..<HASH> 100644
--- a/app/medication/edit/route.js
+++ b/app/medication/edit/route.js
@@ -30,8 +30,7 @@ export default AbstractEditRoute.extend(FulfillRequest, InventoryLocations, Pati
setupController: function(controller, model) {
this._super(controller, model);
var inventoryQuery = {
- startkey: ['Medication','inventory_'],
- endkey: ['Medication','inventory_\uffff'],
+ key: 'Medication',
include_docs: true,
};
var inventoryItem = model.get('inventoryItem'),
diff --git a/app/procedures/edit/route.js b/app/procedures/edit/route.js
index <HASH>..<HASH> 100644
--- a/app/procedures/edit/route.js
+++ b/app/procedures/edit/route.js
@@ -9,8 +9,7 @@ export default AbstractEditRoute.extend(ChargeRoute, {
setupController: function(controller, model) {
this._super(controller, model);
var medicationQuery = {
- startkey: ['Medication','inventory_'],
- endkey: ['Medication','inventory_\uffff'],
+ key: 'Medication',
include_docs: true,
};
this.controllerFor('pouchdb').queryMainDB(medicationQuery, 'inventory_by_type').then(function(result) {
|
Updated inventory_by_type view
|
diff --git a/course/modedit.php b/course/modedit.php
index <HASH>..<HASH> 100644
--- a/course/modedit.php
+++ b/course/modedit.php
@@ -345,9 +345,9 @@
}
foreach ($items as $itemid=>$unused) {
$items[$itemid]->set_parent($fromform->gradecat);
- if ($item->id == $grade_item->id) {
+ if ($itemid == $grade_item->id) {
// use updated grade_item
- $grade_item = $item;
+ $grade_item = $items[$itemid];
}
}
}
|
MDL-<I> Fixed the bug in modedit.php; Merging from MOODLE_<I>_STABLE
|
diff --git a/check50.py b/check50.py
index <HASH>..<HASH> 100755
--- a/check50.py
+++ b/check50.py
@@ -537,6 +537,8 @@ class Child(object):
pass
except EOF:
break
+ except UnicodeDecodeError:
+ raise Error("output not valid ASCII text")
else:
self.output.append(bytes)
else:
|
Catch UnicodeDecodeError in wait
|
diff --git a/satsearch/scene.py b/satsearch/scene.py
index <HASH>..<HASH> 100644
--- a/satsearch/scene.py
+++ b/satsearch/scene.py
@@ -70,7 +70,7 @@ class Scene(object):
@property
def assets(self):
""" Return dictionary of assets """
- return self.feature['assets']
+ return self.feature.get('assets', {})
#prefix = os.path.commonprefix(files)
#keys = [os.path.splitext(f[len(prefix):])[0] for f in files]
#links = dict(zip(keys, files))
@@ -78,7 +78,7 @@ class Scene(object):
@property
def links(self):
""" Return dictionary of links """
- return self.feature['links']
+ return self.feature.get('links', {})
@property
def eobands(self):
|
default to empty dictionary if links or assets does not exist
|
diff --git a/genmodel/manager.py b/genmodel/manager.py
index <HASH>..<HASH> 100644
--- a/genmodel/manager.py
+++ b/genmodel/manager.py
@@ -250,9 +250,15 @@ def run_job(job_description, job_id, job_name, labeled_data_fname, playbook_fnam
hosts_string={} -e job_id={} -e job_name={}'.format(
playbook_fname, hosts_string, job_id, job_name)
logger.info(ansible_command)
+ # subprocess.call is blocking, and this is IMPORTANT.
+ # if we switch to Popen, make sure the call is blocking.
subprocess.call(shlex.split(ansible_command))
logger.info("droplets working, job {}-{} started successfully".format(
job_name, job_id))
+
+ logger.info('removing temporary files created for this job')
+ os.remove(playbook_fname)
+ os.remove(labeled_data_fname)
except psycopg2.Error as e:
ref = 'https://www.postgresql.org/docs/current/static/errcodes-appendix.html'
logger.error('pgcode {}'.format(e.pgcode) + ref)
|
remove temporary playbook and labeled data files created for this job
|
diff --git a/src/registrations.js b/src/registrations.js
index <HASH>..<HASH> 100644
--- a/src/registrations.js
+++ b/src/registrations.js
@@ -52,7 +52,7 @@ export class SingletonRegistration {
let resolver = new StrategyResolver(1, fn);
if (!this.registerInChild && container !== container.root) {
- this.targetContainer = container.root;
+ resolver.targetContainer = container.root;
}
return resolver;
|
fix(registrations): move configuration to correct instance
|
diff --git a/tests/test_compile_to_code.py b/tests/test_compile_to_code.py
index <HASH>..<HASH> 100644
--- a/tests/test_compile_to_code.py
+++ b/tests/test_compile_to_code.py
@@ -99,7 +99,7 @@ def test_compile_to_code_custom_format():
assert exc.value.message == "data must be my-format"
-def test_compile_to_code_custom_format_with_refs():
+def test_compile_to_code_custom_format_with_refs(tmp_path, monkeypatch):
schema = {
'type': 'object',
'properties': {
@@ -115,9 +115,12 @@ def test_compile_to_code_custom_format_with_refs():
}
formats = {'my-format': str.isidentifier}
code = compile_to_code(schema, formats=formats)
- with open('temp/schema_4.py', 'w') as f:
- f.write(code)
- from temp.schema_4 import validate
+
+ (tmp_path / "schema_4.py").write_text(code)
+ with monkeypatch.context() as m:
+ m.syspath_prepend(tmp_path)
+ from schema_4 import validate
+
assert validate({"a": ["identifier"]}, formats) is not None
with pytest.raises(JsonSchemaValueException) as exc:
validate({"a": ["identifier", "not-valid"]}, formats)
|
Use temporary dir in tests for compiled code
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -12,6 +12,8 @@ try:
# test for 2.7-included packages, add to requirements if not available
install_requires = ['six', 'python-dateutil>=2.7']
+ python_requires='>=3.6'
+
# Additional dependencies from requirements.txt that should be installed
# for full mtools feature support. These are optional dependencies to
# simplify the default install experience, particularly where a build
|
Fix #<I>: require minimum of Python <I> in setup.py
|
diff --git a/internal/web3ext/web3ext.go b/internal/web3ext/web3ext.go
index <HASH>..<HASH> 100644
--- a/internal/web3ext/web3ext.go
+++ b/internal/web3ext/web3ext.go
@@ -313,8 +313,8 @@ web3._extend({
params: 2
}),
new web3._extend.Method({
- name: 'setMutexProfileRate',
- call: 'debug_setMutexProfileRate',
+ name: 'setMutexProfileFraction',
+ call: 'debug_setMutexProfileFraction',
params: 1
}),
new web3._extend.Method({
|
internal/web3ext: fix method name for enabling mutex profiling (#<I>)
|
diff --git a/src/PhpSlackBot/Command/PokerPlanningCommand.php b/src/PhpSlackBot/Command/PokerPlanningCommand.php
index <HASH>..<HASH> 100644
--- a/src/PhpSlackBot/Command/PokerPlanningCommand.php
+++ b/src/PhpSlackBot/Command/PokerPlanningCommand.php
@@ -105,7 +105,9 @@ class PokerPlanningCommand extends BaseCommand {
}
$message .= '------------------'."\n";
$message .= 'Average score : '.$this->getAverageScore()."\n";
- $message .= 'Median score : '.$this->getMedianScore();
+ $message .= 'Median score : '.$this->getMedianScore()."\n";
+ $message .= 'Max score : '.$this->getMaxScore()."\n";
+ $message .= 'Min score : '.$this->getMinScore();
}
$this->send($this->getCurrentChannel(), null, $message);
$this->status = 'free';
@@ -163,4 +165,12 @@ class PokerPlanningCommand extends BaseCommand {
return array(0, 1, 2, 3, 5, 8, 13, 20, 40, 100);
}
+ private function getMaxScore() {
+ return max($this->scores);
+ }
+
+ private function getMinScore() {
+ return min($this->scores);
+ }
+
}
\ No newline at end of file
|
Add max and min scores on pokerp end (#7)
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -82,6 +82,7 @@ class BuildProtoCommand(Command):
print ('This could be due to missing helper files. On many Linux '
'systems, this is fixed by installing the '
'"libprotobuf-dev" package.')
+ raise
else:
print 'Found no proto files to build.'
|
Re-raise when protoc fails during build_proto
|
diff --git a/tests/test_actions_class.py b/tests/test_actions_class.py
index <HASH>..<HASH> 100644
--- a/tests/test_actions_class.py
+++ b/tests/test_actions_class.py
@@ -44,3 +44,10 @@ class ActionsClassTests(TestCase):
@rule_action(params={'foo': 'blah'})
def some_action(self):
pass
+
+ def test_rule_action_with_no_params_or_label(self):
+ """ A rule action should not have to specify paramers or label. """
+ @rule_action()
+ def some_action(self): pass
+
+ self.assertTrue(some_action.is_rule_action)
|
Add test for no label or params on rule_action decorator
|
diff --git a/test/unit/model.js b/test/unit/model.js
index <HASH>..<HASH> 100644
--- a/test/unit/model.js
+++ b/test/unit/model.js
@@ -146,11 +146,37 @@ describe('ConvexModel', function () {
.with.property('id', 1);
});
- it('can handle data with new nested objects');
+ it('can handle data with new nested objects', function () {
+ model.$set({
+ rel1: {
+ foo: 'bar'
+ }
+ });
+ expect(model.rel1).to.have.property('foo', 'bar');
+ expect(model.rel1).to.have.property('id');
+ });
- it('can handle data with foreign keys and new nested objects');
+ it('can handle data with foreign keys and new nested objects', function () {
+ model.$set({
+ rel1_id: 1,
+ rel1: {
+ id: 1,
+ foo: 'bar'
+ }
+ });
+ });
- it('can handle models with existing nested objects');
+ it('can handle models with existing nested objects', function () {
+ model.rel1 = {
+ id: 1
+ };
+ model.$set({
+ rel1: {
+ foo: 'bar'
+ }
+ });
+ expect(model.rel1).to.have.property('id');
+ });
});
|
Add failing tests for deep related object merge behavior of $set
|
diff --git a/newsletter-bundle/contao/ModuleSubscribe.php b/newsletter-bundle/contao/ModuleSubscribe.php
index <HASH>..<HASH> 100644
--- a/newsletter-bundle/contao/ModuleSubscribe.php
+++ b/newsletter-bundle/contao/ModuleSubscribe.php
@@ -266,8 +266,8 @@ class ModuleSubscribe extends Module
// Activation e-mail
$objEmail = new Email();
- $strText = str_replace('##token##', $strToken, $strText);
- $strText = str_replace('##domain##', $this->Environment->host, $this->nl_subscribe);
+ $strText = str_replace('##token##', $strToken, $this->nl_subscribe);
+ $strText = str_replace('##domain##', $this->Environment->host, $strText);
$strText = str_replace('##link##', $this->Environment->base . $this->Environment->request . (($GLOBALS['TL_CONFIG']['disableAlias'] || strpos($this->Environment->request, '?') !== false) ? '&' : '?') . 'token=' . $strToken, $strText);
$strText = str_replace(array('##channel##', '##channels##'), implode("\n", $objChannel->fetchEach('title')), $strText);
|
[Newsletter] Added the wildcard ##token## to the newsletter subscription module (#<I>)
|
diff --git a/acorn/src/tokenize.js b/acorn/src/tokenize.js
index <HASH>..<HASH> 100644
--- a/acorn/src/tokenize.js
+++ b/acorn/src/tokenize.js
@@ -316,7 +316,7 @@ pp.readToken_question = function() { // '?'
pp.readToken_numberSign = function() { // '#'
const ecmaVersion = this.options.ecmaVersion
- let code = "#"
+ let code = 35 // '#'
if (ecmaVersion >= 13) {
++this.pos
code = this.fullCharCodeAtPos()
diff --git a/test/tests-class-features-2022.js b/test/tests-class-features-2022.js
index <HASH>..<HASH> 100644
--- a/test/tests-class-features-2022.js
+++ b/test/tests-class-features-2022.js
@@ -1755,6 +1755,9 @@ test("class C { #𩸽 }", {
"sourceType": "script"
}, {ecmaVersion: 13})
+// old ecma version
+testFail("class C { #aaa }", "Unexpected character '#' (1:10)", {ecmaVersion: 12})
+
// Unexpected character
testFail("class C { # aaa }", "Unexpected character ' ' (1:11)", {ecmaVersion: 13})
testFail("class C { #+aaa }", "Unexpected character '+' (1:11)", {ecmaVersion: 13})
|
fix `code` with code point
|
diff --git a/modules/newsadmin/models/Article.php b/modules/newsadmin/models/Article.php
index <HASH>..<HASH> 100644
--- a/modules/newsadmin/models/Article.php
+++ b/modules/newsadmin/models/Article.php
@@ -78,7 +78,7 @@ class Article extends \admin\ngrest\base\Model
$config->update->field('file_list', 'Datei Liste')->fileArray();
$config->update->extraField('tags', 'Tags')->checkboxRelation(\newsadmin\models\Tag::className(), 'news_article_tag', 'article_id', 'tag_id');
- $config->create->copyFrom('update', ['id']);
+ $config->create->copyFrom('update');
return $config;
}
|
fixed: Unable to remove field 'id' from 'update' config. The field does
not exists.
|
diff --git a/lib/devise/orm/data_mapper.rb b/lib/devise/orm/data_mapper.rb
index <HASH>..<HASH> 100644
--- a/lib/devise/orm/data_mapper.rb
+++ b/lib/devise/orm/data_mapper.rb
@@ -24,9 +24,10 @@ module Devise
def apply_schema(name, type, options={})
SCHEMA_OPTIONS.each do |old_key, new_key|
next unless options.key?(old_key)
- options[new_key] = !options.delete(old_key)
+ options[new_key] = options.delete(old_key)
end
+ options.delete(:default)
property name, type, options
end
end
@@ -81,6 +82,6 @@ module Devise
end
DataMapper::Model.class_eval do
- extend Devise::Orm::DataMapper::Hook
include Devise::Models
+ include Devise::Orm::DataMapper::Hook
end
|
Modified the datamapper orm so that it actually works with devise
|
diff --git a/undertow/src/main/java/org/wildfly/extension/undertow/deployment/WebParsingDeploymentProcessor.java b/undertow/src/main/java/org/wildfly/extension/undertow/deployment/WebParsingDeploymentProcessor.java
index <HASH>..<HASH> 100644
--- a/undertow/src/main/java/org/wildfly/extension/undertow/deployment/WebParsingDeploymentProcessor.java
+++ b/undertow/src/main/java/org/wildfly/extension/undertow/deployment/WebParsingDeploymentProcessor.java
@@ -118,7 +118,7 @@ public class WebParsingDeploymentProcessor implements DeploymentUnitProcessor {
warMetaData.setWebMetaData(webMetaData);
} catch (XMLStreamException e) {
- throw new DeploymentUnitProcessingException(MESSAGES.failToParseXMLDescriptor(webXml, e.getLocation().getLineNumber(), e.getLocation().getColumnNumber()));
+ throw new DeploymentUnitProcessingException(MESSAGES.failToParseXMLDescriptor(webXml, e.getLocation().getLineNumber(), e.getLocation().getColumnNumber()), e);
} catch (IOException e) {
throw new DeploymentUnitProcessingException(MESSAGES.failToParseXMLDescriptor(webXml), e);
} finally {
|
WFLY-<I> Don't lose the original parsing exception when throwing the DeploymentUnitProcessingException
|
diff --git a/chatterbot/adapters/io/io.py b/chatterbot/adapters/io/io.py
index <HASH>..<HASH> 100644
--- a/chatterbot/adapters/io/io.py
+++ b/chatterbot/adapters/io/io.py
@@ -7,6 +7,15 @@ class IOAdapter(object):
that all input-output adapters should implement.
"""
+ def __init__(self, **kwargs):
+ pass
+
+ def process_input(self):
+ """
+ Returns data retrieved from the input source.
+ """
+ raise AdapterNotImplementedError()
+
def process_response(self, input_value):
"""
Takes an input value.
diff --git a/chatterbot/chatterbot.py b/chatterbot/chatterbot.py
index <HASH>..<HASH> 100644
--- a/chatterbot/chatterbot.py
+++ b/chatterbot/chatterbot.py
@@ -26,7 +26,7 @@ class ChatBot(object):
self.logic = LogicAdapter()
IOAdapter = import_module(io_adapter)
- self.io = IOAdapter()
+ self.io = IOAdapter(**kwargs)
self.trainer = None
|
Kwargs are now passed to io adapter.
|
diff --git a/src/calmjs/cli.py b/src/calmjs/cli.py
index <HASH>..<HASH> 100644
--- a/src/calmjs/cli.py
+++ b/src/calmjs/cli.py
@@ -44,6 +44,8 @@ def _get_bin_version(bin_path, version_flag='-v', _from=None, _to=None):
class Cli(object):
+ indent = 4
+
def __init__(self, node_bin=NODE, npm_bin=NPM,
node_path=None):
"""
@@ -82,7 +84,7 @@ class Cli(object):
package_name, filename=PACKAGE_JSON)
with open(PACKAGE_JSON, 'w') as fd:
- json.dump(package_json, fd)
+ json.dump(package_json, fd, indent=self.indent)
call([self.npm_bin, 'install'])
|
Make the npm --init output also indented to 4.
|
diff --git a/src/data.js b/src/data.js
index <HASH>..<HASH> 100644
--- a/src/data.js
+++ b/src/data.js
@@ -1145,7 +1145,7 @@ var data = {
obj.fire("beforeDataSync");
this.callback !== null ? client.jsonp(this.uri, success, failure, {callback: this.callback})
- : client.request(this.uri, "GET", success, failure, utility.merge({withCredentials: this.credentials}, this.headers));
+ : client.request(this.uri, "GET", success, failure, null, utility.merge({withCredentials: this.credentials}, this.headers));
return this;
},
|
Fixing a regression in `data.sync()` caused by call stack optimization where HTTP headers were being passed as the request body
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.