diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/lib/util/console-logger.js b/lib/util/console-logger.js
index <HASH>..<HASH> 100644
--- a/lib/util/console-logger.js
+++ b/lib/util/console-logger.js
@@ -34,6 +34,7 @@ const hookConsoleLogging = (methodName, logCategory) => {
*/
exports.attach = () => {
hookConsoleLogging('log', 'info');
+ hookConsoleLogging('info', 'info');
hookConsoleLogging('warn', 'warn');
hookConsoleLogging('error', 'error');
};
\ No newline at end of file
|
fix (logging) console.info method is not being forwarded to Backendless.Logging
|
diff --git a/src/Graviton/RestBundle/Model/DocumentModel.php b/src/Graviton/RestBundle/Model/DocumentModel.php
index <HASH>..<HASH> 100644
--- a/src/Graviton/RestBundle/Model/DocumentModel.php
+++ b/src/Graviton/RestBundle/Model/DocumentModel.php
@@ -333,7 +333,7 @@ class DocumentModel extends SchemaModel implements ModelInterface
$searchArr = [];
foreach ($searchNode->getSearchTerms() as $string) {
if (!empty(trim($string))) {
- $searchArr[] = (strpos($string, '.') !== false) ? "\"{$string}\"" : $string;
+ $searchArr[] = "\"{$string}\"";
}
}
if (!empty($searchArr)) {
|
EVO-<I> Text search is more precise using strict string search.
|
diff --git a/scripts/postinstall.js b/scripts/postinstall.js
index <HASH>..<HASH> 100644
--- a/scripts/postinstall.js
+++ b/scripts/postinstall.js
@@ -27,12 +27,12 @@ function setupAutocomplete() {
const tabtabCliPath = path.join(tabtabPath, 'src', 'cli.js');
try {
- execSync(`node ${tabtabCliPath} install --name serverless --auto`);
- execSync(`node ${tabtabCliPath} install --name sls --auto`);
+ execSync(`node "${tabtabCliPath}" install --name serverless --auto`);
+ execSync(`node "${tabtabCliPath}" install --name sls --auto`);
return resolve();
} catch (error) {
- execSync(`node ${tabtabCliPath} install --name serverless --stdout`);
- execSync(`node ${tabtabCliPath} install --name sls --stdout`);
+ execSync(`node "${tabtabCliPath}" install --name serverless --stdout`);
+ execSync(`node "${tabtabCliPath}" install --name sls --stdout`);
console.log('Could not auto-install serverless autocomplete script.');
console.log('Please copy / paste the script above into your shell.');
return reject(error);
|
Updated postinstall.js to make it also work with spaces in path
|
diff --git a/test/test_api_dsc_cloudant.py b/test/test_api_dsc_cloudant.py
index <HASH>..<HASH> 100644
--- a/test/test_api_dsc_cloudant.py
+++ b/test/test_api_dsc_cloudant.py
@@ -88,6 +88,7 @@ class TestDscCloudant(testUtils.AbstractTest):
createdConnector = self.appClient.dsc.create(
name="test-connector-cloudant",
+ type="cloudant",
serviceId=createdService.id,
timezone="UTC",
description="A test connector",
diff --git a/test/test_api_dsc_eventstreams.py b/test/test_api_dsc_eventstreams.py
index <HASH>..<HASH> 100644
--- a/test/test_api_dsc_eventstreams.py
+++ b/test/test_api_dsc_eventstreams.py
@@ -96,6 +96,7 @@ class TestDscEventStreams(testUtils.AbstractTest):
createdConnector = self.appClient.dsc.create(
name="test-connector-eventstreams",
+ type="eventstreams",
serviceId=createdService.id,
timezone="UTC",
description="A test connector",
|
[patch] fixed dsc tests
|
diff --git a/tests/rackspace/requests/monitoring/check_tests.rb b/tests/rackspace/requests/monitoring/check_tests.rb
index <HASH>..<HASH> 100644
--- a/tests/rackspace/requests/monitoring/check_tests.rb
+++ b/tests/rackspace/requests/monitoring/check_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Rackspace::Monitoring | check_tests', ['rackspace', 'rackspacemonitoring']) do
+Shindo.tests('Fog::Rackspace::Monitoring | check_tests', ['rackspace', 'rackspace_monitoring']) do
pending if Fog.mocking?
account = Fog::Rackspace::Monitoring.new
@@ -11,7 +11,7 @@ Shindo.tests('Fog::Rackspace::Monitoring | check_tests', ['rackspace', 'rackspac
response
end
tests('#get check').formats(LIST_HEADERS_FORMAT) do
- account.get_check(entity_id,check_id).data
+ account.get_check(entity_id,check_id).data[:headers]
end
tests('#update check').formats(DATA_FORMAT) do
options = { :label => "Bar"}
|
Completed: get_check tests now working
|
diff --git a/src/Typeahead.react.js b/src/Typeahead.react.js
index <HASH>..<HASH> 100644
--- a/src/Typeahead.react.js
+++ b/src/Typeahead.react.js
@@ -132,7 +132,7 @@ class Typeahead extends React.Component {
text,
};
- const menu = renderMenu ?
+ const menu = typeof renderMenu === 'function' ?
renderMenu(results, menuProps) :
<TypeaheadMenu
{...menuProps}
|
Check that `renderMenu` is a function
|
diff --git a/coverage_reporter/reports/annotate.py b/coverage_reporter/reports/annotate.py
index <HASH>..<HASH> 100644
--- a/coverage_reporter/reports/annotate.py
+++ b/coverage_reporter/reports/annotate.py
@@ -1,12 +1,23 @@
import os
+import shutil
def add_options(parser):
parser.add_option('--annotate-dir', dest='annotate_dir', action='store', default='annotate')
def annotate(coverage_data, options):
annotate_dir = options.annotate_dir
+ if os.path.exists(annotate_dir):
+ for root, dirs, files in os.walk(annotate_dir, topdown=False):
+ dirs = [ x for x in dirs if os.path.exists(os.path.join(root, x)) ]
+ to_remove = [ x for x in files if x.endswith(',cover') ]
+ to_keep = [ x for x in files if not x in to_remove ]
+ for x in to_remove:
+ os.remove(os.path.join(root, x))
+ if not (dirs or to_keep):
+ os.rmdir(root)
if not os.path.exists(annotate_dir):
os.makedirs(annotate_dir)
+
curdir = os.getcwd()
for path, lines in coverage_data.get_lines().iteritems():
(total_lines, covered_lines) = lines
|
Remove existing annotated files on creation of new ones.
|
diff --git a/docusaurus/docusaurus.config.js b/docusaurus/docusaurus.config.js
index <HASH>..<HASH> 100644
--- a/docusaurus/docusaurus.config.js
+++ b/docusaurus/docusaurus.config.js
@@ -70,7 +70,7 @@ module.exports = {
},
theme: {
- // customCss: require.resolve('./src/theme/ReactLiveScope/index.scss'),
+ customCss: require.resolve('./src/theme/ReactLiveScope/index.scss'),
},
},
],
|
feat(dinosaurdocs): add custom sass
|
diff --git a/salt/modules/mysql.py b/salt/modules/mysql.py
index <HASH>..<HASH> 100644
--- a/salt/modules/mysql.py
+++ b/salt/modules/mysql.py
@@ -978,7 +978,10 @@ def user_grants(user,
ret = []
results = cur.fetchall()
for grant in results:
- ret.append(grant[0].split(' IDENTIFIED BY')[0])
+ tmp = grant[0].split(' IDENTIFIED BY')[0]
+ if 'WITH GRANT OPTION' in grant[0]:
+ tmp = '{} WITH GRANT OPTION'.format(tmp)
+ ret.append(tmp)
log.debug(ret)
return ret
|
salt.states.mysql_grants:
When grant_option=True, then this state is never succeed as 'WITH GRANT
OPTION' is cut off while checking for user grants. But actual grants are
set properly.
Fixed.
|
diff --git a/MAPKIT/mapkit/__init__.py b/MAPKIT/mapkit/__init__.py
index <HASH>..<HASH> 100644
--- a/MAPKIT/mapkit/__init__.py
+++ b/MAPKIT/mapkit/__init__.py
@@ -10,4 +10,7 @@
from sqlalchemy.ext.declarative import declarative_base
-Base = declarative_base()
\ No newline at end of file
+Base = declarative_base()
+
+def version():
+ return '0.0.5'
\ No newline at end of file
diff --git a/MAPKIT/setup.py b/MAPKIT/setup.py
index <HASH>..<HASH> 100644
--- a/MAPKIT/setup.py
+++ b/MAPKIT/setup.py
@@ -7,7 +7,7 @@ requires = [
]
setup(name='mapkit',
- version='0.0.3',
+ version='0.0.4',
description='Mapping tools for PostGIS-enabled PostgreSQL databases.',
long_description='',
author='Nathan Swain',
|
Final changes before <I> release.
|
diff --git a/static/seriously.js b/static/seriously.js
index <HASH>..<HASH> 100755
--- a/static/seriously.js
+++ b/static/seriously.js
@@ -15,7 +15,7 @@ function genChar() {
if(!code)
return;
$('#code').val($('#code').val() + cp437.encode(parseInt(code)));
- updateByteCount();
+ updateUtils();
};
function getByteCount(s) {
@@ -109,7 +109,9 @@ function updateHexDump() {
var hex = '';
var code = $('#code').val();
for(var i = 0; i < code.length; i++) {
- hex += cp437.decode(code.charAt(i)).toString(16);
+ var hexi = cp437.decode(code.charAt(i)).toString(16);
+ if(hexi.length < 2) hexi = "0" + hexi;
+ hex+=hexi;
}
$('#hexdump').val(hex);
}
|
update stuff when inserting a character
|
diff --git a/openquake/calculators/classical.py b/openquake/calculators/classical.py
index <HASH>..<HASH> 100644
--- a/openquake/calculators/classical.py
+++ b/openquake/calculators/classical.py
@@ -310,7 +310,8 @@ class ClassicalCalculator(base.HazardCalculator):
self.datastore['csm_info'] = self.csm_info
return {}
smap = parallel.Starmap(
- self.core_task.__func__, h5=self.datastore.hdf5)
+ self.core_task.__func__, h5=self.datastore.hdf5,
+ num_cores=oq.num_cores)
smap.task_queue = list(self.gen_task_queue()) # really fast
acc0 = self.acc0() # create the rup/ datasets BEFORE swmr_on()
self.datastore.swmr_on()
|
Fixed num_cores in classical [skip CI]
Former-commit-id: b<I>f5a<I>acd3ff0a4e<I>bac<I>b<I>bce9bb
|
diff --git a/lib/transforms/inlineAngularJsTemplates.js b/lib/transforms/inlineAngularJsTemplates.js
index <HASH>..<HASH> 100644
--- a/lib/transforms/inlineAngularJsTemplates.js
+++ b/lib/transforms/inlineAngularJsTemplates.js
@@ -26,6 +26,7 @@ module.exports = function (queryObj) {
relationToInline.detach();
} else {
id = relationToInline.href;
+ relationToInline.remove();
}
if (!alreadyInlinedById[id]) {
var node = document.createElement('script');
|
inlineAngularJsTemplate: Remove the existing JavaScriptAngularJsTemplate relations. Prevents the templates from getting cloned.
|
diff --git a/lib/active_enum/extensions.rb b/lib/active_enum/extensions.rb
index <HASH>..<HASH> 100644
--- a/lib/active_enum/extensions.rb
+++ b/lib/active_enum/extensions.rb
@@ -125,14 +125,15 @@ module ActiveEnum
# user.sex?(:male)
#
def define_active_enum_question_method(attribute)
- define_method("#{attribute}?") do |*arg|
- arg = arg.first
- if arg
- send(attribute) == self.class.active_enum_for(attribute)[arg]
- else
- super()
+ class_eval <<-DEF
+ def #{attribute}?(*args)
+ if args.first
+ #{attribute} == self.class.active_enum_for(:#{attribute})[args.first]
+ else
+ super()
+ end
end
- end
+ DEF
end
end
|
Remove define_method usage which is slower
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ from setuptools import setup
setup(
name='upcloud-api',
- version='0.4.4',
+ version='0.4.5',
description='UpCloud API Client',
author='Elias Nygren',
maintainer='Mika Lackman',
|
version: update to <I>
|
diff --git a/test/tc_multiarray.rb b/test/tc_multiarray.rb
index <HASH>..<HASH> 100644
--- a/test/tc_multiarray.rb
+++ b/test/tc_multiarray.rb
@@ -85,5 +85,13 @@ class TC_MultiArray < Test::Unit::TestCase
end
end
+ def test_at_assign
+ for t in @@types
+ m = Hornetseye::MultiArray.new t, 3, 2
+ m[] = 0
+ assert_equal [ [ 0, 0, 0 ], [ 0, 0, 0 ] ], m.to_a
+ end
+ end
+
end
|
Added a test for multi-dimensional assignments
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -1,10 +1,7 @@
module.exports = function (inputArray, singleCb, finalCb) {
-var len = inputArray.length;
-var lenTarget = 0;
-
-for (i = 0; i < len; i++) {
+for (let i = 0, len = inputArray.length, lenTarget = 0; i < len; i++) {
(function() {
- var ii = i;
+ let ii = i;
process.nextTick( function(){
singleCb(inputArray[ii]);
lenTarget++;
@@ -15,4 +12,4 @@ for (i = 0; i < len; i++) {
});
})();
}
-}
\ No newline at end of file
+}
|
Update variable handling
Moved all variables into the for loop declaration. Changed to let, instead of var.
|
diff --git a/src/test/java/com/adobe/epubcheck/cli/CheckerIT.java b/src/test/java/com/adobe/epubcheck/cli/CheckerIT.java
index <HASH>..<HASH> 100644
--- a/src/test/java/com/adobe/epubcheck/cli/CheckerIT.java
+++ b/src/test/java/com/adobe/epubcheck/cli/CheckerIT.java
@@ -21,7 +21,7 @@ public class CheckerIT
{
try
{
- Process process = run(valid30EPUB + "minimal.epub");
+ Process process = run(valid30EPUB + "ocf-minimal-valid.epub");
InputStream stderr = process.getErrorStream();
process.waitFor();
assertEmpty(stderr);
|
test: fix CheckerIT test after renaming the minimal packaged EPUB 3
|
diff --git a/lib/trestle/controller/location.rb b/lib/trestle/controller/location.rb
index <HASH>..<HASH> 100644
--- a/lib/trestle/controller/location.rb
+++ b/lib/trestle/controller/location.rb
@@ -4,11 +4,15 @@ module Trestle
extend ActiveSupport::Concern
included do
- after_action :set_trestle_location_header, unless: :dialog_request?
+ after_action :set_trestle_location_header
end
+ # The X-Trestle-Location header is set to indicate that the remote form has triggered
+ # a new page URL (e.g. new -> show) without demanding a full page refresh.
def set_trestle_location_header
- headers["X-Trestle-Location"] = request.path
+ unless dialog_request? || response.location
+ headers["X-Trestle-Location"] = request.path
+ end
end
end
end
|
Do not set X-Trestle-Location header when Location header is set
|
diff --git a/ariba/sequence_metadata.py b/ariba/sequence_metadata.py
index <HASH>..<HASH> 100644
--- a/ariba/sequence_metadata.py
+++ b/ariba/sequence_metadata.py
@@ -27,7 +27,7 @@ class SequenceMetadata:
def __eq__(self, other):
- return type(other) is type(self) and self.name == other.name and self.seq_type == other.seq_type and self.var_only == other.var_only and self.variant == other.variant and self.free_text == other.free_text
+ return type(other) is type(self) and self.name == other.name and self.seq_type == other.seq_type and self.variant_only == other.variant_only and self.variant == other.variant and self.free_text == other.free_text
def __lt__(self, other):
|
Typo in variable name in __eq__
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,8 @@ local_file = lambda *f: \
open(os.path.join(os.path.dirname(__file__), *f)).read()
-tests_require = ['nose', 'mock']
+install_requires = ['mock', 'six']
+tests_require = ['nose']
if __name__ == '__main__':
@@ -58,6 +59,7 @@ if __name__ == '__main__':
include_package_data=True,
url='http://github.com/gabrielfalcao/sure',
packages=find_packages(exclude=['*tests*']),
+ install_requires=install_requires,
tests_require=tests_require,
test_suite='nose.collector',
)
|
Added 'six' to install requirements in setup.py
|
diff --git a/Gruntfile.js b/Gruntfile.js
index <HASH>..<HASH> 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -392,7 +392,7 @@ module.exports = function ( grunt ) {
] );
grunt.registerTask( 'lint', [ 'jshint', 'jscs', 'csslint', 'banana' ] );
- grunt.registerTask( 'test', [ 'pre-test', 'git-build', 'lint', 'karma:main', 'karma:other' ] );
+ grunt.registerTask( 'test', [ 'lint', 'pre-test', 'git-build', 'karma:main', 'karma:other' ] );
grunt.registerTask( 'default', 'test' );
};
|
build: Run lint before build in grunt-test
Saves about 1-2 minutes in terms of feedback during development.
Change-Id: Ia<I>f<I>de<I>c4af6e<I>bffe<I>f<I>c<I>e<I>e<I>
|
diff --git a/lib/dash/mpd_processor.js b/lib/dash/mpd_processor.js
index <HASH>..<HASH> 100644
--- a/lib/dash/mpd_processor.js
+++ b/lib/dash/mpd_processor.js
@@ -1064,6 +1064,7 @@ shaka.dash.MpdProcessor.prototype.makeSegmentIndexSourceViaSegmentTemplate_ =
}
shaka.asserts.unreachable();
+ return null;
};
|
Silence a warning about missing return
Some versions of the compiler do not seem to recognize this as
unreachable, so add a return to satisfy the compiler and silence
the warning.
Change-Id: I<I>d<I>be<I>b6c4f<I>e<I>cb4c<I>
|
diff --git a/structr-ui/src/main/java/org/structr/web/servlet/HtmlServlet.java b/structr-ui/src/main/java/org/structr/web/servlet/HtmlServlet.java
index <HASH>..<HASH> 100644
--- a/structr-ui/src/main/java/org/structr/web/servlet/HtmlServlet.java
+++ b/structr-ui/src/main/java/org/structr/web/servlet/HtmlServlet.java
@@ -301,6 +301,9 @@ public class HtmlServlet extends HttpServlet implements HttpServiceServlet {
if (!securityContext.isVisible(rootElement)) {
rootElement = notFound(response, securityContext);
+ if (rootElement == null) {
+ return;
+ }
}
|
Always return if <I> to avoid exceptions about already committed response.
|
diff --git a/gems/stomp/lib/torquebox-stomp.rb b/gems/stomp/lib/torquebox-stomp.rb
index <HASH>..<HASH> 100644
--- a/gems/stomp/lib/torquebox-stomp.rb
+++ b/gems/stomp/lib/torquebox-stomp.rb
@@ -17,6 +17,11 @@
require 'torquebox/stomp/jms_stomplet'
require 'torquebox/stomp/message'
-require 'torquebox/stomp/ext/stomplet_config'
-require 'torquebox/stomp/ext/stomp_session'
require 'torquebox/stomp/rack/stomp_javascript_client_provider'
+begin
+ require 'torquebox/stomp/ext/stomplet_config'
+ require 'torquebox/stomp/ext/stomp_session'
+rescue NameError
+ # This is expected if torquebox-stomp gets loaded when not running
+ # inside TorqueBox, like in Rake tasks.
+end
|
Ensure torquebox-stomp doesn't prevent rake tasks from working (TORQUE-<I>)
|
diff --git a/src/REST/keywords.py b/src/REST/keywords.py
index <HASH>..<HASH> 100644
--- a/src/REST/keywords.py
+++ b/src/REST/keywords.py
@@ -1029,7 +1029,7 @@ class Keywords(object):
"""
if isinstance(what, (STRING_TYPES)):
if what == "":
- message = "\nThe instance JSON Schema is:"
+ message = "\nThe current instance JSON Schema is:"
try:
json = self._last_instance_or_error()['schema']
except IndexError:
@@ -1110,7 +1110,7 @@ class Keywords(object):
"""
if isinstance(what, (STRING_TYPES)):
if what == "":
- message = "\nThe instance as JSON is:"
+ message = "\nThe current instance is:"
try:
json = deepcopy(self._last_instance_or_error())
json.pop('schema')
|
Slightly improve `Output` and `Output Schema` headings
|
diff --git a/actor-system.js b/actor-system.js
index <HASH>..<HASH> 100644
--- a/actor-system.js
+++ b/actor-system.js
@@ -457,6 +457,9 @@ class ActorSystem {
// Use 'getName' getter, if present.
if (_.isFunction(Behaviour.getName)) return Behaviour.getName();
+ // Take 'actorName' field, if present.
+ if (Behaviour.actorName) return _.result(Behaviour, 'actorName');
+
// Take 'name' field, if present.
if (Behaviour.name) return _.result(Behaviour, 'name');
|
(saymon) object-concurrency-fix: Switched TypeScript actors from getName() method to actorName property.
|
diff --git a/sqlbrite/src/main/java/com/squareup/sqlbrite/BackpressureBufferLastOperator.java b/sqlbrite/src/main/java/com/squareup/sqlbrite/BackpressureBufferLastOperator.java
index <HASH>..<HASH> 100644
--- a/sqlbrite/src/main/java/com/squareup/sqlbrite/BackpressureBufferLastOperator.java
+++ b/sqlbrite/src/main/java/com/squareup/sqlbrite/BackpressureBufferLastOperator.java
@@ -43,8 +43,8 @@ final class BackpressureBufferLastOperator<T> implements Operator<T, T> {
private final Subscriber<? super T> child;
- private volatile Object last = NONE; // Guarded by 'this'.
- private volatile long requested; // Guarded by 'this'. Starts at zero.
+ private Object last = NONE; // Guarded by 'this'.
+ private long requested; // Guarded by 'this'. Starts at zero.
final Producer producer = new Producer() {
@Override public void request(long n) {
|
Remove unnecessary volatile keyword being used in BackpressureBufferLastOperator class.
|
diff --git a/tests/integration/test_package.py b/tests/integration/test_package.py
index <HASH>..<HASH> 100644
--- a/tests/integration/test_package.py
+++ b/tests/integration/test_package.py
@@ -52,7 +52,7 @@ def _get_random_package_name():
reason='Extended packaging tests only run on py3.')
@pytest.mark.parametrize(
'package,contents', [
- ('pandas==1.0.3', [
+ ('pandas==1.1.5', [
'pandas/_libs/__init__.py',
'pandas/io/sas/_sas.cpython-*-x86_64-linux-gnu.so']),
('SQLAlchemy==1.3.20', [
@@ -142,12 +142,12 @@ class TestPackage(object):
)
@pytest.mark.skipif(sys.version_info[0] == 2,
- reason='pandas==1.0.3 is only suported on py3.')
+ reason='pandas==1.1.5 is only suported on py3.')
def test_can_package_pandas(self, runner, app_skeleton, no_local_config):
assert_can_package_dependency(
runner,
app_skeleton,
- 'pandas==1.0.3',
+ 'pandas==1.1.5',
contents=[
'pandas/_libs/__init__.py',
],
|
Pin pandas installed by tests to <I>
<I> is the latest version that supports both Python <I> and <I>.
|
diff --git a/geomdl/construct.py b/geomdl/construct.py
index <HASH>..<HASH> 100644
--- a/geomdl/construct.py
+++ b/geomdl/construct.py
@@ -20,7 +20,7 @@ def construct_surface(*args, **kwargs):
:rtype: NURBS.Surface
"""
# Get keyword arguments
- degree_v = kwargs.get('degree_v', 2)
+ degree_v = kwargs.get('degree', 2)
size_v = len(args)
if size_v < 2:
@@ -58,7 +58,7 @@ def construct_volume(*args, **kwargs):
:rtype: NURBS.Volume
"""
# Get keyword arguments
- degree_w = kwargs.get('degree_w', 2)
+ degree_w = kwargs.get('degree', 2)
size_w = len(args)
if size_w < 2:
|
Rename keyword argument for surface and volume constructors
|
diff --git a/state/tracker_test.go b/state/tracker_test.go
index <HASH>..<HASH> 100644
--- a/state/tracker_test.go
+++ b/state/tracker_test.go
@@ -357,3 +357,31 @@ func TestSTIsOn(t *testing.T) {
}
m.CheckNothingWritten(t)
}
+
+func TestSTAssociate(t *testing.T) {
+ l, m := logging.NewMock()
+ l.SetLogLevel(logging.Debug)
+ st := NewTracker("mynick", l)
+
+ nick1 := st.NewNick("test1")
+ chan1 := st.NewChannel("#test1")
+
+ st.Associate(chan1, nick1)
+ m.CheckNothingWritten(t)
+ if !st.IsOn("#test1", "test1") {
+ t.Errorf("test1 was not associated with #test1.")
+ }
+
+ // Test error cases
+ st.Associate(nil, nick1)
+ m.CheckWrittenAtLevel(t, logging.Error,
+ "StateTracker.Associate(): passed nil values :-(")
+
+ st.Associate(chan1, nil)
+ m.CheckWrittenAtLevel(t, logging.Error,
+ "StateTracker.Associate(): passed nil values :-(")
+
+ st.Associate(chan1, nick1)
+ m.CheckWrittenAtLevel(t, logging.Warn,
+ "StateTracker.Associate(): test1 already on #test1.")
+}
|
Test nick <-> channel association.
|
diff --git a/NavigationReactNative/sample/web/Motion.js b/NavigationReactNative/sample/web/Motion.js
index <HASH>..<HASH> 100644
--- a/NavigationReactNative/sample/web/Motion.js
+++ b/NavigationReactNative/sample/web/Motion.js
@@ -28,7 +28,7 @@ class Motion extends React.Component {
.map(item => {
var end = !dataByKey[item.key] ? leave(item.data) : update(item.data);
var equal = this.areEqual(item.end, end);
- var rest = item.progress === 1;
+ var rest = equal ? item.progress === 1 : false;
var progress = equal ? Math.max(Math.min(item.progress + ((tick - item.tick) / 500), 1), 0) : 0;
var interpolators = equal ? item.interpolators : this.getInterpolators(item.style, end);
var style = this.interpolateStyle(interpolators, end, progress);
|
Reset rest if target changed
The left items were instantly removed because rest was set to true
|
diff --git a/test.js b/test.js
index <HASH>..<HASH> 100644
--- a/test.js
+++ b/test.js
@@ -82,7 +82,9 @@ describe('pathCompleteExtname', function () {
// ---
- it('should retrieve simple file extensions', function () {
+ it('should retrieve file extensions with two dots', function () {
+ assert.equal(pathCompleteExtname('jquery.min.js'), '.min.js');
+ assert.equal(pathCompleteExtname('package.tar.gz'), '.tar.gz');
});
});
|
Added tests for file extensions with two dots
|
diff --git a/salt/modules/defaults.py b/salt/modules/defaults.py
index <HASH>..<HASH> 100644
--- a/salt/modules/defaults.py
+++ b/salt/modules/defaults.py
@@ -118,7 +118,7 @@ def get(key, default=''):
defaults = _load(pillar_name, defaults_path)
- value = __salt__['pillar.get']("%s:%s" % (pillar_name, key), None)
+ value = __salt__['pillar.get']('{0}:{1}'.format(pillar_name, key), None)
if value is None:
value = salt.utils.traverse_dict(defaults, key, None)
|
Using .format to build the pillar key as requested
|
diff --git a/src/Response.php b/src/Response.php
index <HASH>..<HASH> 100644
--- a/src/Response.php
+++ b/src/Response.php
@@ -45,7 +45,7 @@ class Response
*
* @var int
*/
- public $status = HttpResponse::HTTP_OK;
+ public $status;
/**
* If should enable zlib compression when appropriate
@@ -64,8 +64,10 @@ class Response
*/
public function output()
{
- if (empty($this->body)) {
- $this->status = HttpResponse::HTTP_NO_CONTENT;
+ if ($this->status === null) {
+ $this->status = (empty($this->body))
+ ? HttpResponse::HTTP_NO_CONTENT
+ : HttpResponse::HTTP_OK;
}
if ($this->request_method === 'HEAD'
|
Update Response
$status does not have a default value,
but has as fallback if unset on output()
|
diff --git a/Library/ArgInfoDefinition.php b/Library/ArgInfoDefinition.php
index <HASH>..<HASH> 100644
--- a/Library/ArgInfoDefinition.php
+++ b/Library/ArgInfoDefinition.php
@@ -1,7 +1,5 @@
<?php
-declare(strict_types=1);
-
/**
* This file is part of the Zephir.
*
@@ -11,11 +9,10 @@ declare(strict_types=1);
* the LICENSE file that was distributed with this source code.
*/
+declare(strict_types=1);
+
namespace Zephir;
-/**
- * Zephir\ArgInfoDefinition.
- */
class ArgInfoDefinition
{
/**
@@ -65,14 +62,14 @@ class ArgInfoDefinition
* @param ClassMethod $functionLike
* @param CodePrinter $codePrinter
* @param CompilationContext $compilationContext
- * @param false $returnByRef
+ * @param bool $returnByRef
*/
public function __construct(
$name,
ClassMethod $functionLike,
CodePrinter $codePrinter,
CompilationContext $compilationContext,
- $returnByRef = false
+ bool $returnByRef = false
) {
$this->functionLike = $functionLike;
$this->codePrinter = $codePrinter;
|
#<I> - Minor code refactor
|
diff --git a/src/Arrays/Iterator.php b/src/Arrays/Iterator.php
index <HASH>..<HASH> 100644
--- a/src/Arrays/Iterator.php
+++ b/src/Arrays/Iterator.php
@@ -80,8 +80,8 @@ class Iterator extends RecursiveArrayIterator
*/
public function getChildren()
{
- if ($this->hasChildren()) return $this->current();
-
+ if ($this->hasChildren()) return $this->current()->getIterator();
+
throw new InvalidArgumentException('Current item not an array!');
}
}
\ No newline at end of file
|
The getChildren method should really return another iterator.
|
diff --git a/scripts/get-latest-platform-tests.js b/scripts/get-latest-platform-tests.js
index <HASH>..<HASH> 100644
--- a/scripts/get-latest-platform-tests.js
+++ b/scripts/get-latest-platform-tests.js
@@ -1,5 +1,9 @@
"use strict";
+if (process.env.NO_UPDATE) {
+ process.exit(0);
+}
+
const path = require("path");
const fs = require("fs");
const request = require("request");
|
Provide an env variable to disable update of test script
|
diff --git a/test.js b/test.js
index <HASH>..<HASH> 100644
--- a/test.js
+++ b/test.js
@@ -35,11 +35,11 @@ describe('when only headers was sent', function () {
before(function (done) {
server = http.createServer(function (request, res) {
+ res.writeHead(200, {'content-type':'text/plain'});
+ res.write('waited');
setTimeout(function() {
- res.writeHead(200, {'content-type':'text/plain'});
- res.write('waited');
res.end();
- }, 200);
+ }, 1000);
});
server.listen(8081, function (err) {
@@ -61,6 +61,6 @@ describe('when only headers was sent', function () {
}
});
- timeout(req, 400);
+ timeout(req, 200);
});
});
|
Fixed tests on <I> and iojs
|
diff --git a/agent/config/builder.go b/agent/config/builder.go
index <HASH>..<HASH> 100644
--- a/agent/config/builder.go
+++ b/agent/config/builder.go
@@ -387,7 +387,7 @@ func (b *Builder) Build() (rt RuntimeConfig, err error) {
return RuntimeConfig{}, fmt.Errorf("No %s address found", addrtyp)
}
if len(advertiseAddrs) > 1 {
- return RuntimeConfig{}, fmt.Errorf("Multiple %s addresses found. Please configure one", addrtyp)
+ return RuntimeConfig{}, fmt.Errorf("Multiple %s addresses found. Please configure one with 'bind' and/or 'advertise'.", addrtyp)
}
advertiseAddr = advertiseAddrs[0]
}
|
Adds more info about how to fix the private IP error.
Closes #<I>
|
diff --git a/classes/Flatfile/Core.php b/classes/Flatfile/Core.php
index <HASH>..<HASH> 100644
--- a/classes/Flatfile/Core.php
+++ b/classes/Flatfile/Core.php
@@ -325,19 +325,20 @@ class Flatfile_Core {
// Match on property, terms and other stuffs
// TODO
+ // Natural sort ordering
+ natsort($this->_files);
+
+ // Ordering files
+ if ($this->_order === 'desc')
+ {
+ $this->_files = array_reverse($this->_files, TRUE);
+ }
+
// if ($multiple === TRUE)
if ($multiple === TRUE OR $this->_query)
{
// Loading multiple Flatfile
$result = array();
- // Natural sort ordering
- natsort($this->_files);
-
- // Ordering files
- if ($this->_order === 'desc')
- {
- $this->_files = array_reverse($this->_files, TRUE);
- }
// Each md file is load in array and returned
foreach ($this->_files as $slug => $file)
|
Enable sorting for a sinlge entry also
|
diff --git a/spec/lock_jar/maven_spec.rb b/spec/lock_jar/maven_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/lock_jar/maven_spec.rb
+++ b/spec/lock_jar/maven_spec.rb
@@ -4,6 +4,11 @@ require 'lib/lock_jar/maven'
require 'naether'
describe LockJar::Maven do
+ before do
+ # Bootstrap Naether
+ Naether::Bootstrap.bootstrap_local_repo
+ end
+
context "Class" do
it "should get pom version" do
LockJar::Maven.pom_version( "spec/pom.xml" ).should eql( "3" )
|
ensure naether is bootstrapped for the tests
|
diff --git a/lib/ts_routes/version.rb b/lib/ts_routes/version.rb
index <HASH>..<HASH> 100644
--- a/lib/ts_routes/version.rb
+++ b/lib/ts_routes/version.rb
@@ -1,5 +1,5 @@
# frozen_string_literal: true
module TsRoutes
- VERSION = "1.0.2"
+ VERSION = "1.0.3"
end
|
Bump up version to <I>
|
diff --git a/sprd/util/ProductUtil.js b/sprd/util/ProductUtil.js
index <HASH>..<HASH> 100644
--- a/sprd/util/ProductUtil.js
+++ b/sprd/util/ProductUtil.js
@@ -18,7 +18,13 @@ define(["underscore", "sprd/util/ArrayUtil", "js/core/List", "sprd/model/Product
},
getPossiblePrintTypesForDesignOnProduct: function (design, product) {
- return this.getPossiblePrintTypesForDesignOnPrintArea(design, product.$.view.getDefaultPrintArea(), product.$.appearance.$.id);
+ var defaultPrintArea = product.$.view.getDefaultPrintArea();
+
+ if (!defaultPrintArea) {
+ return [];
+ }
+
+ return this.getPossiblePrintTypesForDesignOnPrintArea(design, defaultPrintArea, product.$.appearance.$.id);
},
|
fixed exception, if view doesn't have a print area
|
diff --git a/dev/idangerous.swiper.js b/dev/idangerous.swiper.js
index <HASH>..<HASH> 100644
--- a/dev/idangerous.swiper.js
+++ b/dev/idangerous.swiper.js
@@ -1107,7 +1107,8 @@ var Swiper = function (selector, params) {
if(!isTouchEvent) {
// Added check for input element since we are getting a mousedown event even on some touch devices.
- if (!(params.releaseFormElements && event.srcElement.tagName.toLowerCase() === 'input')) {
+ target = event.srcElement || event.target;
+ if (!(params.releaseFormElements && target.tagName.toLowerCase() === 'input')) {
if (event.preventDefault) event.preventDefault();
else event.returnValue = false;
}
|
Firefox can't handle event.srcElement, added fallback to event.target
|
diff --git a/pandas/tests/io/test_parquet.py b/pandas/tests/io/test_parquet.py
index <HASH>..<HASH> 100644
--- a/pandas/tests/io/test_parquet.py
+++ b/pandas/tests/io/test_parquet.py
@@ -671,6 +671,17 @@ class TestParquetPyArrow(Base):
df = pd.DataFrame({"a": pd.date_range("2017-01-01", freq="1n", periods=10)})
check_round_trip(df, pa, write_kwargs={"version": "2.0"})
+ @td.skip_if_no("pyarrow", min_version="0.17")
+ def test_filter_row_groups(self, pa):
+ # https://github.com/pandas-dev/pandas/issues/26551
+ df = pd.DataFrame({"a": list(range(0, 3))})
+ with tm.ensure_clean() as path:
+ df.to_parquet(path, pa)
+ result = read_parquet(
+ path, pa, filters=[("a", "==", 0)], use_legacy_dataset=False
+ )
+ assert len(result) == 1
+
class TestParquetFastParquet(Base):
@td.skip_if_no("fastparquet", min_version="0.3.2")
|
TST: ensure read_parquet filter argument is correctly passed though (pyarrow engine) (#<I>)
|
diff --git a/commons/src/main/java/com/stratio/streaming/commons/kafka/service/TopicService.java b/commons/src/main/java/com/stratio/streaming/commons/kafka/service/TopicService.java
index <HASH>..<HASH> 100644
--- a/commons/src/main/java/com/stratio/streaming/commons/kafka/service/TopicService.java
+++ b/commons/src/main/java/com/stratio/streaming/commons/kafka/service/TopicService.java
@@ -15,7 +15,9 @@
*/
package com.stratio.streaming.commons.kafka.service;
-public interface TopicService {
+import java.io.Closeable;
+
+public interface TopicService extends Closeable {
void createTopicIfNotExist(String topic, int replicationFactor, int partitions);
|
added new nethods to IStratioStreamingApi trait: withServerConfig, init, and close.
|
diff --git a/lib/media-stream.js b/lib/media-stream.js
index <HASH>..<HASH> 100644
--- a/lib/media-stream.js
+++ b/lib/media-stream.js
@@ -14,6 +14,8 @@ function MediaStream (media, opts) {
if (!(self instanceof MediaStream)) return new MediaStream(media, opts)
stream.Writable.call(self, opts)
+ if (!MediaSource) throw new Error('web browser lacks MediaSource support')
+
self.media = media
opts = opts || {}
opts.type = opts.type || 'video/webm; codecs="vorbis,vp8"'
|
detect browsers that lack MediaSource support
|
diff --git a/lxd/db/instances.go b/lxd/db/instances.go
index <HASH>..<HASH> 100644
--- a/lxd/db/instances.go
+++ b/lxd/db/instances.go
@@ -98,7 +98,7 @@ type Instance struct {
ExpiryDate time.Time
}
-// InstanceFilter can be used to filter results yielded by InstanceList.
+// InstanceFilter specifies potential query parameter fields.
type InstanceFilter struct {
Project string
Name string
@@ -726,12 +726,22 @@ SELECT storage_pools.name FROM storage_pools
func (c *Cluster) DeleteInstance(project, name string) error {
if strings.Contains(name, shared.SnapshotDelimiter) {
parts := strings.SplitN(name, shared.SnapshotDelimiter, 2)
+ filter := InstanceSnapshotFilter{
+ Project: project,
+ Instance: parts[0],
+ Name: parts[1],
+ }
return c.Transaction(func(tx *ClusterTx) error {
- return tx.DeleteInstanceSnapshot(project, parts[0], parts[1])
+ return tx.DeleteInstanceSnapshot(filter)
})
}
+
+ filter := InstanceFilter{
+ Project: project,
+ Name: name,
+ }
return c.Transaction(func(tx *ClusterTx) error {
- return tx.DeleteInstance(project, name)
+ return tx.DeleteInstance(filter)
})
}
|
lxd/db/instances: use Filter as parameter for delete
|
diff --git a/inc/class-filters.php b/inc/class-filters.php
index <HASH>..<HASH> 100644
--- a/inc/class-filters.php
+++ b/inc/class-filters.php
@@ -81,6 +81,9 @@ class CareLib_Filters {
// Default excerpt more.
add_filter( 'excerpt_more', array( $this, 'excerpt_more' ), 5 );
+ // Add an itemprop of "image" to WordPress attachment images.
+ add_filter( 'wp_get_attachment_image_attributes', array( $this, 'attachment_image_itemprop' ) );
+
// Modifies the arguments and output of wp_link_pages().
add_filter( 'wp_link_pages_args', array( $this, 'link_pages_args' ), 5 );
add_filter( 'wp_link_pages_link', array( $this, 'link_pages_link' ), 5 );
@@ -114,6 +117,18 @@ class CareLib_Filters {
}
/**
+ * Add an image itemprop to attachment images.
+ *
+ * @since 0.2.0
+ * @param array $attr Existing attributes.
+ * @return array Amended attributes.
+ */
+ public function attachment_image_itemprop( $attr ) {
+ $attr['itemprop'] = 'image';
+ return $attr;
+ }
+
+ /**
* Wraps the output of `wp_link_pages()` with `<p class="page-links">` if
* it's simply wrapped in a `<p>` tag.
*
|
Filter attachment image to include an image item prop
This could maybe go in attributes.php but since it’s filtering a
default WP function it probably should go here… I think?
|
diff --git a/torchvision/models/inception.py b/torchvision/models/inception.py
index <HASH>..<HASH> 100644
--- a/torchvision/models/inception.py
+++ b/torchvision/models/inception.py
@@ -70,10 +70,10 @@ class Inception3(nn.Module):
def forward(self, x):
if self.transform_input:
- x = x.clone()
- x[:, 0] = x[:, 0] * (0.229 / 0.5) + (0.485 - 0.5) / 0.5
- x[:, 1] = x[:, 1] * (0.224 / 0.5) + (0.456 - 0.5) / 0.5
- x[:, 2] = x[:, 2] * (0.225 / 0.5) + (0.406 - 0.5) / 0.5
+ x_ch0 = torch.unsqueeze(x[:, 0], 1) * (0.229 / 0.5) + (0.485 - 0.5) / 0.5
+ x_ch1 = torch.unsqueeze(x[:, 1], 1) * (0.224 / 0.5) + (0.456 - 0.5) / 0.5
+ x_ch2 = torch.unsqueeze(x[:, 2], 1) * (0.225 / 0.5) + (0.406 - 0.5) / 0.5
+ x = torch.cat((x_ch0, x_ch1, x_ch2), 1)
# 299 x 299 x 3
x = self.Conv2d_1a_3x3(x)
# 149 x 149 x 32
|
Fix inception v3 input transform for trace & onnx (#<I>)
* Fix inception v3 input transform for trace & onnx
* Input transform are in-place updates, which produce issues for tracing
and exporting to onnx.
* nit
|
diff --git a/dev/tools/build-docs.js b/dev/tools/build-docs.js
index <HASH>..<HASH> 100644
--- a/dev/tools/build-docs.js
+++ b/dev/tools/build-docs.js
@@ -93,7 +93,7 @@ var apiClasses2 = [
{tag:"objectid", path:"./node_modules/bson/lib/bson/objectid.js"},
{tag:"binary", path:"./node_modules/bson/lib/bson/binary.js"},
{tag:"code", path:"./node_modules/bson/lib/bson/code.js"},
- {tag:"code", path:"./node_modules/bson/lib/bson/db_ref.js"},
+ {tag:"db_ref", path:"./node_modules/bson/lib/bson/db_ref.js"},
{tag:"double", path:"./node_modules/bson/lib/bson/double.js"},
{tag:"minkey", path:"./node_modules/bson/lib/bson/min_key.js"},
{tag:"maxkey", path:"./node_modules/bson/lib/bson/max_key.js"},
|
Fixed docs generator to include Code
|
diff --git a/py/selenium/webdriver/remote/remote_connection.py b/py/selenium/webdriver/remote/remote_connection.py
index <HASH>..<HASH> 100644
--- a/py/selenium/webdriver/remote/remote_connection.py
+++ b/py/selenium/webdriver/remote/remote_connection.py
@@ -424,11 +424,11 @@ class RemoteConnection(object):
data = resp.read()
try:
- if 399 < statuscode < 500:
- return {'status': statuscode, 'value': data}
if 300 <= statuscode < 304:
return self._request('GET', resp.getheader('location'))
body = data.decode('utf-8').replace('\x00', '').strip()
+ if 399 < statuscode < 500:
+ return {'status': statuscode, 'value': body}
content_type = []
if resp.getheader('Content-Type') is not None:
content_type = resp.getheader('Content-Type').split(';')
|
if remote end returns a <I> level response status code, for python3 we need to decode the string so it doesn't fail later on when creating the exception to raise
Fixes Issue #<I>
|
diff --git a/src/js/core/icon.js b/src/js/core/icon.js
index <HASH>..<HASH> 100644
--- a/src/js/core/icon.js
+++ b/src/js/core/icon.js
@@ -48,7 +48,9 @@ const Icon = {
props: ['icon'],
- data: {include: []},
+ data: {
+ include: ['focusable']
+ },
isIcon: true,
diff --git a/src/js/core/svg.js b/src/js/core/svg.js
index <HASH>..<HASH> 100644
--- a/src/js/core/svg.js
+++ b/src/js/core/svg.js
@@ -14,6 +14,7 @@ export default {
ratio: Number,
'class': String,
strokeAnimation: Boolean,
+ focusable: Boolean,
attributes: 'list'
},
@@ -21,7 +22,8 @@ export default {
ratio: 1,
include: ['style', 'class'],
'class': '',
- strokeAnimation: false
+ strokeAnimation: false,
+ focusable: 'false'
},
connected() {
|
fix(icon): make SVG icons non-focusable in IE
|
diff --git a/indra/tools/model_checker.py b/indra/tools/model_checker.py
index <HASH>..<HASH> 100644
--- a/indra/tools/model_checker.py
+++ b/indra/tools/model_checker.py
@@ -400,7 +400,7 @@ def _find_sources_with_paths(im, target, sources, polarity):
yield path
for predecessor, sign in _get_signed_predecessors(im, node, node_sign):
# Only add predecessors to the path if it's not already in the
- # path
+ # path--prevents loops
if (predecessor, sign) in path:
continue
# Otherwise, the new path is a copy of the old one plus the new
@@ -529,7 +529,7 @@ def _get_signed_predecessors(im, node, polarity):
predecessors = im.predecessors_iter
for pred in predecessors(node):
pred_edge = im.get_edge(pred, node)
- yield (pred, _get_edge_sign(pred_edge) * polarity)
+ yield (pred.name, _get_edge_sign(pred_edge) * polarity)
def _get_edge_sign(edge):
|
Paths should contain strings, not nodes
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ setup(
name='django-tinycontent',
version=tinycontent.__version__,
description="A Django app for managing re-usable blocks of tiny content.",
- long_description=open('README.md').read(),
+ long_description=open('README.rst').read(),
author='Dominic Rodger',
author_email='internet@dominicrodger.com',
url='http://github.com/dominicrodger/django-tinycontent',
|
Oops - switched to RST file
|
diff --git a/lib/functions.js b/lib/functions.js
index <HASH>..<HASH> 100644
--- a/lib/functions.js
+++ b/lib/functions.js
@@ -25,7 +25,7 @@ internals.pick = function () {
internals.include = function (o) {
if (!o || !(o instanceof Object))
throw new Error('Pick must have params (arguments)');
- return _.merge(this._joi, o);
+ return _.merge({}, this._joi, o);
};
internals.withRequired = function () {
|
[hotfix] change include function to don't permanently change _joi object
|
diff --git a/src/jobTree/test/batchSystems/abstractBatchSystemTest.py b/src/jobTree/test/batchSystems/abstractBatchSystemTest.py
index <HASH>..<HASH> 100644
--- a/src/jobTree/test/batchSystems/abstractBatchSystemTest.py
+++ b/src/jobTree/test/batchSystems/abstractBatchSystemTest.py
@@ -158,6 +158,8 @@ class hidden:
time.sleep(0.1)
# pass updates too quickly (~24e6 iter/sec), which is why I'm using time.sleep(0.1):
+ def tearDown(self):
+ self.batchSystem.shutdown()
@classmethod
def tearDownClass(cls):
@@ -189,7 +191,7 @@ class MesosBatchSystemTest(hidden.AbstractBatchSystemTest):
self.slave.join()
self.master.popen.kill()
self.master.join()
- self.batchSystem.shutDown()
+ self.batchSystem.shutdown()
class MesosThread(threading.Thread):
__metaclass__ = ABCMeta
|
Added batchSystem.shutdown to teardown() method which neatly joins all threads at the culmination of each test. Changed naming convention in mesos: shutDown() -> shutdown()
|
diff --git a/models/rpc.go b/models/rpc.go
index <HASH>..<HASH> 100644
--- a/models/rpc.go
+++ b/models/rpc.go
@@ -71,6 +71,10 @@ func SetupServer(lobbyId uint, info ServerRecord, lobbyType LobbyType, league st
}
func VerifyInfo(info ServerRecord) error {
+ if config.Constants.ServerMockUp {
+ return nil
+ }
+
return Pauling.Call("Pauling.VerifyInfo", &info, &Args{})
}
|
Don't call Pauling if ServerMockUp is true.
|
diff --git a/lib/stack_master/commands/apply.rb b/lib/stack_master/commands/apply.rb
index <HASH>..<HASH> 100644
--- a/lib/stack_master/commands/apply.rb
+++ b/lib/stack_master/commands/apply.rb
@@ -6,8 +6,8 @@ module StackMaster
def initialize(config, region, stack_name)
@config = config
- @region = region
- @stack_name = stack_name
+ @region = region.gsub('_', '-')
+ @stack_name = stack_name.gsub('_', '-')
end
def perform
diff --git a/spec/stack_master/commands/apply_spec.rb b/spec/stack_master/commands/apply_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/stack_master/commands/apply_spec.rb
+++ b/spec/stack_master/commands/apply_spec.rb
@@ -1,7 +1,7 @@
RSpec.describe StackMaster::Commands::Apply do
let(:cf) { instance_double(Aws::CloudFormation::Client) }
let(:region) { 'us-east-1' }
- let(:stack_name) { 'myapp_vpc' }
+ let(:stack_name) { 'myapp-vpc' }
let(:config) { double(find_stack: stack_definition) }
let(:stack_definition) { StackMaster::Config::StackDefinition.new(
region: 'us_east_1',
|
Ensure we replace underscores with hyphens
|
diff --git a/list.go b/list.go
index <HASH>..<HASH> 100644
--- a/list.go
+++ b/list.go
@@ -85,6 +85,19 @@ func (l *List) GetCurrentItem() int {
return l.currentItem
}
+// RemoveItem removes the item with the given index (starting at 0) from the
+// list. Does nothing if the index is out of range.
+func (l *List) RemoveItem(index int) *List {
+ if index < 0 || index >= len(l.items) {
+ return l
+ }
+ l.items = append(l.items[:index], l.items[index+1:]...)
+ if l.currentItem >= len(l.items) {
+ l.currentItem = len(l.items) - 1
+ }
+ return l
+}
+
// SetMainTextColor sets the color of the items' main text.
func (l *List) SetMainTextColor(color tcell.Color) *List {
l.mainTextColor = color
@@ -127,7 +140,7 @@ func (l *List) ShowSecondaryText(show bool) *List {
//
// This function is also called when the first item is added or when
// SetCurrentItem() is called.
-func (l *List) SetChangedFunc(handler func(int, string, string, rune)) *List {
+func (l *List) SetChangedFunc(handler func(index int, mainText string, secondaryText string, shortcut rune)) *List {
l.changed = handler
return l
}
|
Added RemoveItem() function to List. Resolves #<I>
|
diff --git a/commons/src/main/java/org/axway/grapes/commons/datamodel/ArtifactQuery.java b/commons/src/main/java/org/axway/grapes/commons/datamodel/ArtifactQuery.java
index <HASH>..<HASH> 100644
--- a/commons/src/main/java/org/axway/grapes/commons/datamodel/ArtifactQuery.java
+++ b/commons/src/main/java/org/axway/grapes/commons/datamodel/ArtifactQuery.java
@@ -8,14 +8,31 @@ public class ArtifactQuery {
private String sha256;
private String type;
private String location;
-
+
+ @Override
+ public String toString() {
+ return "ArtifactQuery{" +
+ "user='" + user + '\'' +
+ ", stage=" + stage +
+ ", name='" + name + '\'' +
+ ", sha256='" + sha256 + '\'' +
+ ", type='" + type + '\'' +
+ ", location='" + location + '\'' +
+ '}';
+ }
+
public ArtifactQuery(String user, int stage, String name, String sha256, String type, String location) {
this.user = user;
this.stage = stage;
this.name = name;
this.sha256 = sha256;
this.type = type;
+
this.location = location;
+
+ if(this.location == null || location.trim().isEmpty()) {
+ this.location = "N/A";
+ }
}
public String getUser() {
return user;
|
ECDDEV-<I> Updating the model class
|
diff --git a/builtin/providers/aws/import_aws_elb_test.go b/builtin/providers/aws/import_aws_elb_test.go
index <HASH>..<HASH> 100644
--- a/builtin/providers/aws/import_aws_elb_test.go
+++ b/builtin/providers/aws/import_aws_elb_test.go
@@ -7,7 +7,7 @@ import (
)
func TestAccAWSELB_importBasic(t *testing.T) {
- resourceName := "aws_subnet.bar"
+ resourceName := "aws_elb.bar"
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
|
provider/aws: Fix typo in ELB import test (#<I>)
|
diff --git a/src/main/java/org/browsermob/core/har/HarLog.java b/src/main/java/org/browsermob/core/har/HarLog.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/browsermob/core/har/HarLog.java
+++ b/src/main/java/org/browsermob/core/har/HarLog.java
@@ -7,7 +7,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
public class HarLog {
- private String version = "1.1";
+ private String version = "1.2";
private HarNameVersion creator;
private HarNameVersion browser;
private List<HarPage> pages = new CopyOnWriteArrayList<HarPage>();
|
Fixes issue #<I>: the version of the HAR spec we're using is indeed <I> :)
|
diff --git a/src/Testing/FactoryBuilder.php b/src/Testing/FactoryBuilder.php
index <HASH>..<HASH> 100644
--- a/src/Testing/FactoryBuilder.php
+++ b/src/Testing/FactoryBuilder.php
@@ -140,7 +140,7 @@ class FactoryBuilder
protected function makeInstance(array $attributes = [])
{
if (!isset($this->definitions[$this->class][$this->name])) {
- throw new InvalidArgumentException("Unable to locate factory with name [{$this->name}].");
+ throw new InvalidArgumentException("Unable to locate factory with name [{$this->name}] [{$this->class}].");
}
$definition = call_user_func($this->definitions[$this->class][$this->name], $this->faker, $attributes);
|
Include class name inside factory not found error (#<I>)
Mimics Laravel's original way of doing it and helps find what needs to be implemented.
|
diff --git a/src/transports/websocket.js b/src/transports/websocket.js
index <HASH>..<HASH> 100644
--- a/src/transports/websocket.js
+++ b/src/transports/websocket.js
@@ -28,6 +28,8 @@ module.exports = class Connection extends EventEmitter {
this.debugOut('writeLine() socket=' + (this.socket ? 'yes' : 'no') + ' connected=' + this.connected);
if (this.socket && this.connected) {
this.socket.send(line, cb);
+ } else {
+ setTimeout(cb, 0);
}
}
|
Fire write callback in websocket when not connect
|
diff --git a/src/Models/UserModel.php b/src/Models/UserModel.php
index <HASH>..<HASH> 100644
--- a/src/Models/UserModel.php
+++ b/src/Models/UserModel.php
@@ -375,12 +375,4 @@ class UserModel extends AbstractModel
return $this->client->put(self::$endpoint . '/' . $userId . '/status', $requestOptions);
}
- /**
- * @return \Psr\Http\Message\ResponseInterface
- */
- public function getUserStatusesById()
- {
- return $this->client->get(self::$endpoint . '/' . '/status/ids');
- }
-
}
|
Get users statuses by Id does not exist. Waiting for upstream fix : mattermost.atlassian.net/browse/PLT-<I>
|
diff --git a/code/CMSMenu.php b/code/CMSMenu.php
index <HASH>..<HASH> 100644
--- a/code/CMSMenu.php
+++ b/code/CMSMenu.php
@@ -431,7 +431,7 @@ class CMSMenu extends Object implements IteratorAggregate, i18nEntityProvider
$ownerModule = ClassLoader::instance()->getManifest()->getOwnerModule($cmsClass);
$entities["{$cmsClass}.MENUTITLE"] = [
'default' => $defaultTitle,
- 'module' => $ownerModule
+ 'module' => $ownerModule->getShortName()
];
}
return $entities;
|
Update usage of getOwnerModule()
|
diff --git a/src/Api/Tree/Get.php b/src/Api/Tree/Get.php
index <HASH>..<HASH> 100644
--- a/src/Api/Tree/Get.php
+++ b/src/Api/Tree/Get.php
@@ -184,7 +184,8 @@ class Get
}
/* root customer */
- if (is_null($rootCustId)) {
+ $isLiveMode = !$this->hlpCfg->getApiAuthenticationEnabledDevMode();
+ if (is_null($rootCustId) || $isLiveMode) {
$rootCustId = $this->authenticator->getCurrentCustomerId();
}
if (is_null($onDate)) {
|
MOBI-<I> - DCP API: force authorization in production mode
|
diff --git a/lib/collectionspace/client/version.rb b/lib/collectionspace/client/version.rb
index <HASH>..<HASH> 100644
--- a/lib/collectionspace/client/version.rb
+++ b/lib/collectionspace/client/version.rb
@@ -2,6 +2,6 @@
module CollectionSpace
class Client
- VERSION = '0.13.4'
+ VERSION = '0.14.0'
end
end
|
Bump collectionspace-client to <I>
|
diff --git a/holoviews/core/ndmapping.py b/holoviews/core/ndmapping.py
index <HASH>..<HASH> 100644
--- a/holoviews/core/ndmapping.py
+++ b/holoviews/core/ndmapping.py
@@ -2,7 +2,7 @@
Supplies MultiDimensionalMapping and NdMapping which are multi-dimensional
map types. The former class only allows indexing whereas the latter
also enables slicing over multiple dimension ranges.
-"""
+s"""
from collections import Sequence
from itertools import cycle
@@ -164,8 +164,8 @@ class MultiDimensionalMapping(Dimensioned):
valid_vals = []
for dim, val in valid_vals:
+ if self._cached_index_values[dim] == 'initial': self._cached_index_values[dim] = []
vals = self._cached_index_values[dim]
- if vals == 'initial': self._cached_index_values[dim] = []
if not self._instantiated and self.get_dimension(dim).values == 'initial':
if val not in vals:
self._cached_index_values[dim].append(val)
|
Fixed bug in initializing NdMapping types with initial ordering
|
diff --git a/salt/states/pkgrepo.py b/salt/states/pkgrepo.py
index <HASH>..<HASH> 100644
--- a/salt/states/pkgrepo.py
+++ b/salt/states/pkgrepo.py
@@ -343,7 +343,7 @@ def managed(name, ppa=None, **kwargs):
if disabled is not None \
else salt.utils.is_true(enabled)
- elif __grains__['os_family'] in ('NILinuxRT',):
+ elif __grains__['os_family'] in ('NILinuxRT', 'Poky'):
# opkg is the pkg virtual
kwargs['enabled'] = not salt.utils.is_true(disabled) \
if disabled is not None \
|
Enable opkg as pkgrepo handler on Poky
|
diff --git a/src/util/uniques.js b/src/util/uniques.js
index <HASH>..<HASH> 100644
--- a/src/util/uniques.js
+++ b/src/util/uniques.js
@@ -11,7 +11,7 @@ d3plus.util.uniques = function( data , value ) {
, nest = d3.nest()
.key(function(d) {
- if (typeof value === "string") {
+ if (d && typeof value === "string") {
if ( !type && typeof d[value] !== "undefined" ) type = typeof d[value]
return d[value]
}
|
fixed bug with util.uniques when trying to get a value from undefined
|
diff --git a/src/main/java/nl/hsac/fitnesse/fixture/slim/HttpTest.java b/src/main/java/nl/hsac/fitnesse/fixture/slim/HttpTest.java
index <HASH>..<HASH> 100644
--- a/src/main/java/nl/hsac/fitnesse/fixture/slim/HttpTest.java
+++ b/src/main/java/nl/hsac/fitnesse/fixture/slim/HttpTest.java
@@ -105,7 +105,7 @@ public class HttpTest extends SlimFixture {
/**
* Sends HTTP POST template with current values to service endpoint.
- * @param serviceUrl service endpoint to send XML to.
+ * @param serviceUrl service endpoint to send request to.
* @return true if call could be made and response did not indicate error.
*/
public boolean postTemplateTo(String serviceUrl) {
@@ -172,8 +172,8 @@ public class HttpTest extends SlimFixture {
}
/**
- * Sends HTTP GET to service endpoint to retrieve XML.
- * @param serviceUrl service endpoint to send XML to.
+ * Sends HTTP GET to service endpoint to retrieve content.
+ * @param serviceUrl service endpoint to get content from.
* @return true if call could be made and response did not indicate error.
*/
public boolean getFrom(String serviceUrl) {
|
Fix comment, this class is not always for XML
|
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index <HASH>..<HASH> 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -2975,6 +2975,9 @@ function delete_user($user) {
// now do a final accesslib cleanup - removes all role assingments in user context and context itself
delete_context(CONTEXT_USER, $user->id);
+ require_once($CFG->dirroot.'/tag/lib.php');
+ tag_set('user', $user->id, array());
+
// workaround for bulk deletes of users with the same email address
$delname = addslashes("$user->email.".time());
while (record_exists('user', 'username', $delname)) { // no need to use mnethostid here
|
MDL-<I> - Remove linked tags when deleting users. (merge from <I>)
|
diff --git a/src/main/java/org/softee/management/samples/MessageProcesingApplication.java b/src/main/java/org/softee/management/samples/MessageProcesingApplication.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/softee/management/samples/MessageProcesingApplication.java
+++ b/src/main/java/org/softee/management/samples/MessageProcesingApplication.java
@@ -15,7 +15,7 @@ import org.softee.time.StopWatch;
*
* @author morten.hattesen@gmail.com
*/
-public class MessageProcesingApplication implements Runnable {
+public class MessageProcesingApplication {
private static final int PROCESSING_TIME_MILLIS = 1000;
private MessagingMBean monitor;
@@ -29,11 +29,7 @@ public class MessageProcesingApplication implements Runnable {
}
}
- private MessageProcesingApplication() {
- }
-
- @Override
public void run() {
try {
monitor = new DemoMessagingMBean();
|
Made the code marginally more Java SE 5 kosher
|
diff --git a/src/main/java/com/googlecode/lanterna/gui2/dialogs/TextInputDialog.java b/src/main/java/com/googlecode/lanterna/gui2/dialogs/TextInputDialog.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/googlecode/lanterna/gui2/dialogs/TextInputDialog.java
+++ b/src/main/java/com/googlecode/lanterna/gui2/dialogs/TextInputDialog.java
@@ -4,7 +4,8 @@ import com.googlecode.lanterna.TerminalSize;
import com.googlecode.lanterna.gui2.*;
/**
- * Created by martin on 05/06/15.
+ * TextInputDialog is a modal text input dialog that prompts the user to enter a text string. The class supports
+ * validation and password masking. The builder class to help setup TextInputDialogs is TextInputDialogBuilder.
*/
public class TextInputDialog extends DialogWindow {
@@ -51,8 +52,8 @@ public class TextInputDialog extends DialogWindow {
.setRightMarginSize(1));
if(description != null) {
mainPanel.addComponent(new Label(description));
- mainPanel.addComponent(new EmptySpace(TerminalSize.ONE));
}
+ mainPanel.addComponent(new EmptySpace(TerminalSize.ONE));
textBox.setLayoutData(
GridLayout.createLayoutData(
GridLayout.Alignment.FILL,
|
Add a bit more space even if there's no description
|
diff --git a/Lib/SmsHandler/PsWinComPost.php b/Lib/SmsHandler/PsWinComPost.php
index <HASH>..<HASH> 100644
--- a/Lib/SmsHandler/PsWinComPost.php
+++ b/Lib/SmsHandler/PsWinComPost.php
@@ -74,6 +74,11 @@ EOMSG;
// Make it one.
if (!is_array($receivers))
$receivers = array($receivers);
+
+ // First, they default to latin 1
+ $message = iconv("UTF-8", "ISO-8859-1", $message);
+ // Make the message xml-safe:
+ $message = htmlspecialchars($message, ENT_XML1, 'ISO-8859-1');
foreach ($receivers as $number) {
if (strlen((string)$number) == $this->national_number_lenght) $number = $this->default_country_prefix . $number;
|
Make the popst method a bit more character-safe. (It was crap, now tested with norwegian æøå and handling their default latin1)
|
diff --git a/lib/rory/request_parameter_logger.rb b/lib/rory/request_parameter_logger.rb
index <HASH>..<HASH> 100644
--- a/lib/rory/request_parameter_logger.rb
+++ b/lib/rory/request_parameter_logger.rb
@@ -3,7 +3,7 @@ require_relative 'parameter_filter'
module Rory
class RequestParameterLogger
- def initialize(app, logger=nil, filters=[:password, :tin, :ssn, :social_security_number, :file_attachment])
+ def initialize(app, logger=nil, filters=[:password])
@app = app
@logger = logger
@filters = filters
|
Removes some default fields to filter on
|
diff --git a/lib/action_cable/channel/base.rb b/lib/action_cable/channel/base.rb
index <HASH>..<HASH> 100644
--- a/lib/action_cable/channel/base.rb
+++ b/lib/action_cable/channel/base.rb
@@ -76,7 +76,7 @@ module ActionCable
# class ChatChannel < ApplicationCable::Channel
# def subscribed
# @room = Chat::Room[params[:room_number]]
- # reject! unless current_user.can_access?(@room)
+ # reject unless current_user.can_access?(@room)
# end
# end
#
@@ -198,7 +198,7 @@ module ActionCable
@subscription_confirmation_sent
end
- def reject!
+ def reject
@reject_subscription = true
end
diff --git a/test/channel/rejection_test.rb b/test/channel/rejection_test.rb
index <HASH>..<HASH> 100644
--- a/test/channel/rejection_test.rb
+++ b/test/channel/rejection_test.rb
@@ -5,7 +5,7 @@ require 'stubs/room'
class ActionCable::Channel::RejectionTest < ActiveSupport::TestCase
class SecretChannel < ActionCable::Channel::Base
def subscribed
- reject! if params[:id] > 0
+ reject if params[:id] > 0
end
end
|
Rename Subscription#reject! to Subscription#reject as there's only one version of the method
|
diff --git a/selector.go b/selector.go
index <HASH>..<HASH> 100644
--- a/selector.go
+++ b/selector.go
@@ -466,10 +466,13 @@ func siblingSelector(s1, s2 Selector, adjacent bool) Selector {
}
if adjacent {
- if n.PrevSibling == nil {
- return false
+ for n = n.PrevSibling; n != nil; n = n.PrevSibling {
+ if n.Type == html.TextNode || n.Type == html.CommentNode {
+ continue
+ }
+ return s1(n)
}
- return s1(n.PrevSibling)
+ return false
}
// Walk backwards looking for element that matches s1
diff --git a/selector_test.go b/selector_test.go
index <HASH>..<HASH> 100644
--- a/selector_test.go
+++ b/selector_test.go
@@ -321,7 +321,9 @@ var selectorTests = []selectorTest{
},
},
{
- `<p id="1"><p id="2"></p><address></address><p id="3">`,
+ `<p id="1"></p>
+ <!--comment-->
+ <p id="2"></p><address></address><p id="3">`,
`p + p`,
[]string{
`<p id="2">`,
|
fix: adjacent sibling selector should ignore text node and comment node
|
diff --git a/src/Structure/Structure.php b/src/Structure/Structure.php
index <HASH>..<HASH> 100644
--- a/src/Structure/Structure.php
+++ b/src/Structure/Structure.php
@@ -117,7 +117,7 @@ abstract class Structure {
public static function ArrayS($format = null, $data = null, $countStrict = true, $null = false) {
$array = new ArrayS();
$array->setFormat($format);
- $array->setData($data = null);
+ $array->setData($data);
$array->setCountStrict($countStrict);
$array->setNull($null);
return $array;
|
Corrected unwanted "= null"
|
diff --git a/local_settings/settings.py b/local_settings/settings.py
index <HASH>..<HASH> 100644
--- a/local_settings/settings.py
+++ b/local_settings/settings.py
@@ -60,11 +60,9 @@ class Settings(dict):
"""
def __init__(self, *args, **kwargs):
+ # Call our update() instead of super().__init__() so that our
+ # __setitem__() will be used.
self.update(*args, **kwargs)
- super(Settings, self).__init__(*args, **kwargs)
- for k, v in self.items():
- if isinstance(v, Mapping):
- super(Settings, self).__setitem__(k, Settings(v))
def __setitem__(self, name, value):
if isinstance(value, Mapping):
|
Simplify Settings constructor
It was doing a bunch of redundant stuff.
|
diff --git a/doc/mongo_extensions.py b/doc/mongo_extensions.py
index <HASH>..<HASH> 100644
--- a/doc/mongo_extensions.py
+++ b/doc/mongo_extensions.py
@@ -29,7 +29,7 @@ class mongoref(nodes.reference):
def visit_mongodoc_node(self, node):
- self.visit_admonition(node, "seealso")
+ self.visit_admonition(node)
def depart_mongodoc_node(self, node):
|
Fix error when building docs.
|
diff --git a/optoanalysis/setup.py b/optoanalysis/setup.py
index <HASH>..<HASH> 100644
--- a/optoanalysis/setup.py
+++ b/optoanalysis/setup.py
@@ -15,7 +15,7 @@ with open(os.path.join(mypackage_root_dir, 'optoanalysis/VERSION')) as version_f
version = version_file.read().strip()
extensions = [Extension(
- name="optoanalysis.sde_solver.solve",
+ name="solve",
sources=["optoanalysis/sde_solver/solve.pyx"],
include_dirs=[numpy.get_include()],
)
|
added working solution, had to change name in extension so that it builds the shared object file and puts it in the root package directory when installed
|
diff --git a/jquery.popupoverlay.js b/jquery.popupoverlay.js
index <HASH>..<HASH> 100644
--- a/jquery.popupoverlay.js
+++ b/jquery.popupoverlay.js
@@ -513,9 +513,13 @@
}
}
- // Re-enable scrolling of background layer
+ // Re-enable scrolling of background layer, if needed
if (options.scrolllock) {
setTimeout(function() {
+ if ($.grep(visiblePopupsArray, function(eid) { return $("#"+eid).data('popupoptions').scrolllock }).length) {
+ // Some "scolllock=true" popup is currently visible, leave scrolling disabled
+ return;
+ }
$body.css({
overflow: 'visible',
'margin-right': bodymarginright
@@ -532,9 +536,13 @@
$wrapper.hide();
}
- // Re-enable scrolling of background layer
+ // Re-enable scrolling of background layer, if needed
if (options.scrolllock) {
setTimeout(function() {
+ if ($.grep(visiblePopupsArray, function(eid) { return $("#"+eid).data('popupoptions').scrolllock }).length) {
+ // Some "scrolllock=true" popup is currently visible, leave scrolling disabled
+ return;
+ }
$body.css({
overflow: 'visible',
'margin-right': bodymarginright
|
Properly support nested "scrolllock=true" popups
|
diff --git a/lib/active_hash/base.rb b/lib/active_hash/base.rb
index <HASH>..<HASH> 100644
--- a/lib/active_hash/base.rb
+++ b/lib/active_hash/base.rb
@@ -302,7 +302,7 @@ module ActiveHash
end
def define_getter_method(field, default_value)
- unless has_instance_method?(field)
+ unless instance_methods.include?(field.to_sym)
define_method(field) do
attributes[field].nil? ? default_value : attributes[field]
end
@@ -312,8 +312,8 @@ module ActiveHash
private :define_getter_method
def define_setter_method(field)
- method_name = "#{field}="
- unless has_instance_method?(method_name)
+ method_name = :"#{field}="
+ unless instance_methods.include?(method_name)
define_method(method_name) do |new_val|
attributes[field] = new_val
end
@@ -324,7 +324,7 @@ module ActiveHash
def define_interrogator_method(field)
method_name = :"#{field}?"
- unless has_instance_method?(method_name)
+ unless instance_methods.include?(method_name)
define_method(method_name) do
send(field).present?
end
@@ -406,12 +406,6 @@ module ActiveHash
private :mark_clean
- def has_instance_method?(name)
- instance_methods.map { |method| method.to_sym }.include?(name)
- end
-
- private :has_instance_method?
-
def has_singleton_method?(name)
singleton_methods.map { |method| method.to_sym }.include?(name)
end
|
silence warning that happens because has_instance_method? bug
somehow has_insance_method? returned false after define_method was called
leading to duplicate method definitions and warnings
instead of fixing this mystery bug I'm just removing the obsolte method
|
diff --git a/src/Clarify/Search.php b/src/Clarify/Search.php
index <HASH>..<HASH> 100644
--- a/src/Clarify/Search.php
+++ b/src/Clarify/Search.php
@@ -26,11 +26,11 @@ class Search extends Client
$request->getQuery()->set($key, $value);
}
- $response = $this->process($request);
+ $this->process($request);
- $this->detail = $response->json();
+ $this->detail = $this->response->json();
- return $response->json();
+ return $this->detail;
}
public function hasMorePages()
|
making sure the data is being captured to be reused
|
diff --git a/watchman/main.py b/watchman/main.py
index <HASH>..<HASH> 100644
--- a/watchman/main.py
+++ b/watchman/main.py
@@ -15,13 +15,11 @@ def check():
child_dirs = _get_subdirectories(current_working_directory)
for child in child_dirs:
try:
- change_dir = '%s/%s' % (current_working_directory, child)
- cd(change_dir); current_branch = hg('branch')
-
+ current_branch = hg('branch', '-R', './%s' % child)
output = '%-25s is on branch: %s' % (child, current_branch)
+ print(output, end='')
- print(output, end=''); cd('..') # print and step back one dir
- except Exception:
+ except Exception as e:
continue
|
Remove change dir commands and now it sends directly.
|
diff --git a/lib/GameLoader.js b/lib/GameLoader.js
index <HASH>..<HASH> 100644
--- a/lib/GameLoader.js
+++ b/lib/GameLoader.js
@@ -890,12 +890,17 @@ GameLoader.prototype.buildWaitRoomConf = function(directory, gameName, level) {
waitRoomSettingsFile = directory + 'waitroom/waitroom.settings.js';
if (!fs.existsSync(waitRoomSettingsFile)) {
+ ///////////////////////////////////////////////////////
+ // Experimental code for levels without waitroom conf.
this.doErr('GameLoader.buildWaitRoomConf: file waitroom.settings ' +
'not found', {
game: gameName,
level: level,
- log: 'warn'
- });
+ log: 'warn',
+ throwIt: !level // Experimental: was always true.
+ });
+ // Important! The main waitRoom has not been loaded yet, so levels
+ // cannot copy settings from there.
return;
}
|
allowing no waitroom in levels: will cause an error for now if trying to move to a level. need further work
|
diff --git a/packages/webpack-cli/lib/webpack-cli.js b/packages/webpack-cli/lib/webpack-cli.js
index <HASH>..<HASH> 100644
--- a/packages/webpack-cli/lib/webpack-cli.js
+++ b/packages/webpack-cli/lib/webpack-cli.js
@@ -1337,7 +1337,7 @@ class WebpackCLI {
} else {
const { interpret } = this.utils;
- // Order defines the priority, in increasing order
+ // Order defines the priority, in decreasing order
const defaultConfigFiles = ['webpack.config', '.webpack/webpack.config', '.webpack/webpackfile']
.map((filename) =>
// Since .cjs is not available on interpret side add it manually to default config extension list
|
fix: comment on config resolution priority (#<I>)
|
diff --git a/angr/state_plugins/symbolic_memory.py b/angr/state_plugins/symbolic_memory.py
index <HASH>..<HASH> 100644
--- a/angr/state_plugins/symbolic_memory.py
+++ b/angr/state_plugins/symbolic_memory.py
@@ -981,8 +981,8 @@ class SimSymbolicMemory(SimMemory): #pylint:disable=abstract-method
# CGC binaries zero-fill the memory for any allocated region
# Reference: (https://github.com/CyberGrandChallenge/libcgc/blob/master/allocate.md)
return self.state.se.BVV(0, bits)
- elif options.SPECIAL_MEMORY_FILL in self.state.options:
- return self.state._special_memory_filler(name, bits)
+ elif options.SPECIAL_MEMORY_FILL in self.state.options and self.state._special_memory_filler is not None:
+ return self.state._special_memory_filler(name, bits, self.state)
else:
kwargs = { }
if options.UNDER_CONSTRAINED_SYMEXEC in self.state.options:
|
make _special_memory_filler state aware
|
diff --git a/anom/transaction.py b/anom/transaction.py
index <HASH>..<HASH> 100644
--- a/anom/transaction.py
+++ b/anom/transaction.py
@@ -89,9 +89,8 @@ def transactional(*, adapter=None, retries=3, propagation=Transaction.Propagatio
retries(int, optional): The number of times to retry the
transaction if it couldn't be committed.
propagation(Transaction.Propagation, optional): The propagation
- strategy to use. By default, transactions are Transactions are
- nested, but you can force certain transactions to always run
- independently.
+ strategy to use. By default, transactions are nested, but you
+ can force certain transactions to always run independently.
Raises:
anom.RetriesExceeded: When the decorator runbs out of retries
|
doc: fix docstring for @transactional
|
diff --git a/scoop/launch/__init__.py b/scoop/launch/__init__.py
index <HASH>..<HASH> 100644
--- a/scoop/launch/__init__.py
+++ b/scoop/launch/__init__.py
@@ -84,8 +84,9 @@ class Host(object):
# TODO: do we really want to set PYTHONPATH='' if not defined??
c.extend(["export", "PYTHONPATH={0}:$PYTHONPATH".format(worker.pythonPath), '&&'])
- # Try to go into the directory. If not (headless worker), it's not important
- c.extend(['cd', worker.path, '&&'])
+ # Try to go into the directory. If headless worker, it's not important
+ if worker.executable:
+ c.extend(['cd', worker.path, "&&"])
return c
def _WorkerCommand_bootstrap(self, worker):
|
* Fixed a bug when starting in could mode on heterogeneous systems.
|
diff --git a/holoviews/core/spaces.py b/holoviews/core/spaces.py
index <HASH>..<HASH> 100644
--- a/holoviews/core/spaces.py
+++ b/holoviews/core/spaces.py
@@ -14,6 +14,7 @@ from .layout import Layout, AdjointLayout, NdLayout
from .ndmapping import UniformNdMapping, NdMapping, item_check
from .overlay import Overlay, CompositeOverlay, NdOverlay, Overlayable
from .options import Store, StoreOptions
+from ..streams import Stream
class HoloMap(UniformNdMapping, Overlayable):
"""
@@ -584,6 +585,11 @@ class DynamicMap(HoloMap):
del params['sampled']
super(DynamicMap, self).__init__(initial_items, callback=callback, **params)
+ invalid = [s for s in self.streams if not isinstance(s, Stream)]
+ if invalid:
+ msg = ('The supplied streams list contains objects that '
+ 'are not Stream instances: {objs}')
+ raise TypeError(msg.format(objs = ', '.join('%r' % el for el in invalid)))
self._posarg_keys = util.validate_dynamic_argspec(self.callback.argspec,
self.kdims,
|
Added validation of objects supplied in DynamicMap streams list
|
diff --git a/lib/Less/Node/Url.php b/lib/Less/Node/Url.php
index <HASH>..<HASH> 100755
--- a/lib/Less/Node/Url.php
+++ b/lib/Less/Node/Url.php
@@ -22,6 +22,16 @@ class Url
{
$val = $this->value->compile($ctx);
+ // Add the base path if the URL is relative
+ if( is_string($val->value) && !preg_match('/^(?:[a-z-]+:|\/)/',$val->value) ){
+ $rootpath = $this->rootpath;
+ if ( !$val->quote ){
+ $rootpath = preg_replace('/[\(\)\'"\s]/', '\\$1', $rootpath );
+ }
+ $val->value = $rootpath . $val->value;
+ }
+
+
return new \Less\Node\URL($val, $this->rootpath);
}
diff --git a/lib/Less/Parser.php b/lib/Less/Parser.php
index <HASH>..<HASH> 100755
--- a/lib/Less/Parser.php
+++ b/lib/Less/Parser.php
@@ -539,7 +539,7 @@ class Parser {
return new \Less\Node\Url((isset($value->value) || $value instanceof \Less\Node\Variable)
- ? $value : new \Less\Node\Anonymous($value), '');
+ ? $value : new \Less\Node\Anonymous($value), $this->env->rootpath);
}
|
When adding a path onto an unquoted url, escape characters that require it
|
diff --git a/goon.go b/goon.go
index <HASH>..<HASH> 100644
--- a/goon.go
+++ b/goon.go
@@ -107,9 +107,7 @@ func (g *Goon) extractKeys(src interface{}, putRequest bool) ([]*datastore.Key,
// is incomplete.
func (g *Goon) Key(src interface{}) *datastore.Key {
if k, err := g.KeyError(src); err == nil {
- if !k.Incomplete() {
- return k
- }
+ return k
}
return nil
}
diff --git a/goon_test.go b/goon_test.go
index <HASH>..<HASH> 100644
--- a/goon_test.go
+++ b/goon_test.go
@@ -44,8 +44,8 @@ func TestGoon(t *testing.T) {
if k, err := n.KeyError(noid); err == nil && !k.Incomplete() {
t.Error("expected incomplete on noid")
}
- if n.Key(noid) != nil {
- t.Error("expected to not find a key")
+ if n.Key(noid) == nil {
+ t.Error("expected to find a key")
}
var keyTests = []keyTest{
|
Incomplete keys aren't errors
|
diff --git a/src/Illuminate/Mail/Mailable.php b/src/Illuminate/Mail/Mailable.php
index <HASH>..<HASH> 100644
--- a/src/Illuminate/Mail/Mailable.php
+++ b/src/Illuminate/Mail/Mailable.php
@@ -289,7 +289,7 @@ class Mailable implements MailableContract
*/
public function from($address, $name = null)
{
- $this->setAddress($address, $name, 'from');
+ return $this->setAddress($address, $name, 'from');
}
/**
|
Add missing return statement (#<I>)
|
diff --git a/eZ/Publish/Core/Repository/RoleService.php b/eZ/Publish/Core/Repository/RoleService.php
index <HASH>..<HASH> 100644
--- a/eZ/Publish/Core/Repository/RoleService.php
+++ b/eZ/Publish/Core/Repository/RoleService.php
@@ -783,13 +783,14 @@ class RoleService implements RoleServiceInterface
protected function buildPersistenceRoleObject( APIRoleCreateStruct $roleCreateStruct )
{
$policiesToCreate = array();
- if ( !empty( $roleCreateStruct->getPolicies() ) )
+ $policyCreateStructs = $roleCreateStruct->getPolicies();
+ if ( !empty( $policyCreateStructs ) )
{
- foreach ( $roleCreateStruct->getPolicies() as $policy )
+ foreach ( $policyCreateStructs as $policyCreateStruct )
{
- $policiesToCreate[] = $this->buildPersistencePolicyObject( $policy->module,
- $policy->function,
- $policy->limitations );
+ $policiesToCreate[] = $this->buildPersistencePolicyObject( $policyCreateStruct->module,
+ $policyCreateStruct->function,
+ $policyCreateStruct->getLimitations() );
}
}
|
Additional fix to role service implementation due to new role structs
|
diff --git a/lib/openscap/xccdf/session.rb b/lib/openscap/xccdf/session.rb
index <HASH>..<HASH> 100644
--- a/lib/openscap/xccdf/session.rb
+++ b/lib/openscap/xccdf/session.rb
@@ -9,11 +9,8 @@
# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
#
-require 'ffi'
-
module OpenSCAP
module Xccdf
- extend FFI::Library
class Session
def initialize(input_filename)
|
OpenSCAP::Xccdf doesn't need to extend FFI::Library
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.