diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/netpyne/analysis/spikes.py b/netpyne/analysis/spikes.py
index <HASH>..<HASH> 100644
--- a/netpyne/analysis/spikes.py
+++ b/netpyne/analysis/spikes.py
@@ -31,7 +31,7 @@ from .utils import exception #, getInclude, getSpktSpkid
from .tools import getInclude, getSpktSpkid
from .tools import saveData as saveFigData
from ..support.scalebar import add_scalebar
-
+from ..specs import Dict # ADDED TO CSD BRANCH TO TRY TO RESOLVE popAvgRates() Dict() ERROR!
@exception
def prepareSpikeData(
|
imported Dict from specs in analysis/spikes.py to try to resolve popAvgRates() Dict() error
|
diff --git a/mailjet/api.py b/mailjet/api.py
index <HASH>..<HASH> 100644
--- a/mailjet/api.py
+++ b/mailjet/api.py
@@ -30,6 +30,11 @@ class ApiMethodFunction(object):
def __call__(self, **kwargs):
if kwargs.pop('method', 'GET') == 'POST':
postdata = kwargs
+ for key in postdata:
+ if type(postdata[key])==tuple:
+ for idx, item in enumerate(postdata[key]):
+ postdata['%s[%d]' % (key, idx)] = item
+ del postdata[key]
options = None
else:
options = kwargs
|
Workarround to pass tuple as argument in the form that mailjet api understand :
Ex food=('chocolate', 'cookie') is now transform in request to food[0]=chocolate&food[1]=cookie
|
diff --git a/panoptes_client/utils.py b/panoptes_client/utils.py
index <HASH>..<HASH> 100644
--- a/panoptes_client/utils.py
+++ b/panoptes_client/utils.py
@@ -24,6 +24,8 @@ def isiterable(v):
def split(to_batch, batch_size):
+ if type(to_batch) == set:
+ to_batch = tuple(to_batch)
for batch in [
to_batch[i:i + batch_size]
for i in range(0, len(to_batch), batch_size)
|
Convert sets to tuples before trying to split them
|
diff --git a/hugolib/filesystems/basefs.go b/hugolib/filesystems/basefs.go
index <HASH>..<HASH> 100644
--- a/hugolib/filesystems/basefs.go
+++ b/hugolib/filesystems/basefs.go
@@ -68,7 +68,7 @@ type BaseFs struct {
// This usually maps to /my-project/public.
PublishFs afero.Fs
- // A read-only filesystem from the project workDir (no theme here).
+ // A read-only filesystem starting from the project workDir.
WorkDir afero.Fs
theBigFs *filesystemsCollector
@@ -438,7 +438,9 @@ func NewBase(p *paths.Paths, logger loggers.Logger, options ...func(*BaseFs) err
publishFs := hugofs.NewBaseFileDecorator(afero.NewBasePathFs(fs.Destination, p.AbsPublishDir))
sourceFs := hugofs.NewBaseFileDecorator(afero.NewBasePathFs(fs.Source, p.WorkingDir))
- workDir := hugofs.NewBaseFileDecorator(afero.NewBasePathFs(afero.NewReadOnlyFs(fs.Source), p.WorkingDir))
+
+ // Same as sourceFs, but no decoration. This is what's used by os.ReadDir etc.
+ workDir := afero.NewBasePathFs(afero.NewReadOnlyFs(fs.Source), p.WorkingDir)
b := &BaseFs{
SourceFs: sourceFs,
|
Remove the decorator from the fs used in ReadDir
There have been a site breakage reported in the wild after <I>. With this commit we shoudl be back to how it behaved in <I>.
Closes #<I>
|
diff --git a/cake/tests/cases/libs/debugger.test.php b/cake/tests/cases/libs/debugger.test.php
index <HASH>..<HASH> 100644
--- a/cake/tests/cases/libs/debugger.test.php
+++ b/cake/tests/cases/libs/debugger.test.php
@@ -189,6 +189,8 @@ class DebuggerTest extends CakeTestCase {
'/error'
);
$this->assertTags($result, $data, true);
+
+ restore_error_handler();
}
/**
|
Adding a restore_error_handler() so the Debugger test doesn't interfere with other tests.
|
diff --git a/azure-servicemanagement-legacy/azure/servicemanagement/servicemanagementclient.py b/azure-servicemanagement-legacy/azure/servicemanagement/servicemanagementclient.py
index <HASH>..<HASH> 100644
--- a/azure-servicemanagement-legacy/azure/servicemanagement/servicemanagementclient.py
+++ b/azure-servicemanagement-legacy/azure/servicemanagement/servicemanagementclient.py
@@ -397,10 +397,12 @@ class _ServiceManagementClient(object):
return None
- def _get_path(self, resource, name):
+ def _get_path(self, resource, name, suffix=None):
path = '/' + self.subscription_id + '/' + resource
if name is not None:
path += '/' + _str(name)
+ if suffix is not None:
+ path += '/' + suffix
return path
def _get_cloud_services_path(self, cloud_service_id, resource=None, name=None):
|
Extend get_path to handle more granular endpoints
Publishing details, for example, are nested below a typical
endpoint path. An optional suffix on the path makes more
granular endpoints reachable without requiring any change to
existing code.
|
diff --git a/src/utils/tenant-cache.js b/src/utils/tenant-cache.js
index <HASH>..<HASH> 100644
--- a/src/utils/tenant-cache.js
+++ b/src/utils/tenant-cache.js
@@ -1,6 +1,6 @@
'use strict';
-const deepClone = require('./deep-clone');
+const { deepClone } = require('./deep-clone');
let TenantClient;
let TenantsOrPromisesById = {};
@@ -26,6 +26,9 @@ module.exports = {
if (newClient.context['user-claims']) {
delete newClient.context['user-claims'];
}
+ if (newClient.context['jwt']) {
+ delete newClient.context['jwt'];
+ }
return TenantsOrPromisesById[tenantId] = new TenantClient(newClient).getTenant(null, { scope: scope });
}
}
|
minor fixes (#<I>)
* since there is never a reason to pass user-claims when getting tenant data, remove them if they exist so as to not cause a <I>
* add support for JWT authentication
* bug fix in tenant-cache (typo)
* remove jwt from context in tenant-cache
|
diff --git a/test/test_roo.rb b/test/test_roo.rb
index <HASH>..<HASH> 100644
--- a/test/test_roo.rb
+++ b/test/test_roo.rb
@@ -75,7 +75,7 @@ class TestRoo < Test::Unit::TestCase
fixture_filename(options[:name], format)))
end
rescue => e
- raise e, "#{e.message} for #{format}"
+ raise e, "#{e.message} for #{format}", e.backtrace
end
end
end
|
Preserve the original backtrace on with_each_spreadsheet re-raise.
|
diff --git a/connection.go b/connection.go
index <HASH>..<HASH> 100644
--- a/connection.go
+++ b/connection.go
@@ -542,7 +542,7 @@ func (cn *connection) updatePiecePriority(piece int) {
default:
panic(tpp)
}
- prio += piece / 2
+ prio += piece / 3
cn.pieceRequestOrder.Set(piece, prio)
cn.updateRequests()
}
|
Reduce the priority given to earlier pieces. Maximum priority reads at the end of the file aren’t getting enough attention.
|
diff --git a/allennlp/data/fields/label_field.py b/allennlp/data/fields/label_field.py
index <HASH>..<HASH> 100644
--- a/allennlp/data/fields/label_field.py
+++ b/allennlp/data/fields/label_field.py
@@ -78,4 +78,4 @@ class LabelField(Field[numpy.ndarray]):
@overrides
def empty_field(self):
- return LabelField(0, self._label_namespace)
+ return LabelField(-1, self._label_namespace, skip_indexing=True)
diff --git a/tests/data/fields/label_field_test.py b/tests/data/fields/label_field_test.py
index <HASH>..<HASH> 100644
--- a/tests/data/fields/label_field_test.py
+++ b/tests/data/fields/label_field_test.py
@@ -32,3 +32,8 @@ class TestLabelField(AllenNlpTestCase):
def test_label_field_raises_with_incorrect_label_type(self):
with pytest.raises(ConfigurationError):
_ = LabelField([], skip_indexing=False)
+
+ def test_label_field_empty_field_works(self):
+ label = LabelField("test")
+ empty_label = label.empty_field()
+ assert empty_label.label == -1
|
Fixes empty_field method of LabelField and adds a test (#<I>)
* fixed empty_field method of label_field and added a test
* Changed empty_field test for LabelField to test value of padding
|
diff --git a/src/Kunstmaan/SeoBundle/Tests/Entity/SeoTest.php b/src/Kunstmaan/SeoBundle/Tests/Entity/SeoTest.php
index <HASH>..<HASH> 100644
--- a/src/Kunstmaan/SeoBundle/Tests/Entity/SeoTest.php
+++ b/src/Kunstmaan/SeoBundle/Tests/Entity/SeoTest.php
@@ -132,18 +132,6 @@ class SeoTest extends \PHPUnit_Framework_TestCase
}
/**
- * @covers Kunstmaan\SeoBundle\Entity\Seo::getCimKeyword
- * @covers Kunstmaan\SeoBundle\Entity\Seo::setCimKeyword
- */
- public function testGetSetCimKeyword()
- {
- $this->object->setCimKeyword('CIM keyword');
- $this->assertEquals('CIM keyword', $this->object->getCimKeyword());
- $this->object->setCimKeyword('CIM keyword should be limited to 24 characters');
- $this->assertEquals('CIM keyword should be li', $this->object->getCimKeyword());
- }
-
- /**
* @covers Kunstmaan\SeoBundle\Entity\Seo::getDefaultAdminType
*/
public function testGetDefaultAdminType()
|
Since the CIM keyword was removed, remove the tests as well.
|
diff --git a/driver/src/test/java/org/neo4j/driver/util/Neo4jSettings.java b/driver/src/test/java/org/neo4j/driver/util/Neo4jSettings.java
index <HASH>..<HASH> 100644
--- a/driver/src/test/java/org/neo4j/driver/util/Neo4jSettings.java
+++ b/driver/src/test/java/org/neo4j/driver/util/Neo4jSettings.java
@@ -30,7 +30,7 @@ public class Neo4jSettings
{
public static final String DATA_DIR = "dbms.directories.data";
public static final String IMPORT_DIR = "dbms.directories.import";
- public static final String LISTEN_ADDR = "dbms.connectors.default_listen_address";
+ public static final String LISTEN_ADDR = "dbms.default_listen_address";
public static final String IPV6_ENABLED_ADDR = "::";
public static final String BOLT_TLS_LEVEL = "dbms.connector.bolt.tls_level";
|
Fix server configuration affecting <I> builds (#<I>)
|
diff --git a/packages/node_modules/@webex/internal-plugin-ediscovery/src/report-generator.js b/packages/node_modules/@webex/internal-plugin-ediscovery/src/report-generator.js
index <HASH>..<HASH> 100644
--- a/packages/node_modules/@webex/internal-plugin-ediscovery/src/report-generator.js
+++ b/packages/node_modules/@webex/internal-plugin-ediscovery/src/report-generator.js
@@ -18,7 +18,7 @@ const ReportGenerator = SparkPlugin.extend({
folder: 'object',
spaces: 'object',
size: {type: 'number', default: 0},
- maxSize: {type: 'number', default: 1000000}
+ maxSize: {type: 'number', default: 104857600} // 100 Mb max size
},
/**
@@ -128,7 +128,7 @@ const ReportGenerator = SparkPlugin.extend({
* @returns {Promise} A promise on the generated report
*/
generate() {
- if (!this.zip) {
+ if (!this.zip || !this.spaces) {
return Promise.resolve();
}
|
feat(ediscovery): bump maxsize to <I> mb
|
diff --git a/tests/engine_test.py b/tests/engine_test.py
index <HASH>..<HASH> 100644
--- a/tests/engine_test.py
+++ b/tests/engine_test.py
@@ -341,29 +341,6 @@ class CreateRiskCalculationTestCase(unittest.TestCase):
'-0.5000000000000000 0.5000000000000000))'))
-class ReadJobProfileFromConfigFileTestCase(unittest.TestCase):
- """Integration test for basic engine functions.
-
- Test reading/generating a hazard job profile from a config file, then run
- through the validation form.
- """
-
- def test_read_and_validate_hazard_config(self):
- cfg = helpers.get_data_path('simple_fault_demo_hazard/job.ini')
- job = engine.prepare_job(getpass.getuser())
- params, files = engine.parse_config(open(cfg, 'r'))
- calculation = engine.create_hazard_calculation(
- job.owner.user_name, params, files.values()
- )
- job.hazard_calculation = calculation
- job.save()
-
- form = validation.ClassicalHazardForm(
- instance=calculation, files=files
- )
- self.assertTrue(form.is_valid())
-
-
class OpenquakeCliTestCase(unittest.TestCase):
"""
Run "openquake --version" as a separate
|
tests/engine_test:
Removed a useless test case.
|
diff --git a/src/renderer-enhancer.js b/src/renderer-enhancer.js
index <HASH>..<HASH> 100644
--- a/src/renderer-enhancer.js
+++ b/src/renderer-enhancer.js
@@ -45,7 +45,7 @@ module.exports = overrides => storeCreator => (reducer, providedInitialState) =>
if (!getInitialState) throw new Error('Could not find electronEnhanced redux store in main process');
const storeData = JSON.parse(getInitialState());
const preload = params.excludeUnfilteredState ? fillShape(storeData, params.filter) : storeData;
- const initialState = objectMerge(providedInitialState || {}, preload);
+ const initialState = objectMerge(preload, providedInitialState || {});
// Forward update to the main process so that it can forward the update to all other renderers
const forwarder = (action) =>
|
Fix InitialState bug. (#<I>)
This commit fixes the issue where electronEnhancer returns the preloadedState of an application instead of the provided initial state.
|
diff --git a/lib/caracal/document.rb b/lib/caracal/document.rb
index <HASH>..<HASH> 100644
--- a/lib/caracal/document.rb
+++ b/lib/caracal/document.rb
@@ -196,7 +196,7 @@ module Caracal
def render_media(zip)
images = relationships.select { |r| r.relationship_type == :image }
images.each do |rel|
- if rel.relationship_data
+ if rel.relationship_data.to_s.size > 0
content = rel.relationship_data
else
content = open(rel.relationship_target).read
|
Actually fixed issue with image media rendering.
|
diff --git a/tasks/release.rb b/tasks/release.rb
index <HASH>..<HASH> 100644
--- a/tasks/release.rb
+++ b/tasks/release.rb
@@ -186,7 +186,7 @@ task :announce do
raise "Only valid for patch releases"
end
- sums = "$ shasum *-#{version}.gem\n" + `shasum *-#{version}.gem`
+ sums = "$ shasum -a 256 *-#{version}.gem\n" + `shasum -a 256 *-#{version}.gem`
puts "Hi everyone,"
puts
@@ -232,7 +232,7 @@ GitHub](https://github.com/rails/rails/compare/v#{previous_version}...v#{version
## SHA-1
If you'd like to verify that your gem is the same as the one I've uploaded,
-please use these SHA-1 hashes.
+please use these SHA-256 hashes.
Here are the checksums for #{version}:
|
Use shasum <I> on the release
|
diff --git a/cordova-js-src/confighelper.js b/cordova-js-src/confighelper.js
index <HASH>..<HASH> 100644
--- a/cordova-js-src/confighelper.js
+++ b/cordova-js-src/confighelper.js
@@ -25,7 +25,7 @@ var utils = require('cordova/utils');
var isPhone = (cordova.platformId === 'windows') && WinJS.Utilities.isPhone;
var isWin10UWP = navigator.appVersion.indexOf('MSAppHost/3.0') !== -1;
-var splashScreenTagName = isWin10UWP ? 'SplashScreen' : (isPhone ? 'm3:SplashScreen' : 'm2:SplashScreen');
+var splashScreenTagName = isWin10UWP ? "uap:SplashScreen" : (isPhone ? "m3:SplashScreen" : "m2:SplashScreen");
function XmlFile (text) {
this.text = text;
|
fix(win<I>): read splashscreen correctly from manifest (#<I>)
|
diff --git a/sendgrid/sendgrid.py b/sendgrid/sendgrid.py
index <HASH>..<HASH> 100644
--- a/sendgrid/sendgrid.py
+++ b/sendgrid/sendgrid.py
@@ -20,7 +20,6 @@ class SendGridAPIClient(object):
headers = {
"Authorization": 'Bearer {0}'.format(self._apikey),
- "Content-Type": "application/json",
"User-agent": self.useragent
}
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ if os.path.exists('README.txt'):
long_description = open('README.txt').read()
def getRequires():
- deps = ['python_http_client>=2.0.0']
+ deps = ['python_http_client>=2.1.0']
if sys.version_info < (2, 7):
deps.append('unittest2')
elif (3, 0) <= sys.version_info < (3, 2):
|
Udpdated dependency, content-type now gets set in the client automatically
|
diff --git a/src/Zephyrus/Application/RouterEngine.php b/src/Zephyrus/Application/RouterEngine.php
index <HASH>..<HASH> 100644
--- a/src/Zephyrus/Application/RouterEngine.php
+++ b/src/Zephyrus/Application/RouterEngine.php
@@ -122,6 +122,7 @@ abstract class RouterEngine
return $route;
}
}
+
throw new RouteNotFoundException($this->requestedUri, $this->requestedMethod);
}
@@ -174,8 +175,8 @@ abstract class RouterEngine
* methods if they are available.
*
* @param $route
- * @return Response | null
* @throws \Exception
+ * @return Response | null
*/
private function createResponse($route): ?Response
{
|
Light refactoring for StyleCI
|
diff --git a/test/test_motor_grid_file.py b/test/test_motor_grid_file.py
index <HASH>..<HASH> 100644
--- a/test/test_motor_grid_file.py
+++ b/test/test_motor_grid_file.py
@@ -55,8 +55,9 @@ class MotorGridFileTest(MotorTest):
yield motor.Op(
self.check_optional_callback, partial(f.writelines, [b('a')]))
- yield motor.Op(self.check_optional_callback, f.close)
-
+ self.assertRaises(TypeError, f.close, callback='foo')
+ self.assertRaises(TypeError, f.close, callback=1)
+ f.close(callback=None) # No error
done()
@async_test_engine()
|
Fix race condition in test_motor_grid_file
|
diff --git a/examples/simple_agent.py b/examples/simple_agent.py
index <HASH>..<HASH> 100755
--- a/examples/simple_agent.py
+++ b/examples/simple_agent.py
@@ -147,12 +147,16 @@ firstTable = agent.Table(
agent.DisplayString()
],
columns = [
+ # Columns begin with an index of 2 here because 1 is actually
+ # used for the single index column above.
+ # We must explicitly specify that the columns should be SNMPSETable.
(2, agent.DisplayString("Unknown place"), True),
(3, agent.Integer32(0), True)
],
counterobj = agent.Unsigned32(
oidstr = "SIMPLE-MIB::firstTableNumber"
),
+ # Allow adding new records
extendable = True
)
|
simple_agent.py: Add additional explanatory comments
|
diff --git a/core/src/main/java/com/google/common/truth/Correspondence.java b/core/src/main/java/com/google/common/truth/Correspondence.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/com/google/common/truth/Correspondence.java
+++ b/core/src/main/java/com/google/common/truth/Correspondence.java
@@ -317,8 +317,12 @@ public abstract class Correspondence<A, E> {
* Constructor. Creating subclasses (anonymous or otherwise) of this class is <i>not
* recommended</i>, but is possible via this constructor. The recommended approach is to use the
* factory methods instead (see {@linkplain Correspondence class-level documentation}).
+ *
+ * @deprecated Construct an instance with the static factory methods instead. The most mechanical
+ * migration is usually to {@link #from}.
*/
- protected Correspondence() {}
+ @Deprecated
+ Correspondence() {}
/**
* Returns a new correspondence which is like this one, except that the given formatter may be
|
Deprecate the constructor of Correspondence internally, and hide it externally.
RELNOTES=Hid constuctor of `Correspondence`. Use the class's static factory methods instead. The most mechanical migration is usually to `Correspondence.from`.
-------------
Created by MOE: <URL>
|
diff --git a/plugin/wavesurfer.timeline.js b/plugin/wavesurfer.timeline.js
index <HASH>..<HASH> 100644
--- a/plugin/wavesurfer.timeline.js
+++ b/plugin/wavesurfer.timeline.js
@@ -106,8 +106,8 @@
var width = this.drawer.getWidth();
var pixelsPerSecond = width/duration;
} else {
- var width = backend.getDuration() * this.wavesurfer.minPxPerSec;
- var pixelsPerSecond = this.wavesurfer.minPxPerSec;
+ var width = backend.getDuration() * wsParams.minPxPerSec;
+ var pixelsPerSecond = wsParams.minPxPerSec;
}
pixelsPerSecond = pixelsPerSecond / this.wavesurfer.drawer.pixelRatio;
|
fix to timeline.js drawing bug
|
diff --git a/lib/rfuse/version.rb b/lib/rfuse/version.rb
index <HASH>..<HASH> 100644
--- a/lib/rfuse/version.rb
+++ b/lib/rfuse/version.rb
@@ -1,3 +1,3 @@
module RFuse
- VERSION = "1.2.2"
+ VERSION = "1.2.3"
end
|
Bump rfuse to <I>
|
diff --git a/hendrix/facilities/services.py b/hendrix/facilities/services.py
index <HASH>..<HASH> 100644
--- a/hendrix/facilities/services.py
+++ b/hendrix/facilities/services.py
@@ -161,7 +161,7 @@ class HendrixTCPServiceWithTLS(internet.SSLServer):
context_factory = context_factory or ssl.DefaultOpenSSLContextFactory
context_factory_kwargs = context_factory_kwargs or {}
- sslContext = context_factory(
+ self.tls_context = context_factory(
private_key,
cert,
**context_factory_kwargs
@@ -170,7 +170,7 @@ class HendrixTCPServiceWithTLS(internet.SSLServer):
self,
port, # integer port
site, # our site object, see the web howto
- contextFactory=sslContext,
+ contextFactory=self.tls_context
)
self.site = site
|
Preserving tls_context for use with websocket factory.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -123,7 +123,7 @@ setup(
'rejester',
'protobuf',
'requests',
- 'streamcorpus>=0.3.38',
+ 'streamcorpus>=0.3.39',
'pyyaml',
'nltk',
'lxml',
|
requiring streamcorpus>=<I>, i.e. cbor>=<I> with the fixes for sigsgv and bigname leak
|
diff --git a/src/inputmask.js b/src/inputmask.js
index <HASH>..<HASH> 100644
--- a/src/inputmask.js
+++ b/src/inputmask.js
@@ -100,6 +100,16 @@ function init(Survey) {
surveyElement.customWidgetData.isNeedRender = true;
};
+ $(el).on('focusout change', function () {
+
+ if ($(el).inputmask('isComplete')) {
+ surveyElement.value = $(el).val();
+ } else {
+ surveyElement.value = null;
+ }
+
+ });
+
var updateHandler = function() {
el.value =
typeof surveyElement.value === "undefined" ? "" : surveyElement.value;
|
Fix for the T<I> - Survey Creator - Currency InputMask value not saving in the JSON
|
diff --git a/lib/server/plugins/api/index.js b/lib/server/plugins/api/index.js
index <HASH>..<HASH> 100644
--- a/lib/server/plugins/api/index.js
+++ b/lib/server/plugins/api/index.js
@@ -77,7 +77,7 @@ var internals = {
}
// hapi eats newlines. We like newlines. For POSIX and such.
- data = data + '\n';
+ // data = data + '\n';
resp = reply(data).code(res.statusCode).hold();
resp.headers = res.headers;
|
fix(api): do not force newlines
* * *
This commit was sponsored by The Hoodie Firm.
You can hire The Hoodie Firm:
<URL>
|
diff --git a/intervaltree/intervaltree.py b/intervaltree/intervaltree.py
index <HASH>..<HASH> 100644
--- a/intervaltree/intervaltree.py
+++ b/intervaltree/intervaltree.py
@@ -401,7 +401,11 @@ class IntervalTree(collections.MutableSet):
Returns a new tree, comprising all intervals in self but not
in other.
"""
- return IntervalTree(iv for iv in self if iv not in other)
+ ivs = set()
+ for iv in self:
+ if iv not in other:
+ ivs.add(iv)
+ return IntervalTree(ivs)
def difference_update(self, other):
"""
@@ -422,7 +426,12 @@ class IntervalTree(collections.MutableSet):
Returns a new tree of all intervals common to both self and
other.
"""
- return IntervalTree(iv for iv in self if iv in other)
+ ivs = set()
+ longer, b =
+ for iv in other:
+ if iv in self:
+ ivs.add(iv)
+ return IntervalTree(ivs)
def intersection_update(self, other):
"""
|
rm: set comprehensions in set operations, use for-loop instead
|
diff --git a/packages/Photos/src/site/components/com_photos/templates/stories/photo_comment.php b/packages/Photos/src/site/components/com_photos/templates/stories/photo_comment.php
index <HASH>..<HASH> 100644
--- a/packages/Photos/src/site/components/com_photos/templates/stories/photo_comment.php
+++ b/packages/Photos/src/site/components/com_photos/templates/stories/photo_comment.php
@@ -13,7 +13,7 @@
</a>
</h4>
<?php endif; ?>
- <?php $caption = htmlspecialchars($photo->title, ENT_QUOTES); ?>
+ <?php $caption = htmlspecialchars($object->title, ENT_QUOTES); ?>
<a data-rel="story-<?= $story->id ?>" data-trigger="MediaViewer" href="<?= @route($object->getPortraitURL('original')) ?>" title="<?= $caption ?>">
<img class="entity-portrait-medium" src="<?= $object->getPortraitURL('medium') ?>" />
</a>
|
Fixed a bug: $photo changed to $object
|
diff --git a/a10_neutron_lbaas/tests/unit/plumbing/test_portbinding_vlan.py b/a10_neutron_lbaas/tests/unit/plumbing/test_portbinding_vlan.py
index <HASH>..<HASH> 100644
--- a/a10_neutron_lbaas/tests/unit/plumbing/test_portbinding_vlan.py
+++ b/a10_neutron_lbaas/tests/unit/plumbing/test_portbinding_vlan.py
@@ -21,7 +21,7 @@ from a10_neutron_lbaas.plumbing import portbinding_vlan
from neutron.db.models.segment import NetworkSegment
from neutron.db.models_v2 import Port
-from neutron.plugins.ml2.db import PortBindingLevel
+from neutron.plugins.ml2.models import PortBindingLevel
_SUBNET_ID = "mysubnet"
_PORT_ID = "portid"
|
Actually fixed the import error this time, like I ran tests and all
|
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php b/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
index <HASH>..<HASH> 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
@@ -109,7 +109,7 @@ class Controller extends ContainerAware
throw new \LogicException('You can not use the addFlash method if sessions are disabled.');
}
- $this->get('session')->getFlashBag()->add($type, $message);
+ $this->container->get('session')->getFlashBag()->add($type, $message);
}
/**
@@ -127,7 +127,7 @@ class Controller extends ContainerAware
throw new \LogicException('The SecurityBundle is not registered in your application.');
}
- return $this->get('security.context')->isGranted($attributes, $object);
+ return $this->container->get('security.context')->isGranted($attributes, $object);
}
/**
|
Update the Controller to be consistent
We are always using $this->container->get() and now we're using the short-cut sometimes to access to a service.
It could be nice to stay with $this->container->get(), so for those who copy and paste the Controller to create a ControllerUtils, they wont have to change it (in fact neither ControllerUtils::get() nor ControllerUtils::has() exists).
See: <URL>
|
diff --git a/util.py b/util.py
index <HASH>..<HASH> 100644
--- a/util.py
+++ b/util.py
@@ -369,6 +369,7 @@ byte_compile(files, optimize=%s, force=%s,
elif optimize == 2:
cmd.insert(1, "-OO")
spawn(cmd, verbose=verbose, dry_run=dry_run)
+ os.remove(script_name)
# "Direct" byte-compilation: use the py_compile module to compile
# right here, right now. Note that the script generated in indirect
|
Remove the temporary byte-compilation script when we're done with it.
|
diff --git a/test/rain/git_tools_test.rb b/test/rain/git_tools_test.rb
index <HASH>..<HASH> 100644
--- a/test/rain/git_tools_test.rb
+++ b/test/rain/git_tools_test.rb
@@ -31,9 +31,6 @@ class Rain::GitToolsTest < ActiveSupport::TestCase
should "return false when there are uncommitted changes" do
assert %x(echo "test" >> LICENSE.md), "LICENSE.md was not edited"
refute no_changes_pending?, "LICENSE.md is still clean"
- end
-
- should "return true when the directory is clean" do
assert %x(git checkout HEAD LICENSE.md), "LICENSE.md not reset to HEAD state"
assert no_changes_pending?, "LICENSE.md is still dirty. Make sure you commit everything else!"
end
|
Remove ability for these tests to go out of order
|
diff --git a/src/Nchan.php b/src/Nchan.php
index <HASH>..<HASH> 100644
--- a/src/Nchan.php
+++ b/src/Nchan.php
@@ -55,16 +55,4 @@ final class Nchan
{
return new Status($this->baseUrl->append($path), $this->client);
}
-
- /**
- * Create the api for the given group name.
- *
- * @param string $name
- *
- * @throws \Exception
- */
- public function group(string $name): void
- {
- throw new \Exception('Not implemented yet');
- }
}
\ No newline at end of file
|
Remove Nchan::group() because it's for version <I>
|
diff --git a/hbmqtt/test_client.py b/hbmqtt/test_client.py
index <HASH>..<HASH> 100644
--- a/hbmqtt/test_client.py
+++ b/hbmqtt/test_client.py
@@ -20,4 +20,4 @@ def test_coro():
if __name__ == '__main__':
logging.basicConfig(level=logging.DEBUG)
- asyncio.get_event_loop().run_until_complete(test_coro())
\ No newline at end of file
+# asyncio.get_event_loop().run_until_complete(test_coro())
\ No newline at end of file
|
disable (temporarly) testing
|
diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php
index <HASH>..<HASH> 100644
--- a/plugins/Login/Controller.php
+++ b/plugins/Login/Controller.php
@@ -441,8 +441,9 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
try {
$passwordHash = $this->passwordResetter->checkValidConfirmPasswordToken($login, $resetToken);
} catch (Exception $ex) {
- Log::debug($ex);
+ $this->bruteForceDetection->addFailedAttempt(IP::getIpFromHeader());
+ Log::debug($ex);
$errorMessage = $ex->getMessage();
}
|
Use brute force detection for reset password action (#<I>)
|
diff --git a/kie-api/src/main/java/org/kie/api/pmml/PMMLRequestData.java b/kie-api/src/main/java/org/kie/api/pmml/PMMLRequestData.java
index <HASH>..<HASH> 100644
--- a/kie-api/src/main/java/org/kie/api/pmml/PMMLRequestData.java
+++ b/kie-api/src/main/java/org/kie/api/pmml/PMMLRequestData.java
@@ -81,6 +81,7 @@ public class PMMLRequestData {
}
public synchronized boolean addRequestParam(ParameterInfo parameter) {
+ this.requestParams.removeIf(pi -> parameter.getName().equals(pi.getName()));
return this.requestParams.add(parameter);
}
|
RHPAM-<I> Guided Score card rules not executed via test scenario (#<I>)
Adding a paramater now replaces a parameter with the same name.
|
diff --git a/decidim-core/lib/decidim/core.rb b/decidim-core/lib/decidim/core.rb
index <HASH>..<HASH> 100644
--- a/decidim-core/lib/decidim/core.rb
+++ b/decidim-core/lib/decidim/core.rb
@@ -86,7 +86,7 @@ module Decidim
# Exposes a configuration option: The application name String.
config_accessor :available_locales do
- %w(en ca es eu fi fr nl)
+ %w(en ca es eu it fi fr nl)
end
# Exposes a configuration option: an object to configure geocoder
|
Adding italian language to default locale (#<I>)
|
diff --git a/lib/faalis/version.rb b/lib/faalis/version.rb
index <HASH>..<HASH> 100755
--- a/lib/faalis/version.rb
+++ b/lib/faalis/version.rb
@@ -18,5 +18,5 @@
# -----------------------------------------------------------------------------
module Faalis
- VERSION = '2.0.0.rc3'
+ VERSION = '2.0.0.rc4'
end
|
version <I>.rc4
|
diff --git a/skew/backends/redis_backend.py b/skew/backends/redis_backend.py
index <HASH>..<HASH> 100644
--- a/skew/backends/redis_backend.py
+++ b/skew/backends/redis_backend.py
@@ -48,7 +48,7 @@ class RedisBlockingQueue(RedisQueue):
def read(self):
try:
- return self.conn.brpop(self.queue_name)
+ return self.conn.brpop(self.queue_name)[1]
except ConnectionError:
# unfortunately, there is no way to differentiate a socket timing
# out and a host being unreachable
|
Fixing a bug in the redis blocking queue
|
diff --git a/Classes/Neos/Neos/Ui/Aspects/AugmentationAspect.php b/Classes/Neos/Neos/Ui/Aspects/AugmentationAspect.php
index <HASH>..<HASH> 100644
--- a/Classes/Neos/Neos/Ui/Aspects/AugmentationAspect.php
+++ b/Classes/Neos/Neos/Ui/Aspects/AugmentationAspect.php
@@ -118,7 +118,7 @@ class AugmentationAspect
/** @var NodeInterface $node */
$node = $joinPoint->getMethodArgument('node');
$content = $joinPoint->getMethodArgument('content');
- $fusionPath = $joinPoint->getMethodArgument('typoScriptPath');
+ $fusionPath = $joinPoint->getMethodArgument('fusionPath');
if (!$this->needsMetadata($node, false)) {
return $content;
|
TASK: Adapt aspect to changed argument name in Neos
|
diff --git a/system/src/Grav/Framework/Flex/Storage/FolderStorage.php b/system/src/Grav/Framework/Flex/Storage/FolderStorage.php
index <HASH>..<HASH> 100644
--- a/system/src/Grav/Framework/Flex/Storage/FolderStorage.php
+++ b/system/src/Grav/Framework/Flex/Storage/FolderStorage.php
@@ -360,7 +360,9 @@ class FolderStorage extends AbstractFilesystemStorage
{
try {
$data = $file->content();
- $file->delete();
+ if ($file->exists()) {
+ $file->delete();
+ }
/** @var UniformResourceLocator $locator */
$locator = Grav::instance()['locator'];
|
FlexFolderStorage: fixed error on deleting file
|
diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index <HASH>..<HASH> 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -166,7 +166,7 @@ CodeMirror.defineMode("clojure", function (options) {
var qualifiedSymbol = /^(?:(?:[^\\\/\[\]\d\s"#'(),;@^`{}~][^\\\[\]\s"(),;@^`{}~]*(?:\.[^\\\/\[\]\d\s"#'(),;@^`{}~][^\\\[\]\s"(),;@^`{}~]*)*\/)?(?:\/|[^\\\/\[\]\d\s"#'(),;@^`{}~][^\\\[\]\s"(),;@^`{}~]*)*(?=[\\\[\]\s"(),;@^`{}~]|$))/;
function base(stream, state) {
- if (stream.eatSpace()) return ["space", null];
+ if (stream.eatSpace() || stream.eat(",")) return ["space", null];
if (stream.match(numberLiteral)) return [null, "number"];
if (stream.match(characterLiteral)) return [null, "string-2"];
if (stream.eat(/^"/)) return (state.tokenize = inString)(stream, state);
|
[clojure mode] Treat commas as whitespace
Closes #<I>
|
diff --git a/core/renderMiddleware.js b/core/renderMiddleware.js
index <HASH>..<HASH> 100644
--- a/core/renderMiddleware.js
+++ b/core/renderMiddleware.js
@@ -639,11 +639,19 @@ function endResponse(req, res, context, start, page) {
function logRequestStats(req, res, context, start){
var allRequests = TritonAgent.cache().getAllRequests()
, notLoaded = TritonAgent.cache().getLateRequests()
+ , sock = req.socket
+ , stash = context.getServerStash()
+
+ stash.bytesR = sock.bytesRead - (sock._preR||(sock._preR=0));
+ stash.bytesW = sock.bytesWritten - (sock._preW||(sock._preW=0));
+
+ sock._preR += stash.bytesR;
+ sock._preW += stash.bytesW;
logger.gauge("countDataRequests", allRequests.length);
logger.gauge("countLateArrivals", notLoaded.length, {hi: 1});
- logger.gauge("bytesRead", req.socket.bytesRead, {hi: 1<<12});
- logger.gauge("bytesWritten", req.socket.bytesWritten, {hi: 1<<18});
+ logger.gauge("bytesRead", stash.bytesR, {hi: 1<<12});
+ logger.gauge("bytesWritten", stash.bytesW, {hi: 1<<18});
var time = new Date - start;
|
RED-<I> Better I/O accounting with keepalive
|
diff --git a/c7n/resources/account.py b/c7n/resources/account.py
index <HASH>..<HASH> 100644
--- a/c7n/resources/account.py
+++ b/c7n/resources/account.py
@@ -600,6 +600,7 @@ class RequestLimitIncrease(BaseAction):
'VPC': 'amazon-virtual-private-cloud',
'IAM': 'aws-identity-and-access-management',
'CloudFormation': 'aws-cloudformation',
+ 'Kinesis': 'amazon-kinesis',
}
def process(self, resources):
|
aws - service-limit-increase add kinesis to service code mapping (#<I>)
|
diff --git a/.eslintrc.js b/.eslintrc.js
index <HASH>..<HASH> 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -10,6 +10,7 @@ module.exports = {
}],
'no-param-reassign': ['error', {
props: false,
- }]
+ }],
+ 'prefer-destructuring': 'off',
}
};
|
lint: prefer-destructuring: off
|
diff --git a/lib/airbrake-ruby/tdigest.rb b/lib/airbrake-ruby/tdigest.rb
index <HASH>..<HASH> 100644
--- a/lib/airbrake-ruby/tdigest.rb
+++ b/lib/airbrake-ruby/tdigest.rb
@@ -247,7 +247,7 @@ module Airbrake
end
def to_a
- @centroids.map { |_, c| c }
+ @centroids.each_value.to_a
end
# rubocop:disable Metrics/PerceivedComplexity, Metrics/MethodLength
|
tdigest: refactor #to_a to use more idiomatic Ruby
|
diff --git a/src/main/java/com/hackoeur/jglm/Mat4.java b/src/main/java/com/hackoeur/jglm/Mat4.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/hackoeur/jglm/Mat4.java
+++ b/src/main/java/com/hackoeur/jglm/Mat4.java
@@ -24,7 +24,10 @@ import com.hackoeur.jglm.support.Precision;
*
* @author James Royalty
*/
-public class Mat4 extends AbstractMat {
+public final class Mat4 extends AbstractMat {
+ public static final Mat4 MAT4_ZERO = new Mat4();
+ public static final Mat4 MAT4_IDENTITY = new Mat4(1.0f);
+
/* ::-------------------------------------------------------------------------::
* COLUMN MAJOR LAYOUT: The first index indicates the COLUMN NUMBER.
* The second is the ROW NUMBER.
|
Added constants for IDENTITY and ZERO. Made class final.
|
diff --git a/test/nexttext.js b/test/nexttext.js
index <HASH>..<HASH> 100644
--- a/test/nexttext.js
+++ b/test/nexttext.js
@@ -1,9 +1,6 @@
-var _ = require('lodash');
-var async = require('async');
var chai = require('chai');
var expect = chai.expect;
var lacona;
-var sinon = require('sinon');
chai.use(require('sinon-chai'));
@@ -29,7 +26,7 @@ describe('nextText', function () {
]
},
completion: {}
- }
+ };
lacona.nextText(inputOption, function (err, nextText) {
expect(err).to.not.exist;
@@ -38,4 +35,3 @@ describe('nextText', function () {
});
});
});
-
|
lint test/nexttest.js succeeds
|
diff --git a/cmd/prometheus/main_test.go b/cmd/prometheus/main_test.go
index <HASH>..<HASH> 100644
--- a/cmd/prometheus/main_test.go
+++ b/cmd/prometheus/main_test.go
@@ -226,6 +226,7 @@ func TestWALSegmentSizeBounds(t *testing.T) {
t.Errorf("prometheus should be still running: %v", err)
case <-time.After(5 * time.Second):
prom.Process.Kill()
+ <-done
}
continue
}
@@ -268,6 +269,7 @@ func TestMaxBlockChunkSegmentSizeBounds(t *testing.T) {
t.Errorf("prometheus should be still running: %v", err)
case <-time.After(5 * time.Second):
prom.Process.Kill()
+ <-done
}
continue
}
@@ -438,6 +440,7 @@ func TestModeSpecificFlags(t *testing.T) {
t.Errorf("prometheus should be still running: %v", err)
case <-time.After(5 * time.Second):
prom.Process.Kill()
+ <-done
}
return
}
|
cmd/prometheus: wait for Prometheus to shutdown in tests
So temporary data directory can be successfully removed, as on Windows,
directory cannot be in used while removal.
|
diff --git a/packages/functionals/botpress-qna/src/views/index.js b/packages/functionals/botpress-qna/src/views/index.js
index <HASH>..<HASH> 100755
--- a/packages/functionals/botpress-qna/src/views/index.js
+++ b/packages/functionals/botpress-qna/src/views/index.js
@@ -203,7 +203,7 @@ export default class QnaAdmin extends Component {
const nodeOptions = !redirectFlow
? []
- : find(flows, { name: redirectFlow }).nodes.map(({ name }) => ({ label: name, value: name }))
+ : get(find(flows, { name: redirectFlow }), 'nodes', []).map(({ name }) => ({ label: name, value: name }))
return (
<div className={style.paddedRow}>
|
fix(qna): on flow deletion or rename, QNA still works
|
diff --git a/lib/cms9/engine.rb b/lib/cms9/engine.rb
index <HASH>..<HASH> 100644
--- a/lib/cms9/engine.rb
+++ b/lib/cms9/engine.rb
@@ -1,6 +1,14 @@
module Cms9
class Engine < ::Rails::Engine
isolate_namespace Cms9
+ require 'sass-rails'
+ require 'uglifier'
+ require 'coffee-rails'
+ require 'jquery-rails'
+ require 'jbuilder'
+ require 'bootstrap'
+ require 'wysiwyg-rails'
+
initializer :append_migrations do |app|
unless app.root.to_s.match(root.to_s)
config.paths["db/migrate"].expanded.each do |expand_path|
diff --git a/lib/cms9/version.rb b/lib/cms9/version.rb
index <HASH>..<HASH> 100644
--- a/lib/cms9/version.rb
+++ b/lib/cms9/version.rb
@@ -1,3 +1,3 @@
module Cms9
- VERSION = '0.1.8'
+ VERSION = '0.1.9'
end
|
- fix engine.rb 8th
|
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb
index <HASH>..<HASH> 100644
--- a/activerecord/lib/active_record/core.rb
+++ b/activerecord/lib/active_record/core.rb
@@ -162,6 +162,9 @@ module ActiveRecord
v.nil? || Array === v || Hash === v
}
+ # We can't cache Post.find_by(author: david) ...yet
+ return super unless hash.keys.all? { |k| columns_hash.has_key?(k.to_s) }
+
key = hash.keys
klass = self
diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
index <HASH>..<HASH> 100644
--- a/activerecord/test/cases/finder_test.rb
+++ b/activerecord/test/cases/finder_test.rb
@@ -1073,6 +1073,11 @@ class FinderTest < ActiveRecord::TestCase
assert_equal nil, Post.find_by("1 = 0")
end
+ test "find_by with associations" do
+ assert_equal authors(:david), Post.find_by(author: authors(:david)).author
+ assert_equal authors(:mary) , Post.find_by(author: authors(:mary) ).author
+ end
+
test "find_by doesn't have implicit ordering" do
assert_sql(/^((?!ORDER).)*$/) { Post.find_by(id: posts(:eager_other).id) }
end
|
Fix find_by with associations not working with adequate record
For now, we will just skip the cache when a non-column key is used in the hash.
If the future, we can probably move some of the logic in PredicateBuilder.expand
up the chain to make caching possible for association queries.
Closes #<I>
Fixes #<I>
|
diff --git a/src/Models/History.php b/src/Models/History.php
index <HASH>..<HASH> 100644
--- a/src/Models/History.php
+++ b/src/Models/History.php
@@ -1,8 +1,8 @@
<?php
namespace TypiCMS\Modules\History\Models;
+use Laracasts\Presenter\PresentableTrait;
use TypiCMS\Models\Base;
-use TypiCMS\Presenters\PresentableTrait;
class History extends Base
{
@@ -72,7 +72,7 @@ class History extends Base
/**
* Get title (overwrite Base model method)
- *
+ *
* @return string|null
*/
public function getHrefAttribute()
diff --git a/src/Presenters/ModulePresenter.php b/src/Presenters/ModulePresenter.php
index <HASH>..<HASH> 100644
--- a/src/Presenters/ModulePresenter.php
+++ b/src/Presenters/ModulePresenter.php
@@ -1,7 +1,7 @@
<?php
namespace TypiCMS\Modules\History\Presenters;
-use TypiCMS\Presenters\Presenter;
+use Laracasts\Presenter\Presenter;
class ModulePresenter extends Presenter
{
|
use of laracasts/presenter
|
diff --git a/packages/ember-routing/lib/system/route.js b/packages/ember-routing/lib/system/route.js
index <HASH>..<HASH> 100644
--- a/packages/ember-routing/lib/system/route.js
+++ b/packages/ember-routing/lib/system/route.js
@@ -410,6 +410,8 @@ function normalizeOptions(route, name, template, options) {
options.name = name;
options.template = template;
+ Ember.assert("An outlet ("+options.outlet+") was specified but this view will render at the root level.", options.outlet === 'main' || options.into);
+
var controller = options.controller, namedController;
if (options.controller) {
|
Assert when rendering to root with an outletName
|
diff --git a/scripts/parse_proto.py b/scripts/parse_proto.py
index <HASH>..<HASH> 100755
--- a/scripts/parse_proto.py
+++ b/scripts/parse_proto.py
@@ -44,6 +44,7 @@ class ProtoMetadata:
java_api_version = 2
java_alt_api_package = ''
outer_class = ''
+ optimize_for = 'SPEED'
def __init__(self):
self.messages = []
@@ -72,6 +73,10 @@ def MatchOptions(line, data):
if match:
data.multiple_files = True if match.group(1).lower() == 'true' else False
+ match = re.match(r'option\s+optimize_for\s*=\s*(\S+)\s*;', line)
+ if match:
+ data.optimize_for = match.group(1)
+
def MatchTypes(line, data):
# messages and enums
|
Parse and handle the "optimize_for" proto option.
|
diff --git a/query.go b/query.go
index <HASH>..<HASH> 100644
--- a/query.go
+++ b/query.go
@@ -3,8 +3,8 @@ package notifications
import (
"encoding/json"
- peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
- pstore "gx/ipfs/QmXHUpFsnpCmanRnacqYkFoLoFfEq5yS2nUgGkAjJ1Nj9j/go-libp2p-peerstore"
+ pstore "gx/ipfs/QmQdnfvZQuhdT93LNc5bos52wAmdr3G2p6G8teLJMEN32P/go-libp2p-peerstore"
+ peer "gx/ipfs/QmRBqJF7hb8ZSpRcMwUt8hNhydWcxGEhtk81HKq6oUwKvs/go-libp2p-peer"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
)
|
Update go-log in whole dependency tree (#<I>)
* Update golog in go-ipfs
License: MIT
|
diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
index <HASH>..<HASH> 100644
--- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
+++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
@@ -682,7 +682,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
versions := map[string]string{
"k8s-1.7": "2.6.12-kops.1",
"k8s-1.7-v3": "3.8.0-kops.2",
- "k8s-1.12": "3.9.3-kops.2",
+ "k8s-1.12": "3.9.5-kops.1",
"k8s-1.16": "3.12.0-kops.1",
}
@@ -749,7 +749,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
key := "networking.projectcalico.org.canal"
versions := map[string]string{
"k8s-1.9": "3.2.3-kops.1",
- "k8s-1.12": "3.7.4-kops.1",
+ "k8s-1.12": "3.7.5-kops.1",
"k8s-1.15": "3.12.0-kops.1",
}
{
|
Bump Calico and Canal version tags for older k8s
|
diff --git a/Tests/Transport/CurlTransportTest.php b/Tests/Transport/CurlTransportTest.php
index <HASH>..<HASH> 100644
--- a/Tests/Transport/CurlTransportTest.php
+++ b/Tests/Transport/CurlTransportTest.php
@@ -25,7 +25,7 @@ class CurlTransportTest extends \PHPUnit_Framework_TestCase
$this->object = new CurlTransport();
$this->server = array('protocol' => 'http', 'host' => 'test.com', 'cancellation_path' => 'test.cgi');
- $this->globals = array('site' => '052', 'rank' => '032', 'login' => '12345679', 'hmac' => 'sha512');
+ $this->globals = array('site' => '052', 'rank' => '032', 'login' => '12345679', 'hmac' => array('key' => '123123133', 'algorithm' => 'sha512'));
}
/**
|
Fixed breaking CurlTransport unit test
|
diff --git a/test/commit-message.js b/test/commit-message.js
index <HASH>..<HASH> 100644
--- a/test/commit-message.js
+++ b/test/commit-message.js
@@ -174,6 +174,7 @@ var nonImperativeCases = [
'Implementing new feature',
'Implements new feature',
'Merged changes into master branch',
+ // 'Manually merged changes into master', // this will fail currently
'Sending the old record to the gateway',
'Included new library'
];
|
Add non-imperative failing test (commented out)
|
diff --git a/dream.js b/dream.js
index <HASH>..<HASH> 100644
--- a/dream.js
+++ b/dream.js
@@ -90,8 +90,8 @@ function Dream() {
return dreamInstance;
};
- self.input = function input(input) {
- self._dreamHelper.input = input;
+ self.input = function input(value) {
+ self._dreamHelper.input = value;
return (self);
};
@@ -187,7 +187,7 @@ function Dream() {
};
- self.schema = function schema(schema) {
+ self.schema = function schema(value) {
var validatedSchema;
var newSchema;
var args = [];
@@ -200,7 +200,7 @@ function Dream() {
schema: typeof (args[0]) === 'object' ? args.shift() : {}
};
} else {
- newSchema = schema;
+ newSchema = value;
}
validatedSchema = validateAndReturnSchema(newSchema);
|
- Fixed errors preventing PhantomJS to start properly
|
diff --git a/csp.py b/csp.py
index <HASH>..<HASH> 100644
--- a/csp.py
+++ b/csp.py
@@ -300,7 +300,7 @@ usa = MapColoringCSP(list('RGBY'),
TX: AR LA; MN: WI IA; IA: WI IL MO; MO: IL KY TN AR; AR: MS TN LA;
LA: MS; WI: MI IL; IL: IN; IN: KY; MS: TN AL; AL: TN GA FL; MI: OH;
OH: PA WV KY; KY: WV VA TN; TN: VA NC GA; GA: NC SC FL;
- PA: NY NJ DE MD WV; WV: MD VA; VA: MD DC NC; NC: SC; NY: VT MA CA NJ;
+ PA: NY NJ DE MD WV; WV: MD VA; VA: MD DC NC; NC: SC; NY: VT MA CT NJ;
NJ: DE; DE: MD; MD: DC; VT: NH MA; MA: NH RI CT; CT: RI; ME: NH;
HI: ; AK: """)
#______________________________________________________________________________
|
Changed NY's neighbor to be CT, not CA
|
diff --git a/lib/API.php b/lib/API.php
index <HASH>..<HASH> 100644
--- a/lib/API.php
+++ b/lib/API.php
@@ -22,7 +22,7 @@ class API {
private $API_VERSION = '1';
private $API_HEADER_KEY = 'X-SWU-API-KEY';
private $API_HEADER_CLIENT = 'X-SWU-API-CLIENT';
- private $API_CLIENT_VERSION = "2.6.1";
+ private $API_CLIENT_VERSION = "2.7.1";
private $API_CLIENT_STUB = "php-%s";
private $DEBUG = false;
|
Can get logs specified by before/after timestamp
|
diff --git a/aaf2/ama.py b/aaf2/ama.py
index <HASH>..<HASH> 100644
--- a/aaf2/ama.py
+++ b/aaf2/ama.py
@@ -171,6 +171,8 @@ def guess_edit_rate(metadata):
codec_type = st['codec_type']
if codec_type == 'video':
return AAFRational(st['avg_frame_rate'])
+ elif codec_type == 'audio':
+ return AAFRational(f"{st['sample_rate']}/1")
def guess_length(metadata, edit_rate):
for st in metadata['streams']:
|
guess_edit_rate() now also implemented for audio types
This should allow create_ama_link() to work with audio files.
|
diff --git a/view/frontend/web/js/view/payment/method-renderer/applepay.js b/view/frontend/web/js/view/payment/method-renderer/applepay.js
index <HASH>..<HASH> 100755
--- a/view/frontend/web/js/view/payment/method-renderer/applepay.js
+++ b/view/frontend/web/js/view/payment/method-renderer/applepay.js
@@ -174,16 +174,15 @@ define(
$(self.button_target).click(function(evt) {
// Prepare the parameters
var runningTotal = self.getQuoteValue();
- var billingAddress = self.getBillingAddress();
+ var billingAddress = self.getBillingAddress();
var shippingAddress = self.getShippingAddress();
// Build the payment request
var paymentRequest = {
currencyCode: CheckoutCom.getPaymentConfig()['quote_currency'],
countryCode: billingAddress.countryId,
- requiredShippingContactFields: ['postalAddress'],
- //requiredShippingContactFields: ['postalAddress','email', 'name', 'phone'],
- requiredBillingContactFields: ['postalAddress'],
+ requiredShippingContactFields: ['postalAddress','name'],
+ requiredBillingContactFields: ['postalAddress','name'],
lineItems: [],
billingContact: {
givenName: billingAddress.firstname,
|
Apple Pay shopper fileds
Added the name field to billing contact and shipping contact requirements.
|
diff --git a/peerconn.go b/peerconn.go
index <HASH>..<HASH> 100644
--- a/peerconn.go
+++ b/peerconn.go
@@ -1107,7 +1107,9 @@ func (c *PeerConn) mainReadLoop() (err error) {
c.peerChoking = true
// We can now reset our interest. I think we do this after setting the flag in case the
// peerImpl updates synchronously (webseeds?).
- c.updateRequests("choked")
+ if !c.actualRequestState.Requests.IsEmpty() {
+ c.updateRequests("choked")
+ }
c.updateExpectingChunks()
case pp.Unchoke:
if !c.peerChoking {
@@ -1133,7 +1135,9 @@ func (c *PeerConn) mainReadLoop() (err error) {
c.fastEnabled())
torrent.Add("requestsPreservedThroughChoking", int64(preservedCount))
}
- c.updateRequests("unchoked")
+ if !c.t._pendingPieces.IsEmpty() {
+ c.updateRequests("unchoked")
+ }
c.updateExpectingChunks()
case pp.Interested:
c.peerInterested = true
|
Reduce idle request updates due to choke and unchoke messages
|
diff --git a/iris.go b/iris.go
index <HASH>..<HASH> 100644
--- a/iris.go
+++ b/iris.go
@@ -64,7 +64,6 @@ import (
"sync"
"time"
- "github.com/gavv/httpexpect"
"github.com/kataras/go-errors"
"github.com/kataras/go-fs"
"github.com/kataras/go-serializer"
@@ -196,9 +195,6 @@ type (
Plugins PluginContainer
Websocket *WebsocketServer
SSH *SSHServer
-
- // this is setted once when .Tester(t) is called
- testFramework *httpexpect.Expect
}
)
|
For <I> - Remove unused testFramework from the previous commit
Read HISTORY.md for changes:
<URL>
|
diff --git a/ingredients_http/errors/validation.py b/ingredients_http/errors/validation.py
index <HASH>..<HASH> 100644
--- a/ingredients_http/errors/validation.py
+++ b/ingredients_http/errors/validation.py
@@ -21,8 +21,11 @@ def json_errors_to_json(validation_errors, root=None):
})
elif isinstance(value, FrozenDict):
for k in value.keys():
- for field in value[k].keys():
- json_errors.extend(json_errors_to_json({str(k): value[k][field]}, root=root + "/" + key))
+ if isinstance(value[k], dict):
+ for field in value[k].keys():
+ json_errors.extend(json_errors_to_json({str(k): value[k][field]}, root=root + "/" + key))
+ else:
+ json_errors.extend(json_errors_to_json({str(k): value[k]}, root=root+"/"+key))
else:
for error in value:
json_errors.append({
|
Fix validation error with nested documents
|
diff --git a/flask_sqlalchemy_booster/queryable_mixin.py b/flask_sqlalchemy_booster/queryable_mixin.py
index <HASH>..<HASH> 100644
--- a/flask_sqlalchemy_booster/queryable_mixin.py
+++ b/flask_sqlalchemy_booster/queryable_mixin.py
@@ -13,6 +13,14 @@ class QueryableMixin(object):
_no_overwrite_ = []
+
+ def update_without_commit(self, **kwargs):
+ kwargs = self._preprocess_params(kwargs)
+ for key, value in kwargs.iteritems():
+ if key not in self._no_overwrite_:
+ setattr(self, key, value)
+ return self
+
def update(self, **kwargs):
"""Updates an instance.
@@ -678,7 +686,8 @@ class QueryableMixin(object):
Args:
**kwargs: instance parameters
"""
- return cls.first(**kwargs) or cls.build(**kwargs)
+ keys = kwargs.pop('keys') if 'keys' in kwargs else []
+ return cls.first(**subdict(kwargs, keys)) or cls.build(**kwargs)
@classmethod
def find_or_new(cls, **kwargs):
|
adding update without commit and also adding keys argument to find_or_build
|
diff --git a/connector/setup.py b/connector/setup.py
index <HASH>..<HASH> 100755
--- a/connector/setup.py
+++ b/connector/setup.py
@@ -182,7 +182,7 @@ setup(
'paramiko >= 1.15.1',
'lxml >= 3.3.0',
'ncclient >= 0.6.6',
- 'grpcio <= 1.36.1',
+ 'grpcio <= 1.28.1',
'cisco-gnmi >= 1.0.13, < 2.0.0',
],
|
revert grpcio to <I>
|
diff --git a/credentials/backends.py b/credentials/backends.py
index <HASH>..<HASH> 100644
--- a/credentials/backends.py
+++ b/credentials/backends.py
@@ -1,6 +1,11 @@
import os
import json
+try:
+ import configparser
+except ImportError:
+ import ConfigParser as configparser
+
class EnvBackend(object):
@@ -21,3 +26,20 @@ class JsonFileBackend(object):
return doc.get(key, None)
except (IOError, ValueError):
return None
+
+
+class ConfigFileBackend(object):
+
+ def __init__(self, path, section='credentials'):
+ self._path = path
+ self._section = section
+
+ def load(self, key):
+ try:
+ config = configparser.ConfigParser()
+ config.read(self._path)
+
+ return config.get(self._section, key)
+
+ except Exception:
+ return None
|
Add config file based backend.
|
diff --git a/builtin/logical/pki/path_issue_sign.go b/builtin/logical/pki/path_issue_sign.go
index <HASH>..<HASH> 100644
--- a/builtin/logical/pki/path_issue_sign.go
+++ b/builtin/logical/pki/path_issue_sign.go
@@ -188,7 +188,7 @@ func (b *backend) pathSignVerbatim(ctx context.Context, req *logical.Request, da
func (b *backend) pathIssueSignCert(ctx context.Context, req *logical.Request, data *framework.FieldData, role *roleEntry, useCSR, useCSRValues bool) (*logical.Response, error) {
// If storing the certificate and on a performance standby, forward this request on to the primary
- if !role.NoStore && b.System().ReplicationState().HasState(consts.ReplicationPerformanceStandby) {
+ if !role.NoStore && b.System().ReplicationState().HasState(consts.ReplicationPerformanceStandby|consts.ReplicationPerformanceSecondary) {
return nil, logical.ErrReadOnly
}
|
Forward cert signing requests to the primary on perf secondaries as well as perf standbys (#<I>)
|
diff --git a/commons/components/commons-mule/src/main/java/org/soitoolkit/commons/mule/log/DefaultEventLogger.java b/commons/components/commons-mule/src/main/java/org/soitoolkit/commons/mule/log/DefaultEventLogger.java
index <HASH>..<HASH> 100644
--- a/commons/components/commons-mule/src/main/java/org/soitoolkit/commons/mule/log/DefaultEventLogger.java
+++ b/commons/components/commons-mule/src/main/java/org/soitoolkit/commons/mule/log/DefaultEventLogger.java
@@ -111,11 +111,11 @@ public class DefaultEventLogger implements EventLogger, MuleContextAware {
// Used to transform payloads that are jaxb-objects into a xml-string
private JaxbObjectToXmlTransformer jaxbToXml = null;
- {
+ static {
try {
// Let's give it a try, fail silently...
HOST = InetAddress.getLocalHost();
- HOST_NAME = HOST.getCanonicalHostName();
+ HOST_NAME = HOST.getHostName();
HOST_IP = HOST.getHostAddress();
PROCESS_ID = ManagementFactory.getRuntimeMXBean().getName();
} catch (Throwable ex) {
|
Fixes issue <I> performance problem in DefaultEventLogger
|
diff --git a/itests/standalone/basic/src/test/java/org/wildfly/camel/test/optaplanner/OptaPlannerIntegrationTest.java b/itests/standalone/basic/src/test/java/org/wildfly/camel/test/optaplanner/OptaPlannerIntegrationTest.java
index <HASH>..<HASH> 100644
--- a/itests/standalone/basic/src/test/java/org/wildfly/camel/test/optaplanner/OptaPlannerIntegrationTest.java
+++ b/itests/standalone/basic/src/test/java/org/wildfly/camel/test/optaplanner/OptaPlannerIntegrationTest.java
@@ -26,6 +26,7 @@ import org.jboss.gravia.resource.ManifestBuilder;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.Assert;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.optaplanner.examples.cloudbalancing.domain.CloudBalance;
@@ -34,6 +35,7 @@ import org.wildfly.extension.camel.CamelAware;
@CamelAware
@RunWith(Arquillian.class)
+@Ignore("[#2150] Kie assumes that the TCCL can load its services")
public class OptaPlannerIntegrationTest {
@Deployment
|
[Ignore #<I>] Kie assumes that the TCCL can load its services
|
diff --git a/autograd/grads.py b/autograd/grads.py
index <HASH>..<HASH> 100644
--- a/autograd/grads.py
+++ b/autograd/grads.py
@@ -98,7 +98,7 @@ np.mean = P(np.mean, make_grad_np_mean)
def make_grad_chooser(ans, x, axis=None, keepdims=None):
"""Builds gradient of functions that choose a single item, such as min or max."""
repeater, _ = repeat_to_match_shape(x, axis, keepdims)
- argmax_locations = x == repeater(ans) # TODO: Properly handle identical entries.
+ argmax_locations = x == repeater(ans)
return [lambda g: repeater(g) * argmax_locations]
np.max = P(np.max, make_grad_chooser)
np.min = P(np.min, make_grad_chooser)
|
Realized that min and max already handle exact equality in the way we'd expect them to, but that the gradient isn't well-defined in that case anyways.
|
diff --git a/lib/cf/version.rb b/lib/cf/version.rb
index <HASH>..<HASH> 100644
--- a/lib/cf/version.rb
+++ b/lib/cf/version.rb
@@ -1,3 +1,3 @@
module CF
- VERSION = "5.2.1.rc6".freeze
+ VERSION = "5.2.1.rc7".freeze
end
|
Bumping to version <I>.rc7.
|
diff --git a/core/selection.js b/core/selection.js
index <HASH>..<HASH> 100644
--- a/core/selection.js
+++ b/core/selection.js
@@ -167,8 +167,8 @@ class Selection {
return index + blot.index(node, offset);
}
});
- let start = Math.min(...indexes), end = Math.max(...indexes);
- end = Math.min(end, this.scroll.length() - 1);
+ let end = Math.min(Math.max(...indexes), this.scroll.length() - 1);
+ let start = Math.min(end, ...indexes);
return new Range(start, end-start);
}
|
fix range having negative length
when scroll.length() == 0
|
diff --git a/src/main/java/com/imsweb/naaccrxml/sas/SasCsvToXml.java b/src/main/java/com/imsweb/naaccrxml/sas/SasCsvToXml.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/imsweb/naaccrxml/sas/SasCsvToXml.java
+++ b/src/main/java/com/imsweb/naaccrxml/sas/SasCsvToXml.java
@@ -149,7 +149,7 @@ public class SasCsvToXml {
}
public void convert(String fields, List<SasFieldInfo> availableFields) throws IOException {
- SasUtils.logInfo("Starting converting CSV to XML...");
+ SasUtils.logInfo("Starting converting CSV to XML" + (!_groupTumors ? " (tumor grouping disabled) " : "") + "...");
int numXmlFields = -1, numCsvFields = -1;
List<String> unusedCsvField = null;
try {
|
Trying to figure out why option is not working
|
diff --git a/_pydev_runfiles/pydev_runfiles_pytest2.py b/_pydev_runfiles/pydev_runfiles_pytest2.py
index <HASH>..<HASH> 100644
--- a/_pydev_runfiles/pydev_runfiles_pytest2.py
+++ b/_pydev_runfiles/pydev_runfiles_pytest2.py
@@ -164,10 +164,16 @@ except ImportError:
def _get_error_contents_from_report(report):
if report.longrepr is not None:
- tw = TerminalWriter(stringio=True)
+ try:
+ tw = TerminalWriter(stringio=True)
+ stringio = tw.stringio
+ except TypeError:
+ import io
+ stringio = io.StringIO()
+ tw = TerminalWriter(file=stringio)
tw.hasmarkup = False
report.toterminal(tw)
- exc = tw.stringio.getvalue()
+ exc = stringio.getvalue()
s = exc.strip()
if s:
return s
|
Fix to support latest pytest
|
diff --git a/platform/android/build/android_tools.rb b/platform/android/build/android_tools.rb
index <HASH>..<HASH> 100644
--- a/platform/android/build/android_tools.rb
+++ b/platform/android/build/android_tools.rb
@@ -345,7 +345,7 @@ def load_app_and_run(device_flag, apkfile, pkgname)
while count < 20
theoutput = ""
begin
- status = Timeout::timeout(30) do
+ status = Timeout::timeout(300) do
puts "CMD: #{cmd}"
IO.popen(argv) do |pipe|
child = pipe.pid
|
platform/android/build/android_tools.rb: install timeout is increased to <I>s (framework_spec on Win<I> Virtual Box)
|
diff --git a/lib/filelib.php b/lib/filelib.php
index <HASH>..<HASH> 100644
--- a/lib/filelib.php
+++ b/lib/filelib.php
@@ -475,14 +475,6 @@ function put_records_csv($file, $records, $table = NULL) {
}
-if (!function_exists('file_get_contents')) {
- function file_get_contents($file) {
- $file = file($file);
- return !$file ? false : implode('', $file);
- }
-}
-
-
/**
* Recursively delete the file or folder with path $location. That is,
* if it is a file delete it. If it is a folder, delete all its content
|
MDL-<I> obsoleted file_get_contents() emulation removed from filelib
|
diff --git a/.jsdoc.js b/.jsdoc.js
index <HASH>..<HASH> 100644
--- a/.jsdoc.js
+++ b/.jsdoc.js
@@ -31,7 +31,8 @@ module.exports = {
source: {
excludePattern: '(^|\\/|\\\\)[._]',
include: [
- 'build/src'
+ 'build/src',
+ 'protos'
],
includePattern: '\\.js$'
},
@@ -42,7 +43,7 @@ module.exports = {
systemName: '@google-cloud/bigquery-data-transfer',
theme: 'lumen',
default: {
- "outputSourceFiles": false
+ outputSourceFiles: false
}
},
markdown: {
|
chore: update .jsdoc.js by add protos and remove double quotes (#<I>)
|
diff --git a/components/http.php b/components/http.php
index <HASH>..<HASH> 100644
--- a/components/http.php
+++ b/components/http.php
@@ -12,6 +12,7 @@ class QM_Component_HTTP extends QM_Component {
add_action( 'http_api_debug', array( $this, 'http_debug' ), 99, 5 );
add_filter( 'http_request_args', array( $this, 'http_request' ), 99, 2 );
add_filter( 'http_response', array( $this, 'http_response' ), 99, 3 );
+ add_filter( 'pre_http_request', array( $this, 'http_response' ), 99, 3 );
add_filter( 'query_monitor_menus', array( $this, 'admin_menu' ), 60 );
}
|
Catch the return value of the `pre_http_request` filter so we can log any `WP_Error`s returned here by plugins
|
diff --git a/src/Message/Response/AbstractRabobankResponse.php b/src/Message/Response/AbstractRabobankResponse.php
index <HASH>..<HASH> 100644
--- a/src/Message/Response/AbstractRabobankResponse.php
+++ b/src/Message/Response/AbstractRabobankResponse.php
@@ -43,9 +43,10 @@ class AbstractRabobankResponse extends AbstractResponse
if (!isset($this->data['signature'])) {
return;
}
-
- $signatureData = $this->data;
- unset($signatureData['signature']);
+
+ $signatureData = [
+ 'redirectUrl' => $this->data['redirectUrl'] ?? '',
+ ];
$signature = $this->request->gateway->generateSignature($this->flattenData($signatureData));
|
Update AbstractRabobankResponse.php
Changed the building of the signatureData array. Since only the redirectURl is needed to validate the purchase response url we should make sure its the only thing in the array.
|
diff --git a/lib/config/presets.js b/lib/config/presets.js
index <HASH>..<HASH> 100644
--- a/lib/config/presets.js
+++ b/lib/config/presets.js
@@ -20,7 +20,7 @@ async function resolveConfigPresets(
);
let config = {};
// First, merge all the preset configs from left to right
- if (inputConfig.extends) {
+ if (inputConfig.extends && inputConfig.extends.length) {
logger.debug('Found presets');
for (const preset of inputConfig.extends) {
// istanbul ignore if
@@ -44,7 +44,8 @@ async function resolveConfigPresets(
logger.trace({ config }, `Post-merge resolve config`);
for (const key of Object.keys(config)) {
const val = config[key];
- if (isObject(val) && key !== 'logger') {
+ const ignoredKeys = ['api', 'content', 'logger'];
+ if (isObject(val) && ignoredKeys.indexOf(key) === -1) {
// Resolve nested objects
logger.trace(`Resolving object "${key}"`);
config[key] = await resolveConfigPresets(val, logger, existingPresets);
|
fix: do not resolve packageFile content (#<I>)
|
diff --git a/jaraco/__init__.py b/jaraco/__init__.py
index <HASH>..<HASH> 100644
--- a/jaraco/__init__.py
+++ b/jaraco/__init__.py
@@ -1 +1 @@
-__path__ = __import__('pkgutil').extend_path(__path__, __name__)
+__path__ = __import__('pkgutil').extend_path(__path__, __name__) # type: ignore
diff --git a/jaraco/util/exceptions.py b/jaraco/util/exceptions.py
index <HASH>..<HASH> 100644
--- a/jaraco/util/exceptions.py
+++ b/jaraco/util/exceptions.py
@@ -1,6 +1,6 @@
from __future__ import unicode_literals
-from jaraco import context
+from jaraco import context # type: ignore
def throws_exception(callable, *exceptions):
|
🧎♀️ Genuflect to the types.
|
diff --git a/Sniffs/Commenting/FunctionCommentSniff.php b/Sniffs/Commenting/FunctionCommentSniff.php
index <HASH>..<HASH> 100644
--- a/Sniffs/Commenting/FunctionCommentSniff.php
+++ b/Sniffs/Commenting/FunctionCommentSniff.php
@@ -221,8 +221,11 @@ class ONGR_Sniffs_Commenting_FunctionCommentSniff implements PHP_CodeSniffer_Sni
// Check for a comment description.
$short = $comment->getShortComment();
if (trim($short) === '') {
- $error = 'Missing short description in function doc comment';
- $phpcsFile->addError($error, $commentStart, 'MissingShort');
+ if (preg_match('/^(set|get|has|add|is)[A-Z]/', $this->_methodName) !== 1) {
+ $error = 'Missing short description in function doc comment';
+ $phpcsFile->addError($error, $commentStart, 'MissingShort');
+ }
+
return;
}
|
Allow getters / setters without short doc
|
diff --git a/src/main/java/com/github/davidcarboni/cryptolite/GenerateRandom.java b/src/main/java/com/github/davidcarboni/cryptolite/GenerateRandom.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/github/davidcarboni/cryptolite/GenerateRandom.java
+++ b/src/main/java/com/github/davidcarboni/cryptolite/GenerateRandom.java
@@ -31,8 +31,7 @@ public class GenerateRandom {
public static final String ALGORITHM = "SHA1PRNG";
// Work out the right number of bytes for random tokens:
- private static final int bitsInAByte = 8;
- private static final int tokenLengthBytes = TOKEN_BITS / bitsInAByte;
+ private static final int tokenLengthBytes = TOKEN_BITS / 8;
// Characters for pasword generation:
private static final String passwordCharacters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
|
Because the number of bits in a byte isn't going to change and because it's clear enough with a magic number.
|
diff --git a/app/models/devise_token_auth/concerns/user.rb b/app/models/devise_token_auth/concerns/user.rb
index <HASH>..<HASH> 100644
--- a/app/models/devise_token_auth/concerns/user.rb
+++ b/app/models/devise_token_auth/concerns/user.rb
@@ -99,11 +99,7 @@ module DeviseTokenAuth::Concerns::User
end
def database_exists?
- ActiveRecord::Base.connection
- rescue ActiveRecord::NoDatabaseError
- false
- else
- true
+ ActiveRecord::Base.connection_pool.with_connection { |con| con.active? } rescue false
end
end
|
Better implementation to test if connection to db is active
|
diff --git a/eZ/Publish/Core/REST/Server/index.php b/eZ/Publish/Core/REST/Server/index.php
index <HASH>..<HASH> 100644
--- a/eZ/Publish/Core/REST/Server/index.php
+++ b/eZ/Publish/Core/REST/Server/index.php
@@ -249,6 +249,8 @@ $valueObjectVisitors = array(
'\\eZ\\Publish\\Core\\REST\\Server\\Values\\PolicyList' => new Output\ValueObjectVisitor\PolicyList( $urlHandler ),
'\\eZ\\Publish\\API\\Repository\\Values\\User\\Limitation' => new Output\ValueObjectVisitor\Limitation( $urlHandler ),
'\\eZ\\Publish\\Core\\REST\\Server\\Values\\RoleAssignmentList' => new Output\ValueObjectVisitor\RoleAssignmentList( $urlHandler ),
+ '\\eZ\\Publish\\API\\Repository\\Values\\User\\UserRoleAssignment' => new Output\ValueObjectVisitor\UserRoleAssignment( $urlHandler ),
+ '\\eZ\\Publish\\API\\Repository\\Values\\User\\UserGroupRoleAssignment' => new Output\ValueObjectVisitor\UserGroupRoleAssignment( $urlHandler ),
// Location
|
REST: Add User(Group)RoleAssignment visitors
|
diff --git a/Swat/SwatPercentageEntry.php b/Swat/SwatPercentageEntry.php
index <HASH>..<HASH> 100644
--- a/Swat/SwatPercentageEntry.php
+++ b/Swat/SwatPercentageEntry.php
@@ -39,7 +39,7 @@ class SwatPercentageEntry extends SwatFloatEntry
{
parent::process();
- if (($this->value >= 0) and ($this->value <= 100))
+ if (($this->value >= 0) && ($this->value <= 100))
$this->value = $this->value / 100;
else {
$message = Swat::_('Please use a number between 0 and 100');
@@ -60,7 +60,7 @@ class SwatPercentageEntry extends SwatFloatEntry
*/
protected function getDisplayValue()
{
- if (is_float($this->value) and ($this->value >= 0) and ($this->value <= 100))
+ if (is_float($this->value) && ($this->value >= 0) && ($this->value <= 100))
return ($this->value * 100).'%';
}
|
Use '&&' as the logical AND operator.
svn commit r<I>
|
diff --git a/python_modules/dagster/dagster/core/host_representation/repository_location.py b/python_modules/dagster/dagster/core/host_representation/repository_location.py
index <HASH>..<HASH> 100644
--- a/python_modules/dagster/dagster/core/host_representation/repository_location.py
+++ b/python_modules/dagster/dagster/core/host_representation/repository_location.py
@@ -317,7 +317,9 @@ class PythonEnvRepositoryLocation(RepositoryLocation):
recon_repo = ReconstructableRepository(pointer)
execution_plan = create_execution_plan(
- pipeline=recon_repo.get_reconstructable_pipeline(external_pipeline.name),
+ pipeline=recon_repo.get_reconstructable_pipeline(
+ external_pipeline.name
+ ).subset_for_execution_from_existing_pipeline(external_pipeline.solids_to_execute),
run_config=run_config,
mode=pipeline_run.mode,
step_keys_to_execute=step_keys_to_execute,
|
[celery-k8s] fix solid subset part 2
Summary: just like D<I>
Test Plan: eyes
Reviewers: yuhan
Reviewed By: yuhan
Differential Revision: <URL>
|
diff --git a/lib/stripe_mock/request_handlers/payment_methods.rb b/lib/stripe_mock/request_handlers/payment_methods.rb
index <HASH>..<HASH> 100644
--- a/lib/stripe_mock/request_handlers/payment_methods.rb
+++ b/lib/stripe_mock/request_handlers/payment_methods.rb
@@ -1,7 +1,6 @@
module StripeMock
module RequestHandlers
module PaymentMethods
-
ALLOWED_PARAMS = [:customer, :type]
def PaymentMethods.included(klass)
@@ -52,26 +51,6 @@ module StripeMock
Data.mock_list_object(clone.values, params)
end
-
- #
- # params: {:customer=>"test_cus_3"}
- #
- def attach_payment_method(route, method_url, params, headers)
- route =~ method_url
- id = $1
- payment_methods[id].merge!(params)
- payment_methods[id].clone
- end
-
- def detach_payment_method(route, method_url, params, headers)
-
- end
-
- def get_payment_method(route, method_url, params, headers)
- route =~ method_url
- id = $1
- assert_existence(:payment_method, $1, payment_methods[id])
- end
# post /v1/payment_methods/:id/attach
def attach_payment_method(route, method_url, params, headers)
|
Remove empty and duplicated methods from payment methods #<I>
|
diff --git a/src/remoteStorage.js b/src/remoteStorage.js
index <HASH>..<HASH> 100644
--- a/src/remoteStorage.js
+++ b/src/remoteStorage.js
@@ -91,11 +91,11 @@ define([
//
// // to use that code from an app, you need to add:
//
- // remoteStorage.claimAccess('beers', 'rw');
+ // remoteStorage.claimAccess('beers', 'rw').then(function() {
+ // remoteStorage.displayWidget()
//
- // remoteStorage.displayWidget(/* see documentation */)
- //
- // remoteStorage.beers.addBeer('<replace-with-favourite-beer-kind>');
+ // remoteStorage.beers.addBeer('<replace-with-favourite-beer-kind>');
+ // });
//
// (end code)
//
|
remoteStorage doc: updated claimAccess/displayWidget example code to chain promises as well
|
diff --git a/setuptools/tests/test_msvc9compiler.py b/setuptools/tests/test_msvc9compiler.py
index <HASH>..<HASH> 100644
--- a/setuptools/tests/test_msvc9compiler.py
+++ b/setuptools/tests/test_msvc9compiler.py
@@ -1,8 +1,5 @@
-"""msvc9compiler monkey patch test
-
-This test ensures that importing setuptools is sufficient to replace
-the standard find_vcvarsall function with our patched version that
-finds the Visual C++ for Python package.
+"""
+Tests for msvc9compiler.
"""
import os
@@ -57,6 +54,11 @@ def mock_reg(hkcu=None, hklm=None):
class TestModulePatch:
+ """
+ Ensure that importing setuptools is sufficient to replace
+ the standard find_vcvarsall function with a version that
+ recognizes the "Visual C++ for Python" package.
+ """
key_32 = r'software\microsoft\devdiv\vcforpython\9.0\installdir'
key_64 = r'software\wow6432node\microsoft\devdiv\vcforpython\9.0\installdir'
|
Move docstring to test class.
|
diff --git a/src/csv_export_util.js b/src/csv_export_util.js
index <HASH>..<HASH> 100644
--- a/src/csv_export_util.js
+++ b/src/csv_export_util.js
@@ -29,7 +29,7 @@ function toString(data, keys, separator, excludeCSVHeader) {
for (let i = firstRow; i <= rowCount; i++) {
dataString += headCells.map(x => {
if ((x.row + (x.rowSpan - 1)) === i) {
- return x.header;
+ return `"${x.header}"`;
}
if (x.row === i && x.rowSpan > 1) {
return '';
|
Add quotation marks to header cells on CSV export
|
diff --git a/src/ServiceManager.php b/src/ServiceManager.php
index <HASH>..<HASH> 100644
--- a/src/ServiceManager.php
+++ b/src/ServiceManager.php
@@ -678,10 +678,7 @@ class ServiceManager implements ServiceLocatorInterface
}
}
- throw new ServiceNotFoundException(sprintf(
- 'Unable to resolve service "%s" to a factory; are you certain you provided it during configuration?',
- $name
- ));
+ throw ServiceNotFoundException::fromUnknownService($name);
}
/**
|
Changed exception creation to named constructor.
|
diff --git a/TYPO3.Eel/Classes/TYPO3/Eel/FlowQuery/Operations/Object/FilterOperation.php b/TYPO3.Eel/Classes/TYPO3/Eel/FlowQuery/Operations/Object/FilterOperation.php
index <HASH>..<HASH> 100644
--- a/TYPO3.Eel/Classes/TYPO3/Eel/FlowQuery/Operations/Object/FilterOperation.php
+++ b/TYPO3.Eel/Classes/TYPO3/Eel/FlowQuery/Operations/Object/FilterOperation.php
@@ -25,7 +25,7 @@ use TYPO3\Flow\Annotations as Flow;
* =
* Strict equality of value and operand
* !=
- * Strict no equality of value and operand
+ * Strict inequality of value and operand
* $=
* Value ends with operand (string-based)
* ^=
|
[TASK] Adjust doc comment for FlowQuery filter operation
Change-Id: I<I>a<I>dbe<I>df<I>d<I>a5a<I>b<I>e1
Releases: master
Reviewed-on: <URL>
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.