diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/fitsio/fitslib.py b/fitsio/fitslib.py
index <HASH>..<HASH> 100644
--- a/fitsio/fitslib.py
+++ b/fitsio/fitslib.py
@@ -4491,7 +4491,7 @@ _hdu_type_map = {IMAGE_HDU:'IMAGE_HDU',
'BINARY_TBL':BINARY_TBL}
# no support yet for complex
-_table_fits2npy = {1: 'b1',
+_table_fits2npy = {#1: 'b1',
11: 'u1',
12: 'i1',
14: 'b1', # logical. Note pyfits uses this for i1, cfitsio casts to char*
|
temporarily comment out support for binary table type 1, X
|
diff --git a/lib/datalib.php b/lib/datalib.php
index <HASH>..<HASH> 100644
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -567,7 +567,7 @@ function get_record_sql($sql, $expectmultiple=false, $nolimit=false) {
$limit = '';
} else if ($expectmultiple) {
$limit = ' LIMIT 1';
- } else if (isset($CFG->debug) && $CFG->debug) {
+ } else if (isset($CFG->debug) && $CFG->debug > 7) {
// Debugging mode - don't use a limit of 1, but do change the SQL, because sometimes that
// causes errors, and in non-debug mode you don't see the error message and it is
// impossible to know what's wrong.
|
Bug #<I> missing ' > 7' in debug test. Merged from MOODLE_<I>_STABLE.
|
diff --git a/lib/state_machine.rb b/lib/state_machine.rb
index <HASH>..<HASH> 100644
--- a/lib/state_machine.rb
+++ b/lib/state_machine.rb
@@ -24,8 +24,8 @@ module StateMachine
# Default is nil.
# * <tt>:integration</tt> - The name of the integration to use for adding
# library-specific behavior to the machine. Built-in integrations
- # include :data_mapper, :active_record, and :sequel. By default, this
- # is determined automatically.
+ # include :active_model, :active_record, :data_mapper, :mongo_mapper, and
+ # :sequel. By default, this is determined automatically.
#
# Configuration options relevant to ORM integrations:
# * <tt>:plural</tt> - The pluralized name of the attribute. By default,
|
Update StateMachine::MacroMethods docs to reflect new integrations
|
diff --git a/HISTORY.rst b/HISTORY.rst
index <HASH>..<HASH> 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -2,6 +2,10 @@
History
-------
+0.4.25 (2020-03-12)
+___________________
+* Bug Fixes
+
0.4.24 (2020-02-25)
___________________
* Added some extra fields(ms_server) for Fixed Address
diff --git a/infoblox_client/__init__.py b/infoblox_client/__init__.py
index <HASH>..<HASH> 100644
--- a/infoblox_client/__init__.py
+++ b/infoblox_client/__init__.py
@@ -1,3 +1,3 @@
__author__ = 'John Belamaric'
__email__ = 'jbelamaric@infoblox.com'
-__version__ = '0.4.24'
+__version__ = '0.4.25'
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@ with open('testing_requirements.txt') as requirements_file:
setup(
name='infoblox-client',
- version='0.4.24',
+ version='0.4.25',
description="Client for interacting with Infoblox NIOS over WAPI",
long_description=readme + '\n\n' + history,
long_description_content_type='text/markdown',
|
Bump up version to <I> (#<I>)
|
diff --git a/test/test_db.py b/test/test_db.py
index <HASH>..<HASH> 100644
--- a/test/test_db.py
+++ b/test/test_db.py
@@ -1,5 +1,3 @@
-from eventlet.greenpool import GreenPile
-from mock import Mock
from sqlalchemy import Column, Integer
from sqlalchemy.ext.declarative import declarative_base
from sqlalchemy.orm.session import Session
@@ -29,31 +27,6 @@ config = {
}
-def test_concurrency():
-
- container = Mock()
- container.config = config
- container.service_name = "fooservice"
-
- entrypoint = DummyProvider()
- service_instance = Mock()
-
- def inject(worker_ctx):
- orm_session = OrmSession(DeclBase).bind(container, "session")
- orm_session.setup()
- return orm_session.acquire_injection(worker_ctx)
-
- # get injections concurrently
- pile = GreenPile()
- for _ in xrange(CONCURRENT_REQUESTS):
- worker_ctx = WorkerContext(container, service_instance, entrypoint)
- pile.spawn(inject, worker_ctx)
- results = set(pile)
-
- # injections should all be unique
- assert len(results) == CONCURRENT_REQUESTS
-
-
def test_db(container_factory):
container = container_factory(FooService, config)
|
Don't need to test sqlalchemy session thread-safety; trust the docs
|
diff --git a/pact-jvm-provider-junit/src/main/java/au/com/dius/pact/provider/junit/loader/PactBrokerLoader.java b/pact-jvm-provider-junit/src/main/java/au/com/dius/pact/provider/junit/loader/PactBrokerLoader.java
index <HASH>..<HASH> 100644
--- a/pact-jvm-provider-junit/src/main/java/au/com/dius/pact/provider/junit/loader/PactBrokerLoader.java
+++ b/pact-jvm-provider-junit/src/main/java/au/com/dius/pact/provider/junit/loader/PactBrokerLoader.java
@@ -58,7 +58,7 @@ public class PactBrokerLoader implements PactLoader {
this.pactBrokerTags = tags.stream().flatMap(tag -> parseListExpression(tag).stream()).collect(toList());
this.pactBrokerConsumers = consumers.stream().flatMap(consumer -> parseListExpression(consumer).stream()).collect(toList());
this.failIfNoPactsFound = true;
- this.pactSource = new PactBrokerSource(this.pactBrokerHost, this.pactBrokerPort);
+ this.pactSource = new PactBrokerSource(this.pactBrokerHost, this.pactBrokerPort, this.pactBrokerProtocol);
}
public PactBrokerLoader(final PactBroker pactBroker) {
|
Put back oddly removed param for pactSource initialization
|
diff --git a/slither/core/declarations/function.py b/slither/core/declarations/function.py
index <HASH>..<HASH> 100644
--- a/slither/core/declarations/function.py
+++ b/slither/core/declarations/function.py
@@ -305,6 +305,7 @@ class Function(metaclass=ABCMeta): # pylint: disable=too-many-public-methods
from slither.slithir.operations import Call
if self._can_send_eth is None:
+ self._can_send_eth = False
for ir in self.all_slithir_operations():
if isinstance(ir, Call) and ir.can_send_eth():
self._can_send_eth = True
|
fix that Function.can_send_eth() sometimes returns None when it's supposed to return bool
|
diff --git a/asammdf/typing.py b/asammdf/typing.py
index <HASH>..<HASH> 100644
--- a/asammdf/typing.py
+++ b/asammdf/typing.py
@@ -12,7 +12,7 @@ from typing_extensions import Literal
from .blocks import v2_v3_blocks, v4_blocks
from .blocks.source_utils import Source
-StrOrBytesPath = Union[str, bytes, PathLike[str], PathLike[bytes]]
+StrOrBytesPath = Union[str, bytes, "PathLike[str]", "PathLike[bytes]"]
# asammdf specific types
|
fix(typing): does not work with Python <I>
|
diff --git a/Facades/Http.php b/Facades/Http.php
index <HASH>..<HASH> 100644
--- a/Facades/Http.php
+++ b/Facades/Http.php
@@ -20,7 +20,7 @@ use Illuminate\Http\Client\Factory;
* @method static \Illuminate\Http\Client\PendingRequest contentType(string $contentType)
* @method static \Illuminate\Http\Client\PendingRequest dd()
* @method static \Illuminate\Http\Client\PendingRequest dump()
- * @method static \Illuminate\Http\Client\PendingRequest retry(int $times, int $sleep = 0)
+ * @method static \Illuminate\Http\Client\PendingRequest retry(int $times, int $sleep = 0, ?callable $when = null)
* @method static \Illuminate\Http\Client\PendingRequest sink(string|resource $to)
* @method static \Illuminate\Http\Client\PendingRequest stub(callable $callback)
* @method static \Illuminate\Http\Client\PendingRequest timeout(int $seconds)
|
[8.x] Allow passing when callback to Http client retry method (#<I>)
* Allow passing when callback to http client retry method
* linting
* add callable type
* update phpdoc on factory and facade
* Update PendingRequest.php
|
diff --git a/client.go b/client.go
index <HASH>..<HASH> 100644
--- a/client.go
+++ b/client.go
@@ -692,7 +692,7 @@ func (c *Client) DisableTraceAll() *Client {
return c
}
-// EnableTraceAll enable trace for all requests.
+// EnableTraceAll enable trace for all requests (http3 currently does not support trace).
func (c *Client) EnableTraceAll() *Client {
c.trace = true
return c
diff --git a/request.go b/request.go
index <HASH>..<HASH> 100644
--- a/request.go
+++ b/request.go
@@ -686,7 +686,7 @@ func (r *Request) DisableTrace() *Request {
return r
}
-// EnableTrace enables trace.
+// EnableTrace enables trace (http3 currently does not support trace).
func (r *Request) EnableTrace() *Request {
if r.trace == nil {
r.trace = &clientTrace{}
|
declare in the comment that h3 does not support trace yet
|
diff --git a/ghost/admin/config/targets.js b/ghost/admin/config/targets.js
index <HASH>..<HASH> 100644
--- a/ghost/admin/config/targets.js
+++ b/ghost/admin/config/targets.js
@@ -1,11 +1,19 @@
/* eslint-env node */
+const browsers = [
+ 'last 2 Chrome versions',
+ 'last 2 Firefox versions',
+ 'last 2 Safari versions',
+ 'last 2 Edge versions'
+];
+
+const isCI = !!process.env.CI;
+const isProduction = process.env.EMBER_ENV === 'production';
+
+if (isCI || isProduction) {
+ browsers.push('ie 11');
+}
+
module.exports = {
- browsers: [
- 'ie 11',
- 'last 2 Chrome versions',
- 'last 2 Firefox versions',
- 'last 2 Safari versions',
- 'last 2 Edge versions'
- ]
+ browsers
};
|
Only transpile for IE<I> target in CI & production builds
no issue
- makes debugging during development easier because there's a lot less indirection added to work around missing ES6 support in IE<I>
|
diff --git a/asammdf/gui/widgets/mdi_area.py b/asammdf/gui/widgets/mdi_area.py
index <HASH>..<HASH> 100644
--- a/asammdf/gui/widgets/mdi_area.py
+++ b/asammdf/gui/widgets/mdi_area.py
@@ -1827,8 +1827,6 @@ class WithMDIArea:
)
numeric.add_new_channels(signals)
- numeric.format = fmt
- numeric._update_values()
menu = w.systemMenu()
|
fix loading numeric window from display file
|
diff --git a/ci/bootstrap.py b/ci/bootstrap.py
index <HASH>..<HASH> 100755
--- a/ci/bootstrap.py
+++ b/ci/bootstrap.py
@@ -1,7 +1,5 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-from __future__ import absolute_import, print_function, unicode_literals
-
import os
import sys
from os.path import exists
diff --git a/docs/conf.py b/docs/conf.py
index <HASH>..<HASH> 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,6 +1,4 @@
# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
import os
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,5 @@
#!/usr/bin/env python
# -*- encoding: utf-8 -*-
-from __future__ import absolute_import
-from __future__ import print_function
import io
import re
|
chg: dev: Remove __future__ imports; I'm not supporting Python 2.
|
diff --git a/src/Router/DefaultRouter.php b/src/Router/DefaultRouter.php
index <HASH>..<HASH> 100644
--- a/src/Router/DefaultRouter.php
+++ b/src/Router/DefaultRouter.php
@@ -85,7 +85,7 @@ class DefaultRouter extends AbstractRouter
$params = $this->makeKeyValuePairs($params);
$params = $params + $routeData->getParams();
unset($params['params']);
- $routeData->setParams($params);
+ $routeData = new RouteData($routeData->getRouteName(), $params);
}
return $routeData;
@@ -118,9 +118,7 @@ class DefaultRouter extends AbstractRouter
$params['params'][] = $value;
}
- $routeData->setParams($params);
-
- return $router->makeUrl($routeData, $language, $absolute);
+ return $router->makeUrl(new RouteData($routeData->getRouteName(), $params), $language, $absolute);
}
private function makeKeyValuePairs(array $array)
|
Fix DefaultRouter: RouteData is immutable
|
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php
index <HASH>..<HASH> 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php
@@ -99,8 +99,7 @@ EOT
{
/** @var KernelInterface $kernel */
$kernel = $this->getApplication()->getKernel();
- $targetArg = rtrim($input->getArgument('target'), '/');
-
+ $targetArg = rtrim($input->getArgument('target') ?? '', '/');
if (!$targetArg) {
$targetArg = $this->getPublicDirectory($kernel->getContainer());
}
|
[FrameworkBundle] Avoid calling rtrim(null, '/') in AssetsInstallCommand
|
diff --git a/tests/ApiEvidenceTest.php b/tests/ApiEvidenceTest.php
index <HASH>..<HASH> 100644
--- a/tests/ApiEvidenceTest.php
+++ b/tests/ApiEvidenceTest.php
@@ -79,7 +79,7 @@ class ApiTestEvidence extends TestCase {
$this->assertEquals("some description", $evidence_item1->evidence_item->description);
//Check we can't make an invalid grade item
- $this->expectException(\Exception::class);
+ $this->expectException("\Exception");
$evidence_item2 = $this->api->create_evidence_item_grade("B", "some description", $this->credential->credential->id);
}
@@ -89,7 +89,7 @@ class ApiTestEvidence extends TestCase {
$this->assertEquals("Completed in 9 days", $evidence_item1->evidence_item->description);
//Check we can't make an invalid duration item
- $this->expectException(\Exception::class);
+ $this->expectException("\Exception");
$evidence_item2 = $this->api->create_evidence_item_duration(date("Y-m-d", strtotime("2017-10-01")), date("Y-m-d", strtotime("2017-10-01")), $this->credential->credential->id);
}
|
Remove class resolution to ensure compatibility with php <I>
|
diff --git a/test/integration/helper.js b/test/integration/helper.js
index <HASH>..<HASH> 100644
--- a/test/integration/helper.js
+++ b/test/integration/helper.js
@@ -101,11 +101,13 @@ exports.setLib = function(context) {
// Mutate the bindings arrays to not check dates.
if (item === 'bindings') {
parseBindingDates(newData, localData);
- } if (item === 'result') {
+ }
+
+ if (item === 'result') {
parseResultDates(newData, localData);
}
- expect(localData).to.eql(newData);
+ expect(newData).to.eql(localData);
});
|
Reverse expect for console output to be correct
|
diff --git a/lib/jsonapi/request.rb b/lib/jsonapi/request.rb
index <HASH>..<HASH> 100644
--- a/lib/jsonapi/request.rb
+++ b/lib/jsonapi/request.rb
@@ -185,7 +185,11 @@ module JSONAPI
checked_has_one_associations[param] = @resource_klass.resource_for(association.type).verify_key(value, context)
elsif association.is_a?(JSONAPI::Association::HasMany)
keys = []
- value.each do |value|
+ if value.is_a?(Array)
+ value.each do |val|
+ keys.push(@resource_klass.resource_for(association.type).verify_key(val, context))
+ end
+ else
keys.push(@resource_klass.resource_for(association.type).verify_key(value, context))
end
checked_has_many_associations[param] = keys
diff --git a/test/controllers/controller_test.rb b/test/controllers/controller_test.rb
index <HASH>..<HASH> 100644
--- a/test/controllers/controller_test.rb
+++ b/test/controllers/controller_test.rb
@@ -526,7 +526,7 @@ class PostsControllerTest < ActionController::TestCase
post_object = Post.find(3)
assert_equal 1, post_object.tags.length
- put :update_association, {post_id: 3, association: 'tags', tags: [5]}
+ put :update_association, {post_id: 3, association: 'tags', tags: 5}
assert_response :no_content
post_object = Post.find(3)
|
Fix issue if value was not an array for parse_params for a HasMany association
|
diff --git a/tests/integration/states/test_pkg.py b/tests/integration/states/test_pkg.py
index <HASH>..<HASH> 100644
--- a/tests/integration/states/test_pkg.py
+++ b/tests/integration/states/test_pkg.py
@@ -490,7 +490,7 @@ class PkgTest(ModuleCase, SaltReturnAssertsMixin):
self.skipTest('Package manager is not available')
test_name = 'bash-completion'
- if (grains.get('os') == 'Amazon' and grains.get('osmajorrelease') != 2):
+ if grains.get('os') == 'Amazon' and grains.get('osmajorrelease') != 2:
test_name = 'bash-doc'
ret = self.run_state('pkg.installed',
@@ -513,7 +513,7 @@ class PkgTest(ModuleCase, SaltReturnAssertsMixin):
self.skipTest('Package manager is not available')
package = 'bash-completion'
- if (grains.get('os') == 'Amazon' and grains.get('osmajorrelease') != 2):
+ if grains.get('os') == 'Amazon' and grains.get('osmajorrelease') != 2:
package = 'bash-doc'
pkgquery = 'version'
|
Fixed pylint issue on PR not showing when run pylint locally
|
diff --git a/test/unique-css.js b/test/unique-css.js
index <HASH>..<HASH> 100644
--- a/test/unique-css.js
+++ b/test/unique-css.js
@@ -149,3 +149,10 @@ test(
'.one.two {} .one.two.three {}',
'.one.two {} .one.two.three {}'
);
+
+test(
+ 'keyframe selectors',
+ css,
+ '@keyframes a {0% {} 100% {}} @keyframes b {0% {} 100% {}}',
+ '@keyframes a {0% {} 100% {}} @keyframes b {0% {} 100% {}}'
+);
|
Issue #<I>: Add test for expected keyframe behavior
|
diff --git a/ddmrp/tests/test_ddmrp.py b/ddmrp/tests/test_ddmrp.py
index <HASH>..<HASH> 100644
--- a/ddmrp/tests/test_ddmrp.py
+++ b/ddmrp/tests/test_ddmrp.py
@@ -51,7 +51,7 @@ class TestDdmrp(common.SavepointCase):
cls.customer_location = cls.env.ref('stock.stock_location_customers')
cls.uom_unit = cls.env.ref('product.product_uom_unit')
cls.buffer_profile_pur = cls.env.ref(
- 'ddmrp.stock_buffer_profile_replenish_purchased_short_low')
+ 'ddmrp.stock_buffer_profile_replenish_purchased_medium_low')
cls.group_stock_manager = cls.env.ref('stock.group_stock_manager')
cls.group_mrp_user = cls.env.ref('mrp.group_mrp_user')
cls.group_change_procure_qty = cls.env.ref(
|
Use the buffer profile which match with the test data
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -13,21 +13,21 @@ setup(
long_description_content_type='text/markdown',
include_package_data=True,
install_requires=[
- 'directory_client_core>=6.0.0,<7.0.0',
+ 'directory_client_core>=6.1.0,<7.0.0',
],
extras_require={
'test': [
- 'pytest==5.1.0',
- 'pytest-cov==2.7.1',
- 'pytest-sugar>=0.9.1,<1.0.0',
- 'flake8==3.7.8',
- 'requests_mock==1.6.0',
- 'freezegun==0.3.12',
'codecov==2.0.15',
- 'twine>=1.11.0,<2.0.0',
- 'wheel>=0.31.0,<1.0.0',
- 'pytest-django>=3.2.1,<4.0.0',
- 'setuptools>=38.6.0,<42.0.0',
+ 'flake8==3.7.9',
+ 'freezegun==0.3.15',
+ 'pytest-cov==2.8.1',
+ 'pytest-django>=3.8.0,<4.0.0',
+ 'pytest-sugar>=0.9.2,<1.0.0',
+ 'pytest==5.3.5',
+ 'requests_mock==1.7.0',
+ 'setuptools>=45.2.0,<50.0.0',
+ 'twine>=3.1.1,<4.0.0',
+ 'wheel>=0.34.2,<1.0.0',
]
},
classifiers=[
|
update all requirements to the latest available version
|
diff --git a/beetle/base.py b/beetle/base.py
index <HASH>..<HASH> 100644
--- a/beetle/base.py
+++ b/beetle/base.py
@@ -34,6 +34,10 @@ def default_copy(path, output):
class Includer(object):
specific = {}
+ def add(self, extensions, function):
+ for extension in extensions:
+ self.specific[extension] = function
+
def __init__(self, folders, output):
self.folders = folders
self.output = output
|
Enabled extending the includer.
|
diff --git a/includes/Controls.php b/includes/Controls.php
index <HASH>..<HASH> 100644
--- a/includes/Controls.php
+++ b/includes/Controls.php
@@ -50,21 +50,4 @@ class Controls {
return $this->controls;
}
- /**
- * Hook into WP
- */
- private function register_hooks() {
- add_action( 'customize_register', array( $this, 'include_files' ), 99 );
- }
-
- /**
- * Include the custom control files. Because they depend on the WP_Cs
- */
- public function include_files() {
- $path = KIRKI_PATH . '/includes/Controls';
- foreach ( self::$CONTROL_TYPES as $typeId => $className ) {
- include_once( $path . '/' . $className . '.php' );
- }
- }
-
}
|
No need for that since we now use an autoloader
|
diff --git a/lib/switch_user/provider.rb b/lib/switch_user/provider.rb
index <HASH>..<HASH> 100644
--- a/lib/switch_user/provider.rb
+++ b/lib/switch_user/provider.rb
@@ -10,11 +10,11 @@ module SwitchUser
autoload :Session, 'switch_user/provider/session'
def self.init(controller)
- if SwitchUser.provider.is_a?(Hash)
- klass_part = SwitchUser.provider[:name]
+ klass_part = if SwitchUser.provider.is_a?(Hash)
+ SwitchUser.provider[:name]
else
- klass_part = SwitchUser.provider
- end
+ SwitchUser.provider
+ end
klass_part = klass_part.to_s.classify
diff --git a/lib/switch_user/provider/dummy.rb b/lib/switch_user/provider/dummy.rb
index <HASH>..<HASH> 100644
--- a/lib/switch_user/provider/dummy.rb
+++ b/lib/switch_user/provider/dummy.rb
@@ -20,11 +20,11 @@ module SwitchUser
attr_reader :original_user
def remember_current_user(remember)
- if remember
- @original_user = current_user
+ @original_user = if remember
+ current_user
else
- @original_user = nil
- end
+ nil
+ end
end
end
end
|
Auto corrected by following Style/ConditionalAssignment
|
diff --git a/js/test/test.js b/js/test/test.js
index <HASH>..<HASH> 100644
--- a/js/test/test.js
+++ b/js/test/test.js
@@ -155,7 +155,7 @@ let testTrades = async (exchange, symbol) => {
let trades = await exchange.fetchTrades (symbol)
log (symbol.green, 'fetched', Object.values (trades).length.toString ().green, 'trades')
- log (asTable (trades))
+ // log (asTable (trades))
} else {
|
removed excessive logging from test.js
|
diff --git a/ddsc/localstore.py b/ddsc/localstore.py
index <HASH>..<HASH> 100644
--- a/ddsc/localstore.py
+++ b/ddsc/localstore.py
@@ -1,4 +1,5 @@
import os
+import math
import datetime
import hashlib
import mimetypes
@@ -248,7 +249,7 @@ class LocalFile(object):
processor(chunk, chunk_hash_alg, chunk_hash_value)
def count_chunks(self, bytes_per_chunk):
- return int(float(self.size) / float(bytes_per_chunk))
+ return math.ceil(float(self.size) / float(bytes_per_chunk))
@staticmethod
def read_in_chunks(infile, blocksize):
|
Fix off by one bug in chunk count for progress bar
|
diff --git a/lib/fetch/index.js b/lib/fetch/index.js
index <HASH>..<HASH> 100644
--- a/lib/fetch/index.js
+++ b/lib/fetch/index.js
@@ -1676,24 +1676,16 @@ function httpNetworkFetch (
}
}
- let iterator
-
if (decoders.length > 1) {
- this.decoder = decoders[0]
- iterator = pipeline(...decoders, () => {})[
- Symbol.asyncIterator
- ]()
- } else if (decoders.length === 1) {
- this.decoder = decoders[0]
- iterator = this.decoder[Symbol.asyncIterator]()
- } else {
- this.decoder = new PassThrough()
- iterator = this.decoder[Symbol.asyncIterator]()
+ pipeline(...decoders, () => {})
+ } else if (decoders.length === 0) {
+ // TODO (perf): Avoid intermediate.
+ decoders.push(new PassThrough())
}
- if (this.decoder) {
- this.decoder.on('drain', resume)
- }
+ this.decoder = decoders[0].on('drain', resume)
+
+ const iterator = decoders[decoders.length - 1][Symbol.asyncIterator]()
pullAlgorithm = async (controller) => {
// 4. Set bytes to the result of handling content codings given
|
refactor: simplify decoders
|
diff --git a/commons/queue/queue_test.go b/commons/queue/queue_test.go
index <HASH>..<HASH> 100644
--- a/commons/queue/queue_test.go
+++ b/commons/queue/queue_test.go
@@ -86,7 +86,7 @@ func (s *MySuite) TestOffer(c *C) {
}
func (s *MySuite) TestConcurrent(c *C) {
- cap := math.MaxInt16
+ cap := 32
q, _ := NewChannelQueue(cap)
if q == nil {
c.Fail()
|
reduce number of threads in test, -race flag during tests makes it very slow
|
diff --git a/nunaliit2-js/src/main/js/nunaliit2/tuio/tuioclient.js b/nunaliit2-js/src/main/js/nunaliit2/tuio/tuioclient.js
index <HASH>..<HASH> 100644
--- a/nunaliit2-js/src/main/js/nunaliit2/tuio/tuioclient.js
+++ b/nunaliit2-js/src/main/js/nunaliit2/tuio/tuioclient.js
@@ -496,10 +496,6 @@ function dispatchMouseEventWin(eventType, winX, winY)
function removeObject(dict, inst) {
// Object is long dead and no longer influential, remove
- if (dict == cursors) {
- // Cursor is no longer alive, (cursor up)
- onCursorUp(inst);
- }
if (dict[inst].div != undefined) {
// Remove calibration div
@@ -540,6 +536,13 @@ function updateAlive(dict, alive) {
// No longer alive, flag as dead and schedule removal
dict[inst].alive = false;
dict[inst].deathTime = Date.now();
+
+ // Issue cursor up immediately for responsive clicking
+ if (dict == cursors) {
+ onCursorUp(inst);
+ }
+
+ // Schedule full removal for when spring no longer has influence
window.setTimeout(removeObject, springFadeTime, dict, inst);
}
}
|
Dispatch mouseup early for more reponsive clicking
|
diff --git a/clustering/infinispan/src/main/java/org/jboss/as/clustering/infinispan/LegacyGlobalConfigurationAdapter.java b/clustering/infinispan/src/main/java/org/jboss/as/clustering/infinispan/LegacyGlobalConfigurationAdapter.java
index <HASH>..<HASH> 100644
--- a/clustering/infinispan/src/main/java/org/jboss/as/clustering/infinispan/LegacyGlobalConfigurationAdapter.java
+++ b/clustering/infinispan/src/main/java/org/jboss/as/clustering/infinispan/LegacyGlobalConfigurationAdapter.java
@@ -142,7 +142,7 @@ public class LegacyGlobalConfigurationAdapter {
;
for (AdvancedExternalizerConfig externalizerConfig : legacy.getExternalizers()) {
- builder.serialization().addAdvancedExternalizer(externalizerConfig.getAdvancedExternalizer());
+ builder.serialization().addAdvancedExternalizer(externalizerConfig.getId(), externalizerConfig.getAdvancedExternalizer());
}
builder.asyncTransportExecutor()
|
AS7-<I>: When copying advancedexternalizer from the legacy configuration, use the
id coming from the externalizerconfig, since it may have been assigned
by a module lifecycle and not overridden from
AbstractExternalizer
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,9 @@ setup(name='spatialist',
author='John Truckenbrodt',
author_email='john.truckenbrodt@uni-jena.de',
license='MIT',
- zip_safe=False)
+ zip_safe=False,
+ long_description='an in-depth package description can be found on GitHub '
+ '[here]("https://github.com/johntruckenbrodt/spatialist")')
if platform.system() is 'Windows':
subdir = os.path.join(directory, 'mod_spatialite')
|
[setup.py] added short description with link to github
|
diff --git a/js/test/.eslintrc.js b/js/test/.eslintrc.js
index <HASH>..<HASH> 100644
--- a/js/test/.eslintrc.js
+++ b/js/test/.eslintrc.js
@@ -25,6 +25,7 @@ module.exports = {
"curly": "off",
"rest-spread-spacing": "off",
"no-multiple-empty-lines": "off",
+ "no-undef": "off",
"no-undef-init": "off",
"no-useless-return": "off",
"no-console": "off",
|
removed undef rule from test/.eslintrc as it falsely complains about mocha's globally defined functions
|
diff --git a/lib/bbcloud/api.rb b/lib/bbcloud/api.rb
index <HASH>..<HASH> 100644
--- a/lib/bbcloud/api.rb
+++ b/lib/bbcloud/api.rb
@@ -53,6 +53,8 @@ module Brightbox
objects = args.collect do |arg|
cached_get(arg)
end
+ elsif args.respond_to? :to_s
+ objects = [cached_get(args.to_s)]
end
# wrap in our objects
objects.collect! { |o| new(o) unless o.nil? }
|
handle strings that don't respond to collect (as in Ruby <I>). Fixes #<I>
|
diff --git a/geoshape/settings.py b/geoshape/settings.py
index <HASH>..<HASH> 100644
--- a/geoshape/settings.py
+++ b/geoshape/settings.py
@@ -218,9 +218,10 @@ LEAFLET_CONFIG = {
}
}
-# Absolute filesystem path to the directory that will hold user-uploaded files.
-# Used to upload schema.xsd files through gsschema app
-MEDIA_ROOT = OGC_SERVER['default']['GEOSERVER_DATA_DIR']
+# Absolute filesystem path to the directory that will be used to upload/download schema.xsd files through gsschema app
+GSSCHEMA_CONFIG = {
+ 'gsschema_dir': '/var/lib/geoserver_data/'
+}
# where to save tilebundler tilesets. Should move this to OGC_SERVER['default']['TILEBUNDLER_DATASTORE_DIR']
TILEBUNDLER_CONFIG = {
|
Update settings.py
added gsschema_config setting
|
diff --git a/apostrophe.js b/apostrophe.js
index <HASH>..<HASH> 100644
--- a/apostrophe.js
+++ b/apostrophe.js
@@ -698,6 +698,7 @@ function Apos() {
if (extension && extension.length) {
extension = extension.substr(1);
}
+ extension = extension.toLowerCase();
// Do we accept this file extension?
var accepted = [];
var group = _.find(self.fileGroups, function(group) {
|
Here's an idea, let's accept uppercase file extensions (:
|
diff --git a/test/integration/kubernetes_deploy_test.rb b/test/integration/kubernetes_deploy_test.rb
index <HASH>..<HASH> 100644
--- a/test/integration/kubernetes_deploy_test.rb
+++ b/test/integration/kubernetes_deploy_test.rb
@@ -891,7 +891,7 @@ unknown field \"myKey\" in io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta",
result = deploy_fixtures(
"invalid",
subset: ["bad_probe.yml", "cannot_run.yml", "missing_volumes.yml", "config_map.yml"],
- max_watch_seconds: 15
+ max_watch_seconds: 20
) do |f|
bad_probe = f["bad_probe.yml"]["Deployment"].first
bad_probe["metadata"]["annotations"]["kubernetes-deploy.shopify.io/timeout-override"] = '5s'
@@ -906,7 +906,7 @@ unknown field \"myKey\" in io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta",
"ConfigMap/test",
"Deployment/cannot-run: FAILED",
"Deployment/bad-probe: TIMED OUT (timeout: 5s)",
- "Deployment/missing-volumes: GLOBAL WATCH TIMEOUT (15 seconds)"
+ "Deployment/missing-volumes: GLOBAL WATCH TIMEOUT (20 seconds)"
])
end
|
Bump global timeout to fix flakey test (#<I>)
|
diff --git a/cayley.go b/cayley.go
index <HASH>..<HASH> 100644
--- a/cayley.go
+++ b/cayley.go
@@ -193,6 +193,9 @@ func load(ts graph.TripleStore, cfg *config.Config, path, typ string) error {
if path == "" {
path = cfg.DatabasePath
}
+ if path == "" {
+ return nil
+ }
u, err := url.Parse(path)
if err != nil || u.Scheme == "file" || u.Scheme == "" {
// Don't alter relative URL path or non-URL path parameter.
|
Allow memstore instances to be started empty
This allows easier debugging of web UI problem.
|
diff --git a/pywb/rewrite/html_rewriter.py b/pywb/rewrite/html_rewriter.py
index <HASH>..<HASH> 100644
--- a/pywb/rewrite/html_rewriter.py
+++ b/pywb/rewrite/html_rewriter.py
@@ -109,6 +109,8 @@ class HTMLRewriterMixin(object):
# get opts from urlrewriter
self.opts = url_rewriter.rewrite_opts
+ self.force_decl = self.opts.get('force_html_decl', None)
+
self.parsed_any = False
# ===========================
@@ -300,6 +302,10 @@ class HTMLRewriterMixin(object):
# Clear buffer to create new one for next rewrite()
self.out = None
+ if self.force_decl:
+ result = self.force_decl + '\n' + result
+ self.force_decl = None
+
return result
def close(self):
@@ -409,6 +415,7 @@ class HTMLRewriter(HTMLRewriterMixin, HTMLParser):
def handle_decl(self, data):
self.out.write('<!' + data + '>')
+ self.force_decl = None
def handle_pi(self, data):
self.out.write('<?' + data + '>')
|
html rewrite: add 'force_html_decl' option, which if set in rewrite_opts, can be used to force an HTML decl, eg. <!DOCTYPE html> if a default one was not provided
|
diff --git a/pyroma/__init__.py b/pyroma/__init__.py
index <HASH>..<HASH> 100644
--- a/pyroma/__init__.py
+++ b/pyroma/__init__.py
@@ -89,7 +89,7 @@ def main():
sys.exit(1)
modes = (options.auto, options.directory, options.file, options.pypi)
- if sum([1 if x else 0 for x in modes]) > 1:
+ if sum(1 if x else 0 for x in modes) > 1:
print("You can only select one of the options -a, -d, -f and -p")
sys.exit(1)
|
That list isn't needed any more
|
diff --git a/src/DependencyInjection/DoctrineCacheExtension.php b/src/DependencyInjection/DoctrineCacheExtension.php
index <HASH>..<HASH> 100755
--- a/src/DependencyInjection/DoctrineCacheExtension.php
+++ b/src/DependencyInjection/DoctrineCacheExtension.php
@@ -30,4 +30,12 @@ class DoctrineCacheExtension extends Extension
$container->setParameter('doctrine_cache.providers', $config['providers']);
}
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getAlias()
+ {
+ return 'doctrine_cache';
+ }
}
|
Added a alias for the config
|
diff --git a/src/d3-funnel/D3Funnel.js b/src/d3-funnel/D3Funnel.js
index <HASH>..<HASH> 100644
--- a/src/d3-funnel/D3Funnel.js
+++ b/src/d3-funnel/D3Funnel.js
@@ -58,6 +58,10 @@ class D3Funnel {
this.labelFormatter = new LabelFormatter();
this.navigator = new Navigator();
+
+ // Bind event handlers
+ this.onMouseOver = this.onMouseOver.bind(this);
+ this.onMouseOut = this.onMouseOut.bind(this);
}
/**
@@ -683,8 +687,8 @@ class D3Funnel {
return;
}
- target.on('mouseover', this.onMouseOver.bind(this))
- .on('mouseout', this.onMouseOut.bind(this));
+ target.on('mouseover', this.onMouseOver)
+ .on('mouseout', this.onMouseOut);
});
}
|
Bind event handlers more efficiently
|
diff --git a/server/config.js b/server/config.js
index <HASH>..<HASH> 100644
--- a/server/config.js
+++ b/server/config.js
@@ -4,6 +4,6 @@ exports.config = {
defaultUserName: 'me',
port: 80,
initialTokens: {
- '4eb4b398c36e62da87469133e2f0cb3f9574d5b3865051': ['messages:rw']
+ '4eb4b398c36e62da87469133e2f0cb3f9574d5b3865051': [':rw']
}
}
|
changed default token in example server config to root-scope
|
diff --git a/lib/index.js b/lib/index.js
index <HASH>..<HASH> 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -38,12 +38,15 @@ function fork(options, callback) {
if (!promise) {
defer = Q.defer();
cache[key] = promise = defer.promise;
+ promise._firstCall = true;
}
promise.done(function(result) {
- callback(null, result[0], result[1]);
+ callback(null, result[0], result[1], promise._firstCall);
+ promise._firstCall = false;
}, function(err) {
- callback(err);
+ callback(err, undefined, undefined, promise._firstCall);
+ promise._firstCall = false;
});
if (!defer) {
|
feat: mark the callback for the first execution
|
diff --git a/lib/tern.js b/lib/tern.js
index <HASH>..<HASH> 100644
--- a/lib/tern.js
+++ b/lib/tern.js
@@ -137,7 +137,10 @@
var file = this.findFile(name);
if (file) {
this.needsPurge.push(file.name);
- this.files.splice(this.files.indexOf(file), 1);
+ for (var i = 0; i < this.files.length; i++) {
+ if (this.files[i] == file) this.files.splice(i--, 1);
+ else if (this.files[i].parent == name) files[i].parent = null;
+ }
delete this.fileMap[file.name];
}
},
|
Don't leave dangling parent pointers when deleting a file
Issue #<I>
|
diff --git a/src/parser.js b/src/parser.js
index <HASH>..<HASH> 100644
--- a/src/parser.js
+++ b/src/parser.js
@@ -967,6 +967,10 @@ function convert(context) {
// ^
let startOfInterpolation = op.range[0];
while (source[startOfInterpolation] !== '#') {
+ if (startOfInterpolation >= source.length) {
+ throw new Error(
+ `Unable to find start of interpolation for op ${JSON.stringify(op)}`);
+ }
startOfInterpolation += 1;
}
let range = [op.range[0], startOfInterpolation];
@@ -978,6 +982,10 @@ function convert(context) {
// ^
let endOfInterpolation = op.range[1] - 1;
while (source[endOfInterpolation] !== '}') {
+ if (endOfInterpolation < 0) {
+ throw new Error(
+ `Unable to find last interpolation for op ${JSON.stringify(op)}`);
+ }
endOfInterpolation -= 1;
}
return buildQuasi([endOfInterpolation + 1, op.range[1]]);
|
fix: add infinite loop safeguards in string interpolation code (#<I>)
This should prevent potential future bugs that could cause an infinite loop
(although all known cases causing an infinite loop have been fixed).
|
diff --git a/tests/UI/specs/MultiSites_spec.js b/tests/UI/specs/MultiSites_spec.js
index <HASH>..<HASH> 100644
--- a/tests/UI/specs/MultiSites_spec.js
+++ b/tests/UI/specs/MultiSites_spec.js
@@ -16,7 +16,12 @@ describe("MultiSitesTest", function () {
var createdSiteId = null;
before(function (done) {
- var callback = function (undefined, response) {
+ var callback = function (error, response) {
+ if (error) {
+ done(error, response);
+ return;
+ }
+
createdSiteId = response.value;
done();
};
|
make sure to pass error to done callback in case there is an error
|
diff --git a/query.go b/query.go
index <HASH>..<HASH> 100644
--- a/query.go
+++ b/query.go
@@ -288,8 +288,9 @@ type WriteResponse struct {
// ChangeResponse is a helper type used when dealing with changefeeds. The type
// contains both the value before the query and the new value.
type ChangeResponse struct {
- NewValue interface{} `gorethink:"new_val"`
- OldValue interface{} `gorethink:"old_val"`
+ NewValue interface{} `gorethink:"new_val,omitempty"`
+ OldValue interface{} `gorethink:"old_val,omitempty"`
+ State string `gorethink:"state,omitempty"`
}
// RunOpts contains the optional arguments for the Run function.
|
query: include "state" in ChangeResponse object
When `IncludeStates` is true, the DB will return a couple objects with
the `state` field set to either "initializing" or "ready." Add this
field to ChangeResponse as well as omitempty tags.
|
diff --git a/lib/linkser/objects/html.rb b/lib/linkser/objects/html.rb
index <HASH>..<HASH> 100644
--- a/lib/linkser/objects/html.rb
+++ b/lib/linkser/objects/html.rb
@@ -60,6 +60,7 @@ module Linkser
nokogiri.css('img').each do |img|
break if images.length >= max_images
img_src = img.get_attribute("src")
+ next unless img_src
img_src = complete_url img_src, last_url
img_uri = URI.parse(img_src)
img_ext = File.extname(img_uri.path)
|
Skip image if no src attribute is present
|
diff --git a/src/Images/ImageUtils.php b/src/Images/ImageUtils.php
index <HASH>..<HASH> 100644
--- a/src/Images/ImageUtils.php
+++ b/src/Images/ImageUtils.php
@@ -46,6 +46,10 @@ class ImageUtils {
$locallyStoredImages = [];
foreach ($localImages as $localImage) {
+ if (empty($localImage->file)) {
+ continue;
+ }
+
$imageDetails = self::getImageDimensions($localImage->file);
$locallyStoredImages[] = new LocallyStoredImage([
|
avoid exceptions on empty images (#<I>)
|
diff --git a/cake/tests/lib/test_manager.php b/cake/tests/lib/test_manager.php
index <HASH>..<HASH> 100644
--- a/cake/tests/lib/test_manager.php
+++ b/cake/tests/lib/test_manager.php
@@ -23,7 +23,7 @@ define('APP_TEST_CASES', TESTS . 'cases');
define('APP_TEST_GROUPS', TESTS . 'groups');
/**
- * TestManager is the base class that handles loading and initiating the running
+ * TestManager is the base class that handles loading and initiating the running
* of TestCase and TestSuite classes that the user has selected.
*
* @package cake
@@ -103,7 +103,7 @@ class TestManager {
if ($this->appTest) {
$test =& new TestSuite(__('All App Tests', true));
} else if ($this->pluginTest) {
- $test =& new TestSuite(sprintf(__('All %s Plugin Tests', true), Inflector::humanize($manager->pluginTest)));
+ $test =& new TestSuite(sprintf(__('All %s Plugin Tests', true), Inflector::humanize($this->pluginTest)));
} else {
$test =& new TestSuite(__('All Core Tests', true));
}
|
Fixing notice due by using a non-existent variable.
|
diff --git a/lxd/cluster/heartbeat.go b/lxd/cluster/heartbeat.go
index <HASH>..<HASH> 100644
--- a/lxd/cluster/heartbeat.go
+++ b/lxd/cluster/heartbeat.go
@@ -217,14 +217,16 @@ func HeartbeatTask(gateway *Gateway) (task.Func, task.Schedule) {
// Since the database APIs are blocking we need to wrap the core logic
// and run it in a goroutine, so we can abort as soon as the context expires.
heartbeatWrapper := func(ctx context.Context) {
- ch := make(chan struct{})
- go func() {
- gateway.heartbeat(ctx, hearbeatNormal)
- ch <- struct{}{}
- }()
- select {
- case <-ch:
- case <-ctx.Done():
+ if gateway.HearbeatCancelFunc() == nil {
+ ch := make(chan struct{})
+ go func() {
+ gateway.heartbeat(ctx, hearbeatNormal)
+ close(ch)
+ }()
+ select {
+ case <-ch:
+ case <-ctx.Done():
+ }
}
}
|
lxd/cluster/heartbeat: Updates HeartbeatTask to skip starting new heartbeat if already running
|
diff --git a/spinoff/contrib/filetransfer/filetransfer.py b/spinoff/contrib/filetransfer/filetransfer.py
index <HASH>..<HASH> 100644
--- a/spinoff/contrib/filetransfer/filetransfer.py
+++ b/spinoff/contrib/filetransfer/filetransfer.py
@@ -66,15 +66,11 @@ class FilePublisher(Actor):
@classmethod
def get(cls, node=None):
- if isinstance(node, Ref):
- node = node._cell.root.node
if node not in cls._instances:
- cls._instances[node] = node.spawn(cls.using(node=node))
+ cls._instances[node] = node.spawn(cls.using())
return cls._instances[node]
- def pre_start(self, node):
- self._node = node
-
+ def pre_start(self):
self.published = {} # <pub_id> => (<local file path>, <time added>)
self.senders = {} # <sender> => <pub_id>
@@ -134,7 +130,7 @@ class FilePublisher(Actor):
del self.senders[sender]
def post_stop(self):
- del self._instances[self._node]
+ del self._instances[self.node]
class _Receiver(Process):
|
Removed the redundant FilePublisher._node attribute
|
diff --git a/lib/mini_fb.rb b/lib/mini_fb.rb
index <HASH>..<HASH> 100644
--- a/lib/mini_fb.rb
+++ b/lib/mini_fb.rb
@@ -14,7 +14,7 @@
require 'digest/md5'
require 'erb'
require 'json' unless defined? JSON
-require 'rest_client'
+require 'rest-client'
require 'hashie'
require 'base64'
require 'openssl'
|
Replace rest_client for rest-client
|
diff --git a/lib/xpm/install.js b/lib/xpm/install.js
index <HASH>..<HASH> 100644
--- a/lib/xpm/install.js
+++ b/lib/xpm/install.js
@@ -202,7 +202,7 @@ class Install extends CliCommand {
} else {
log.warn('Package already installed. ' +
'Use --force to overwrite.')
- return CliExitCodes.ERROR.OUTPUT
+ return CliExitCodes.ERROR.NONE
}
}
|
[#3] no error for 'Package already installed'
|
diff --git a/test/e2e/es_cluster_logging.go b/test/e2e/es_cluster_logging.go
index <HASH>..<HASH> 100644
--- a/test/e2e/es_cluster_logging.go
+++ b/test/e2e/es_cluster_logging.go
@@ -219,6 +219,11 @@ func ClusterLevelLoggingWithElasticsearch(f *framework.Framework) {
}
framework.Logf("Found %d healthy nodes.", len(nodes.Items))
+ // TODO: Figure out why initialization time influences
+ // results of the test and remove this step
+ By("Wait some more time to ensure ES and fluentd are ready")
+ time.Sleep(2 * time.Minute)
+
// Wait for the Fluentd pods to enter the running state.
By("Checking to make sure the Fluentd pod are running on each healthy node")
label = labels.SelectorFromSet(labels.Set(map[string]string{k8sAppKey: fluentdValue}))
|
Add additional delay to the es logging e2e test to make it stable
|
diff --git a/src/class-extended-cpt-admin.php b/src/class-extended-cpt-admin.php
index <HASH>..<HASH> 100644
--- a/src/class-extended-cpt-admin.php
+++ b/src/class-extended-cpt-admin.php
@@ -116,6 +116,15 @@ class Extended_CPT_Admin {
# Post updated messages:
add_filter( 'post_updated_messages', [ $this, 'post_updated_messages' ], 1 );
add_filter( 'bulk_post_updated_messages', [ $this, 'bulk_post_updated_messages' ], 1, 2 );
+
+ /**
+ * Fired when the extended post type admin instance is set up.
+ *
+ * @todo Add @since tag when version is bumped.
+ *
+ * @param Extended_CPT_Admin $instance The extended post type admin instance.
+ */
+ do_action( "ext-cpts-admin/{$this->cpt->post_type}/instance", $this );
}
/**
|
Add the "ext-cpts-admin/{$post_type}/instance" action to allow access to the Extended_CPT_Admin instances.
|
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index <HASH>..<HASH> 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -784,7 +784,6 @@ Run `rake gems:install` to install the missing gems.
def threadsafe!
self.cache_classes = true
self.dependency_loading = false
- self.active_record.allow_concurrency = true
self.action_controller.allow_concurrency = true
self
end
|
Remove call to active_record.allow_concurrency since it's deprecated
|
diff --git a/lib/node/default.js b/lib/node/default.js
index <HASH>..<HASH> 100644
--- a/lib/node/default.js
+++ b/lib/node/default.js
@@ -2,8 +2,6 @@
module.exports = require(__dirname).define({
type: 'DEFAULT',
- constructor: function() {
- },
value: function() {
return;
}
diff --git a/lib/node/index.js b/lib/node/index.js
index <HASH>..<HASH> 100644
--- a/lib/node/index.js
+++ b/lib/node/index.js
@@ -24,14 +24,16 @@ Node.prototype.addAll = function(nodes) {
}
Node.define = function(def) {
- //TODO - what was I thinking?
- //ALSO TODO - start commenting my code more. :p
var c = function() {
Node.apply(this, arguments);
- if(def.constructor) {
- def.constructor.apply(this, arguments);
- }
};
+ //allow custom sub-class constructor
+ if(def.constructor) {
+ c = function() {
+ Node.apply(this, arguments);
+ def.constructor.apply(this, arguments);
+ };
+ }
var key;
for(key in Node.prototype) {
c.prototype[key] = Node.prototype[key];
|
make generated node constructors slightly less weird
|
diff --git a/src/core/text/Text.js b/src/core/text/Text.js
index <HASH>..<HASH> 100644
--- a/src/core/text/Text.js
+++ b/src/core/text/Text.js
@@ -409,6 +409,8 @@ Text.prototype.updateTexture = function ()
texture.baseTexture.hasLoaded = true;
texture.baseTexture.resolution = this.resolution;
+ texture.baseTexture.realWidth = this.canvas.width;
+ texture.baseTexture.realHeight = this.canvas.height;
texture.baseTexture.width = this.canvas.width / this.resolution;
texture.baseTexture.height = this.canvas.height / this.resolution;
texture.trim.width = texture._frame.width = this.canvas.width / this.resolution;
|
BaseTexture used for text now reports correct realWidth and realHeight (#<I>)
|
diff --git a/validator/sawtooth_validator/execution/executor.py b/validator/sawtooth_validator/execution/executor.py
index <HASH>..<HASH> 100644
--- a/validator/sawtooth_validator/execution/executor.py
+++ b/validator/sawtooth_validator/execution/executor.py
@@ -296,7 +296,7 @@ class _Waiter(object):
# Wait for the processor type to be registered
self._processors.cancellable_wait(
processor_type=self._processor_type,
- is_cancelled=self._cancelled_event)
+ cancelled_event=self._cancelled_event)
if self._cancelled_event.is_set():
LOGGER.info("waiting cancelled on %s", self._processor_type)
|
Fix incorrect keyword argument
The TypeError on invalid keyword argument wasn't displayed due to
running in a threadpool.
|
diff --git a/lib/marked.js b/lib/marked.js
index <HASH>..<HASH> 100644
--- a/lib/marked.js
+++ b/lib/marked.js
@@ -16,7 +16,7 @@ var block = {
hr: /^( *[\-*_]){3,} *\n/,
heading: /^ *(#{1,6}) *([^\0]+?) *#* *\n+/,
lheading: /^([^\n]+)\n *(=|-){3,}/,
- blockquote: /^ *>[^\0]+?(?=\n\n| *$)|^ *>[^\n]*(?:\n *>[^\n]*)*/,
+ blockquote: /^(^ *> ?[^\n]+\n([^\n]+\n)*\n*)+/,
list: /^( *)([*+-]|\d+\.) [^\0]+?(?:\n{2,}(?! )|\s*$)(?!\1\2|\1\d+\.)/,
html: /^ *(?:comment|closed|closing) *(?:\n{2,}|\s*$)/,
paragraph: /^([^\n]+\n?(?!body))+\n*/,
|
more compliant lazy blockquotes. closes #<I>.
|
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/AlternatingController.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/AlternatingController.java
index <HASH>..<HASH> 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/AlternatingController.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/io/checkpointing/AlternatingController.java
@@ -164,14 +164,6 @@ public class AlternatingController implements CheckpointBarrierBehaviourControll
chooseController(barrier).obsoleteBarrierReceived(channelInfo, barrier);
}
- private void checkActiveController(CheckpointBarrier barrier) {
- if (isAligned(barrier)) {
- checkState(activeController == alignedController);
- } else {
- checkState(activeController == unalignedController);
- }
- }
-
private boolean isAligned(CheckpointBarrier barrier) {
return barrier.getCheckpointOptions().needsAlignment();
}
|
[refactor][checkpoint] Remove unused method in AlternatingController
|
diff --git a/structr-ui/src/main/resources/structr/js/helper.js b/structr-ui/src/main/resources/structr/js/helper.js
index <HASH>..<HASH> 100644
--- a/structr-ui/src/main/resources/structr/js/helper.js
+++ b/structr-ui/src/main/resources/structr/js/helper.js
@@ -683,8 +683,8 @@ var _Logger = {
if (type) {
return (this.subscriptions.indexOf(type) !== -1 || this.subscriptions.indexOf(type.split('.')[0]) !== -1);
} else {
- console.error("undefined log type!");
- return false;
+ console.error("undefined log type - this should not happen!");
+ return true;
}
},
|
dont ignore log messages with unknown log type (might happen for new/unknown websocket commands)
|
diff --git a/app/controllers/cangaroo/endpoint_controller.rb b/app/controllers/cangaroo/endpoint_controller.rb
index <HASH>..<HASH> 100644
--- a/app/controllers/cangaroo/endpoint_controller.rb
+++ b/app/controllers/cangaroo/endpoint_controller.rb
@@ -42,6 +42,10 @@ module Cangaroo
def key
if Rails.configuration.cangaroo.basic_auth
+ if !ActionController::HttpAuthentication::Basic.has_basic_credentials?(request)
+ return nil
+ end
+
user, pass = ActionController::HttpAuthentication::Basic::user_name_and_password(request)
user
else
@@ -51,6 +55,10 @@ module Cangaroo
def token
if Rails.configuration.cangaroo.basic_auth
+ if !ActionController::HttpAuthentication::Basic.has_basic_credentials?(request)
+ return nil
+ end
+
user, pass = ActionController::HttpAuthentication::Basic::user_name_and_password(request)
pass
else
|
Check if basic auth creds are specified
without this, rails4 will throw a fatal error when attempting to extract username and password
|
diff --git a/src/Mysql/MysqlDriver.php b/src/Mysql/MysqlDriver.php
index <HASH>..<HASH> 100644
--- a/src/Mysql/MysqlDriver.php
+++ b/src/Mysql/MysqlDriver.php
@@ -479,6 +479,8 @@ class MysqlDriver extends PdoDriver implements UTF8MB4SupportInterface
*/
public function isMariaDb()
{
+ $this->connect();
+
return $this->mariadb;
}
diff --git a/src/Mysqli/MysqliDriver.php b/src/Mysqli/MysqliDriver.php
index <HASH>..<HASH> 100644
--- a/src/Mysqli/MysqliDriver.php
+++ b/src/Mysqli/MysqliDriver.php
@@ -589,6 +589,8 @@ class MysqliDriver extends DatabaseDriver implements UTF8MB4SupportInterface
*/
public function isMariaDb()
{
+ $this->connect();
+
return $this->mariadb;
}
|
Add connect to isMariaDB functions.
|
diff --git a/ez_setup.py b/ez_setup.py
index <HASH>..<HASH> 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -31,7 +31,7 @@ try:
except ImportError:
USER_SITE = None
-DEFAULT_VERSION = "3.1"
+DEFAULT_VERSION = "3.0.1"
DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
def _python_cmd(*args):
diff --git a/setuptools/version.py b/setuptools/version.py
index <HASH>..<HASH> 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '3.1'
+__version__ = '3.0.1'
|
Bumped to <I> in preparation for next release.
|
diff --git a/spec/amq/protocol/table_spec.rb b/spec/amq/protocol/table_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/amq/protocol/table_spec.rb
+++ b/spec/amq/protocol/table_spec.rb
@@ -117,7 +117,11 @@ module AMQ
"name" => "AMQP",
"major" => 0,
"minor" => "9",
- "rev" => 1.0
+ "rev" => 1.0,
+ "spec" => {
+ "url" => "http://bit.ly/hw2ELX",
+ "utf8" => "à bientôt"
+ }
},
"true" => true,
"false" => false,
|
Use non-ASCII characters & even deeper nested hashes in this example
|
diff --git a/example/main.js b/example/main.js
index <HASH>..<HASH> 100644
--- a/example/main.js
+++ b/example/main.js
@@ -16,7 +16,7 @@ document.addEventListener('DOMContentLoaded', function () {
};
if (location.search.match('scroll')) {
- options.minPxPerSec = 20;
+ options.minPxPerSec = 100;
options.scrollParent = true;
}
|
set larget minPxPerSec for short sample
|
diff --git a/nodeup/pkg/model/kube_apiserver.go b/nodeup/pkg/model/kube_apiserver.go
index <HASH>..<HASH> 100644
--- a/nodeup/pkg/model/kube_apiserver.go
+++ b/nodeup/pkg/model/kube_apiserver.go
@@ -441,8 +441,8 @@ func (b *KubeAPIServerBuilder) buildPod() (*v1.Pod, error) {
func (b *KubeAPIServerBuilder) buildAnnotations() map[string]string {
annotations := make(map[string]string)
- annotations["dns.alpha.kubernetes.io/internal"] = b.Cluster.Spec.MasterInternalName
if b.Cluster.Spec.API != nil && b.Cluster.Spec.API.DNS != nil {
+ annotations["dns.alpha.kubernetes.io/internal"] = b.Cluster.Spec.MasterInternalName
annotations["dns.alpha.kubernetes.io/external"] = b.Cluster.Spec.MasterPublicName
}
|
GH-<I> Only manage internal DNS zone if configuration has been specified
|
diff --git a/lib/fibers/transform.js b/lib/fibers/transform.js
index <HASH>..<HASH> 100644
--- a/lib/fibers/transform.js
+++ b/lib/fibers/transform.js
@@ -255,7 +255,8 @@ function transform(source, options) {
// Close up the function
body.map(walk);
- if (options.generators && async) {
+ // we don't need the extra `yield undefined;` for harmony generators because they signal the end with a done flag instead of an exception
+ if (false && options.generators && async) {
// add yield if necessary -- could do a smarter flow analysis but an extra yield won't hurt
var end = this.end - 1;
while (source[end] !== '}') end--;
diff --git a/lib/generators/runtime.js b/lib/generators/runtime.js
index <HASH>..<HASH> 100644
--- a/lib/generators/runtime.js
+++ b/lib/generators/runtime.js
@@ -53,7 +53,7 @@ var globals = require('streamline/lib/globals');
while (g) {
try {
val = err ? g.throw(err) : g.send(val);
- val = val.value;
+ val = val.done ? undefined : val.value;
err = null;
// if we get PENDING, the current call completed with a pending I/O
// resume will be called again when the I/O completes. So just save the context and return here.
|
issue #<I> - do not generate 'yield undefined' at the end of functions
|
diff --git a/specs/Bag.spec.php b/specs/Bag.spec.php
index <HASH>..<HASH> 100644
--- a/specs/Bag.spec.php
+++ b/specs/Bag.spec.php
@@ -20,6 +20,11 @@ describe("Bag", function() {
expect( (array) $b )->to->equal(array());
});
+ it("can unset non-existing elements", function() {
+ $b = new Bag();
+ unset($b['foo']);
+ });
+
beforeEach(function(){
$this->bag = new Bag( array('x'=>42) );
});
diff --git a/src/Bag.php b/src/Bag.php
index <HASH>..<HASH> 100644
--- a/src/Bag.php
+++ b/src/Bag.php
@@ -28,6 +28,11 @@ class Bag extends \ArrayObject {
return $this->offsetExists($key) ? $this[$key] : $this[$key] = $default;
}
+ /* Allow unset of non-existing offset */
+ function offsetUnset($name) {
+ return $this->offsetExists($name) ? parent::offsetUnset($name) : null;
+ }
+
/* Update multiple argument values using an array (like Python .update())*/
function set($data) {
# Use a loop to retain overall key order
|
Allow bags to unset non-existing offsets
|
diff --git a/liquibase-core/src/main/java/liquibase/database/core/OracleDatabase.java b/liquibase-core/src/main/java/liquibase/database/core/OracleDatabase.java
index <HASH>..<HASH> 100644
--- a/liquibase-core/src/main/java/liquibase/database/core/OracleDatabase.java
+++ b/liquibase-core/src/main/java/liquibase/database/core/OracleDatabase.java
@@ -60,7 +60,7 @@ public class OracleDatabase extends AbstractJdbcDatabase {
@Override
public void setConnection(DatabaseConnection conn) {
- reservedWords.addAll(Arrays.asList("GROUP", "USER", "SESSION", "PASSWORD", "RESOURCE", "START", "SIZE", "UID", "DESC")); //more reserved words not returned by driver
+ reservedWords.addAll(Arrays.asList("GROUP", "USER", "SESSION", "PASSWORD", "RESOURCE", "START", "SIZE", "UID", "DESC", "ORDER")); //more reserved words not returned by driver
Connection sqlConn = null;
if (!(conn instanceof OfflineConnection)) {
|
CORE-<I>
ORDER keyword isn't escaped for Oracle
|
diff --git a/habu/lib/webid.py b/habu/lib/webid.py
index <HASH>..<HASH> 100644
--- a/habu/lib/webid.py
+++ b/habu/lib/webid.py
@@ -167,12 +167,12 @@ def webid(url, no_cache=False, verbose=False):
logging.info("removing {exlude} because its excluded by {t}".format(exlude=exclude, t=t))
del(tech[t])
- response = []
+ response = {}
for t in sorted(tech):
if 'version' in tech[t]:
- response.append('{app} {version}'.format(app=t, version=version))
+ response[t] = version #version.append('{app} {version}'.format(app=t, version=version))
else:
- response.append('{app}'.format(app=t))
+ response[t] = None #.append('{app}'.format(app=t))
return response
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ with open('README.rst') as f:
setup(
name='habu',
- version='0.0.56',
+ version='0.0.57',
description='Python Network Hacking Toolkit',
long_description=readme,
author='Fabian Martinez Portantier',
|
response now is a dict with key=tech value=version
|
diff --git a/inginious/client/_zeromq_client.py b/inginious/client/_zeromq_client.py
index <HASH>..<HASH> 100644
--- a/inginious/client/_zeromq_client.py
+++ b/inginious/client/_zeromq_client.py
@@ -108,7 +108,9 @@ class BetterParanoidPirateClient(object, metaclass=abc.ABCMeta):
"""
Handle a pong
"""
- self._ping_count = 0
+ # this is done when a packet is received, not need to redo it here
+ # self._ping_count = 0
+ pass
async def _handle_unknown(self, _):
"""
@@ -206,6 +208,7 @@ class BetterParanoidPirateClient(object, metaclass=abc.ABCMeta):
try:
while True:
message = await ZMQUtils.recv(self._socket)
+ self._ping_count = 0 # restart ping count
msg_class = message.__msgtype__
if msg_class in self._handlers_registered:
# If a handler is registered, give the message to it
|
Improve client resilience when backend is under high load but is still responding
|
diff --git a/nion/swift/LineGraphCanvasItem.py b/nion/swift/LineGraphCanvasItem.py
index <HASH>..<HASH> 100755
--- a/nion/swift/LineGraphCanvasItem.py
+++ b/nion/swift/LineGraphCanvasItem.py
@@ -376,9 +376,10 @@ def draw_line_graph(drawing_context, plot_height, plot_width, plot_origin_y, plo
drawing_context.begin_path()
if calibrated_data_range != 0.0 and uncalibrated_width > 0.0:
if data_style == "log":
- baseline = plot_origin_y + plot_height - (plot_height * float(numpy.amin(calibrated_xdata.data) - calibrated_data_min) / calibrated_data_range)
+ baseline = plot_origin_y + plot_height
else:
baseline = plot_origin_y + plot_height - (plot_height * float(0.0 - calibrated_data_min) / calibrated_data_range)
+
baseline = min(plot_origin_y + plot_height, baseline)
baseline = max(plot_origin_y, baseline)
# rebin so that uncalibrated_width corresponds to plot width
|
Always use x-axis as baseline for log-plots (consistent with other plotting software). Fixes #<I>.
|
diff --git a/armor.go b/armor.go
index <HASH>..<HASH> 100644
--- a/armor.go
+++ b/armor.go
@@ -83,7 +83,7 @@ func (s *armorEncoderStream) Close() (err error) {
pad = " "
}
}
- if _, err := fmt.Fprintf(s.encoded, "%s%c\n\n%s%c\n", pad, s.params.Punctuation, s.footer, s.params.Punctuation); err != nil {
+ if _, err := fmt.Fprintf(s.encoded, "%s%c %s%c\n", pad, s.params.Punctuation, s.footer, s.params.Punctuation); err != nil {
return err
}
return nil
@@ -105,7 +105,7 @@ func NewArmorEncoderStream(encoded io.Writer, header string, footer string, para
params: params,
}
ret.encoder = basex.NewEncoder(params.Encoding, ret.buf)
- if _, err := fmt.Fprintf(encoded, "%s%c\n\n", header, params.Punctuation); err != nil {
+ if _, err := fmt.Fprintf(encoded, "%s%c ", header, params.Punctuation); err != nil {
return nil, err
}
return ret, nil
|
make the armor header and footer inline
|
diff --git a/plugin/rewrite/reverter.go b/plugin/rewrite/reverter.go
index <HASH>..<HASH> 100644
--- a/plugin/rewrite/reverter.go
+++ b/plugin/rewrite/reverter.go
@@ -36,7 +36,10 @@ func NewResponseReverter(w dns.ResponseWriter, r *dns.Msg) *ResponseReverter {
}
// WriteMsg records the status code and calls the underlying ResponseWriter's WriteMsg method.
-func (r *ResponseReverter) WriteMsg(res *dns.Msg) error {
+func (r *ResponseReverter) WriteMsg(res1 *dns.Msg) error {
+ // Deep copy 'res' as to not (e.g). rewrite a message that's also stored in the cache.
+ res := res1.Copy()
+
res.Question[0] = r.originalQuestion
if r.ResponseRewrite {
for _, rr := range res.Answer {
|
plugin/rewrite: copy msg before rewritting (#<I>)
Copy the msg to prevent messing with the (via the pointer) original
created message that may be stored in the cache or anything other data
store.
|
diff --git a/ui/src/kapacitor/components/ValuesSection.js b/ui/src/kapacitor/components/ValuesSection.js
index <HASH>..<HASH> 100644
--- a/ui/src/kapacitor/components/ValuesSection.js
+++ b/ui/src/kapacitor/components/ValuesSection.js
@@ -12,7 +12,7 @@ import {Tab, TabList, TabPanels, TabPanel, Tabs} from 'shared/components/Tabs'
const TABS = ['Threshold', 'Relative', 'Deadman']
-const handleChooseTrigger = (rule, onChooseTrigger) => {
+const handleChooseTrigger = (rule, onChooseTrigger) => triggerIndex => {
if (TABS[triggerIndex] === rule.trigger) {
return
}
|
Transform ValuesSection into an SFC
|
diff --git a/lib/rack/funky-cache.rb b/lib/rack/funky-cache.rb
index <HASH>..<HASH> 100644
--- a/lib/rack/funky-cache.rb
+++ b/lib/rack/funky-cache.rb
@@ -13,15 +13,11 @@ module Rack
@directory = settings[:directory] || ::File.join(@root, @path) end
def call(env)
- dup._call(env)
- end
-
- def _call(env)
response = @app.call(env)
cache(env, response) if should_cache(env, response)
response
end
-
+
def cache(env, response)
path = Rack::Utils.unescape(env["PATH_INFO"])
@@ -47,9 +43,15 @@ module Rack
end
def should_cache(env, response)
- request = Rack::Request.new(env)
- request.get? && request.query_string.empty? &&
- /text\/html/ =~ response[1]["Content-Type"] && 200 == response[0]
+ unless env_excluded?(env)
+ request = Rack::Request.new(env)
+ request.get? && request.query_string.empty? &&
+ /text\/html/ =~ response[1]["Content-Type"] && 200 == response[0]
+ end
+ end
+
+ def env_excluded?(env)
+ @settings[:exclude] && @settings[:exclude].call(env)
end
end
|
Dup call is apparently not needed anymore. Add possibility to exclude pages with a proc. For example:
use Rack::FunkyCache, :exclude => proc { |env| env["PATH_INFO"].match(/^\/admin/) }
|
diff --git a/src/Models/TableMigration.php b/src/Models/TableMigration.php
index <HASH>..<HASH> 100644
--- a/src/Models/TableMigration.php
+++ b/src/Models/TableMigration.php
@@ -517,7 +517,7 @@ class TableMigration implements Countable
$modelNames = [];
foreach (explode('_', $tableName) as $word) {
- $modelNames[] = Inflector::singularize($word);
+ $modelNames[] = ucfirst(Inflector::singularize($word));
} //foreach
$modelName = implode('', $modelNames);
|
Bug fix 'Model Xxxxxx.php not found' when table contains underscore and consists of two words like order_items -> OrderItems.php ( was Orderitems.php)
|
diff --git a/api/client/cli.go b/api/client/cli.go
index <HASH>..<HASH> 100644
--- a/api/client/cli.go
+++ b/api/client/cli.go
@@ -23,6 +23,9 @@ var funcMap = template.FuncMap{
}
func (cli *DockerCli) getMethod(name string) (func(...string) error, bool) {
+ if len(name) == 0 {
+ return nil, false
+ }
methodName := "Cmd" + strings.ToUpper(name[:1]) + strings.ToLower(name[1:])
method := reflect.ValueOf(cli).MethodByName(methodName)
if !method.IsValid() {
|
docker '' causes a golang crash.
This patch fixes the problem.
Docker-DCO-<I>-
|
diff --git a/atlassian/jira.py b/atlassian/jira.py
index <HASH>..<HASH> 100644
--- a/atlassian/jira.py
+++ b/atlassian/jira.py
@@ -3394,6 +3394,13 @@ api-group-workflows/#api-rest-api-2-workflow-search-get)
url = "rest/agile/1.0/{board_id}/backlog".format(board_id=board_id)
return self.get(url)
+ def get_issues_for_board(self, board_id):
+ """
+ :param board_id: int, str
+ """
+ url = "rest/agile/1.0/board/{board_id}/issue".format(board_id=board_id)
+ return self.get(url)
+
def delete_agile_board(self, board_id):
"""
Delete agile board by id
|
[JIRA] Add a funciton to get issues for board (#<I>)
|
diff --git a/redisson/src/main/java/org/redisson/RedissonLock.java b/redisson/src/main/java/org/redisson/RedissonLock.java
index <HASH>..<HASH> 100644
--- a/redisson/src/main/java/org/redisson/RedissonLock.java
+++ b/redisson/src/main/java/org/redisson/RedissonLock.java
@@ -284,8 +284,10 @@ public class RedissonLock extends RedissonExpirable implements RLock {
return;
}
- // reschedule itself
- renewExpiration();
+ if (res) {
+ // reschedule itself
+ renewExpiration();
+ }
});
}
}, internalLockLeaseTime / 3, TimeUnit.MILLISECONDS);
|
Fixed - Redisson tries to renewed Lock expiration even if lock doesn't exist. Regression since <I> version #<I>
|
diff --git a/spec/spec_fixtures.rb b/spec/spec_fixtures.rb
index <HASH>..<HASH> 100644
--- a/spec/spec_fixtures.rb
+++ b/spec/spec_fixtures.rb
@@ -7,7 +7,7 @@ module IniParse
if @@fixtures.has_key?(fix)
@@fixtures[fix]
else
- File.read(Pathname(__FILE__).dirname.expand_path / 'fixtures' / fix)
+ @@fixtures[fix] = File.read(Pathname(__FILE__).dirname.expand_path / 'fixtures' / fix)
end
end
|
Only hit the disk once when repeatedly loading a file-based fixture.
|
diff --git a/lang/fr/quiz.php b/lang/fr/quiz.php
index <HASH>..<HASH> 100644
--- a/lang/fr/quiz.php
+++ b/lang/fr/quiz.php
@@ -128,7 +128,7 @@ $string['editingrqp'] = '$a : modification d\'une question';
$string['editingshortanswer'] = 'Modifier une question � r�ponse courte';
$string['editingtruefalse'] = 'Modifier une question Vrai/Faux';
$string['editquestions'] = 'Modifier les questions';
-$string['editquiz'] = 'Modifier le test';
+$string['editquiz'] = 'Modifier les questions';
$string['errormissingquestion'] = 'Erreur ! Le syst�me ne trouve pas la question d\'identifiant $a';
$string['errornotnumbers'] = 'Erreur ! Les r�ponses doivent �tre num�riques';
$string['errorsdetected'] = '$a erreur(s) d�tect�e(s)';
|
Small correction, suggested by Joseph R�zeau
|
diff --git a/tests/test_plot.py b/tests/test_plot.py
index <HASH>..<HASH> 100644
--- a/tests/test_plot.py
+++ b/tests/test_plot.py
@@ -1,3 +1,5 @@
+from more_itertools.recipes import flatten
+
from svg.charts.plot import Plot
@@ -56,3 +58,27 @@ class TestPlot:
assert b'Sam' in svg
assert b'Dan' in svg
+ @staticmethod
+ def get_data():
+ yield (1, 0)
+ yield (2, 1)
+
+ def test_iterable_data_grouped(self):
+ g = Plot()
+ spec = dict(
+ data=self.get_data(),
+ title='labels',
+ )
+ g.add_data(spec)
+ svg = g.burn()
+ assert b'text="(1.00, 0.00)"' in svg
+
+ def test_iterable_data_flat(self):
+ g = Plot()
+ spec = dict(
+ data=flatten(self.get_data()),
+ title='labels',
+ )
+ g.add_data(spec)
+ svg = g.burn()
+ assert b'text="(1.00, 0.00)"' in svg
|
Add tests capturing failures with iterable data. Ref #<I>.
|
diff --git a/src/toil/cwl/cwltoil.py b/src/toil/cwl/cwltoil.py
index <HASH>..<HASH> 100755
--- a/src/toil/cwl/cwltoil.py
+++ b/src/toil/cwl/cwltoil.py
@@ -30,7 +30,7 @@ import logging
import copy
import functools
import shutil
-from typing import Text, Mapping, MutableSequence
+from typing import Text, Mapping, MutableSequence, MutableMapping
import hashlib
import uuid
import datetime
@@ -1384,6 +1384,20 @@ def main(args=None, stdout=sys.stdout):
if runtime_context.research_obj is not None:
runtime_context.research_obj.create_job(outobj, None, True)
+
+ def remove_at_id(doc):
+ if isinstance(doc, MutableMapping):
+ for key in list(doc.keys()):
+ if key == '@id':
+ del doc[key]
+ else:
+ value = doc[key]
+ if isinstance(value, MutableMapping):
+ remove_at_id(value)
+ if isinstance(value, MutableSequence):
+ for entry in value:
+ remove_at_id(entry)
+ remove_at_id(outobj)
prov_dependencies = cwltool.main.prov_deps(workflowobj, document_loader, uri)
runtime_context.research_obj.generate_snapshot(prov_dependencies)
runtime_context.research_obj.close(options.provenance)
|
Added fix to remove @id values from job output dicts
|
diff --git a/Kwc/Advanced/VideoPlayer/Component.js b/Kwc/Advanced/VideoPlayer/Component.js
index <HASH>..<HASH> 100644
--- a/Kwc/Advanced/VideoPlayer/Component.js
+++ b/Kwc/Advanced/VideoPlayer/Component.js
@@ -1,5 +1,7 @@
Kwf.onElementReady('.kwcAdvancedVideoPlayer', function(el, config) {
$(el.dom).children('video').mediaelementplayer({
+ //custom path to flash
+ flashName: '/assets/mediaelement/build/flashmediaelement.swf',
// if the <video width> is not specified, this is the default
defaultVideoWidth: config.defaultVideoWidth,
// if the <video height> is not specified, this is the default
|
fixed the path to the swf file, for the flash fallback (e.g. ie8)
|
diff --git a/tests/Components/CheckBoxDesignTest.php b/tests/Components/CheckBoxDesignTest.php
index <HASH>..<HASH> 100644
--- a/tests/Components/CheckBoxDesignTest.php
+++ b/tests/Components/CheckBoxDesignTest.php
@@ -84,6 +84,8 @@ class CheckBoxDesignTest extends \PHPUnit_Framework_TestCase
$this->assertNull($quad->getImageUrl());
}
+ /*
+ * TODO: 'fix' this test which is failing on travis-ci for no reason
public function testApplyToQuadWithImageUrl()
{
$checkBoxDesign = new CheckBoxDesign("quad.image.url");
@@ -95,6 +97,7 @@ class CheckBoxDesignTest extends \PHPUnit_Framework_TestCase
$this->assertNull($quad->getSubStyle());
$this->assertEquals($quad->getImageUrl(), "quad.image.url");
}
+ */
public function testDesignStringWithStyles()
{
|
commented out unit test that fails on travis CI for no reason
|
diff --git a/command/build_ext.py b/command/build_ext.py
index <HASH>..<HASH> 100644
--- a/command/build_ext.py
+++ b/command/build_ext.py
@@ -177,6 +177,21 @@ class build_ext (Command):
# building python standard extensions
self.library_dirs.append('.')
+ # The argument parsing will result in self.define being a string, but
+ # it has to be a list of 2-tuples. All the preprocessor symbols
+ # specified by the 'define' option will be set to '1'. Multiple
+ # symbols can be separated with commas.
+
+ if self.define:
+ defines = string.split(self.define, ',')
+ self.define = map(lambda symbol: (symbol, '1'), defines)
+
+ # The option for macros to undefine is also a string from the
+ # option parsing, but has to be a list. Multiple symbols can also
+ # be separated with commas here.
+ if self.undef:
+ self.undef = string.split(self.undef, ',')
+
# finalize_options ()
|
Fix bug #<I>: the --define and --undef options didn't work, whether
specified on the command-line or in setup.cfg. The option processing
leaves them as strings, but they're supposed to be lists.
|
diff --git a/packages/cqmd/src/index.js b/packages/cqmd/src/index.js
index <HASH>..<HASH> 100644
--- a/packages/cqmd/src/index.js
+++ b/packages/cqmd/src/index.js
@@ -37,7 +37,8 @@ export default async function cqmd(text, opts={}) {
let fullFilename = path.join(opts.path, actualName);
let contents = fs.readFileSync(fullFilename).toString();
- let cqResults = cq(contents, blockOpts['crop-query']); // TODO
+
+ let cqResults = await cq(contents, blockOpts['crop-query']); // TODO
let replacement;
if(typeof format === "function") {
|
fixes cqmd to handle the promises
|
diff --git a/tests/features/bootstrap/FeatureContext.php b/tests/features/bootstrap/FeatureContext.php
index <HASH>..<HASH> 100644
--- a/tests/features/bootstrap/FeatureContext.php
+++ b/tests/features/bootstrap/FeatureContext.php
@@ -76,7 +76,7 @@ class FeatureContext extends RawDrupalContext implements SnippetAcceptingContext
}
/**
- * Creates a menu item with specified name in the specified menu
+ * Creates a menu item with specified name in the specified menu.
*
* @Given /^I create an item "([^"]*)" in the "([^"]*)" menu$/
*/
|
Added a dot to fix sniffer
|
diff --git a/src/core/Mesh.js b/src/core/Mesh.js
index <HASH>..<HASH> 100644
--- a/src/core/Mesh.js
+++ b/src/core/Mesh.js
@@ -3,7 +3,7 @@ import { Mesh as ThreeMesh } from 'three'
import Node from './Node'
import { props, mapPropTo } from './props'
-// register behaviors that can be used with this class.
+// register behaviors that can be used on this element
// TODO: maybe useDefaultNames() should register these, otherwise the user can
// choose names for better flexibility. See TODO NAMING below.
import '../html/behaviors/BasicMaterialBehavior'
diff --git a/src/html/behaviors/BaseMaterialBehavior.js b/src/html/behaviors/BaseMaterialBehavior.js
index <HASH>..<HASH> 100644
--- a/src/html/behaviors/BaseMaterialBehavior.js
+++ b/src/html/behaviors/BaseMaterialBehavior.js
@@ -2,9 +2,6 @@ import Class from 'lowclass'
import BaseMeshBehavior from './BaseMeshBehavior'
import { props } from '../../core/props'
-import * as THREE from 'three'
-window.THREE = THREE
-
// base class for geometry behaviors
export default
Class( 'BaseMaterialBehavior' ).extends( BaseMeshBehavior, ({ Super }) => ({
|
remove THREE from global (we don't need it global just yet, but we will soon and will do it in a better way)
|
diff --git a/opfutils/src/main/java/org/onepf/opfutils/OPFPreferences.java b/opfutils/src/main/java/org/onepf/opfutils/OPFPreferences.java
index <HASH>..<HASH> 100644
--- a/opfutils/src/main/java/org/onepf/opfutils/OPFPreferences.java
+++ b/opfutils/src/main/java/org/onepf/opfutils/OPFPreferences.java
@@ -142,7 +142,7 @@ public class OPFPreferences {
}
public OPFPreferences(@NonNull final Context context, @Nullable String postfix) {
- this(context, postfix, Context.MODE_PRIVATE);
+ this(context, postfix, Context.MODE_MULTI_PROCESS);
}
public OPFPreferences(@NonNull final Context context, final int mode) {
|
Use MODE_MULTI_PROCESS as default mode for preferences.
|
diff --git a/Swat/SwatCellRendererContainer.php b/Swat/SwatCellRendererContainer.php
index <HASH>..<HASH> 100644
--- a/Swat/SwatCellRendererContainer.php
+++ b/Swat/SwatCellRendererContainer.php
@@ -102,7 +102,8 @@ abstract class SwatCellRendererContainer extends SwatUIObject implements
public function getRenderers()
{
$out = array();
- foreach ($this->renderers as $renderer)
+ $renderers = clone $this->renderers;
+ foreach ($renderers as $renderer)
$out[] = $renderer;
return $out;
|
Clone before iterating to avoid breaking other iterations currently in-progress.
svn commit r<I>
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,6 @@
##
from sys import version_info
-from warnings import warn
try:
from setuptools import setup
@@ -32,7 +31,6 @@ install_requires = [
tests_require = None
if version_info[0] == 2:
- warn("For SNI support, please install the following from PyPI: 'ndg-httpsclient', 'pyopenssl', 'pyasn1'")
tests_require = [
"mock",
]
|
Remove SNI warning as SNI support has been backported to <I>
closes #<I>
|
diff --git a/Tests/Auth/OpenID/Consumer.php b/Tests/Auth/OpenID/Consumer.php
index <HASH>..<HASH> 100644
--- a/Tests/Auth/OpenID/Consumer.php
+++ b/Tests/Auth/OpenID/Consumer.php
@@ -203,10 +203,9 @@ class Tests_Auth_OpenID_Consumer extends PHPUnit_TestCase {
$query['openid.sig'] = 'fake';
}
- list($status, $info) = $consumer->completeAuth($info->token, $query);
+ $result = $consumer->completeAuth($info->token, $query);
- $this->assertEquals(Auth_OpenID_SUCCESS, $status);
- $this->assertEquals($info, $user_url);
+ $this->assertEquals(array(Auth_OpenID_SUCCESS, $user_url), $result);
}
function _test_success($user_url, $delegate_url, $links, $immediate = false)
|
[project @ Reduce number of assertions]
|
diff --git a/superset-frontend/src/explore/exploreUtils.js b/superset-frontend/src/explore/exploreUtils.js
index <HASH>..<HASH> 100644
--- a/superset-frontend/src/explore/exploreUtils.js
+++ b/superset-frontend/src/explore/exploreUtils.js
@@ -198,7 +198,12 @@ export const shouldUseLegacyApi = formData => {
return useLegacyApi || false;
};
-export const buildV1ChartDataPayload = ({ formData, force }) => {
+export const buildV1ChartDataPayload = ({
+ formData,
+ force,
+ resultFormat,
+ resultType,
+}) => {
const buildQuery =
getChartBuildQueryRegistry().get(formData.viz_type) ??
(buildQueryformData =>
@@ -210,6 +215,8 @@ export const buildV1ChartDataPayload = ({ formData, force }) => {
return buildQuery({
...formData,
force,
+ result_format: resultFormat,
+ result_type: resultType,
});
};
@@ -260,13 +267,12 @@ export const exportChart = ({
payload = formData;
} else {
url = '/api/v1/chart/data';
- const buildQuery = getChartBuildQueryRegistry().get(formData.viz_type);
- payload = buildQuery({
- ...formData,
+ payload = buildV1ChartDataPayload({
+ formData,
force,
+ resultFormat,
+ resultType,
});
- payload.result_type = resultType;
- payload.result_format = resultFormat;
}
postForm(url, payload);
};
|
fix: chart export fails when buildQuery not present (#<I>)
|
diff --git a/code/libraries/koowa/controller/view.php b/code/libraries/koowa/controller/view.php
index <HASH>..<HASH> 100644
--- a/code/libraries/koowa/controller/view.php
+++ b/code/libraries/koowa/controller/view.php
@@ -282,6 +282,7 @@ abstract class KControllerView extends KControllerBread
} else $row = $this->execute('add', $context);
+ //Create the redirect
$this->_redirect = KRequest::get('session.com.dispatcher.referrer', 'url');
return $row;
}
@@ -308,8 +309,10 @@ abstract class KControllerView extends KControllerBread
}
}
else $row = $this->execute('add', $context);
-
- $this->_redirect = 'view='.$this->_identifier->name.'&id='.$row->id;
+
+ //Create the redirect
+ $this->_redirect = KRequest::url();
+
return $row;
}
@@ -328,6 +331,7 @@ abstract class KControllerView extends KControllerBread
$row->unlock();
}
+ //Create the redirect
$this->_redirect = KRequest::get('session.com.dispatcher.referrer', 'url');
return $row;
}
|
Apply action should redirect to the request URL. This also solve the problem that the layout information dissapears from the URL after an apply RAP.
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.