diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/runtime_test.go b/runtime_test.go
index <HASH>..<HASH> 100644
--- a/runtime_test.go
+++ b/runtime_test.go
@@ -305,8 +305,7 @@ func TestRestore(t *testing.T) {
// Simulate a crash/manual quit of dockerd: process dies, states stays 'Running'
cStdin, _ := container2.StdinPipe()
cStdin.Close()
- container2.State.setStopped(-1)
- time.Sleep(time.Second)
+ container2.WaitTimeout(time.Second)
container2.State.Running = true
container2.ToDisk()
|
Integrated @creack's feedback on TestRestore
|
diff --git a/lib/machined/context.rb b/lib/machined/context.rb
index <HASH>..<HASH> 100755
--- a/lib/machined/context.rb
+++ b/lib/machined/context.rb
@@ -1,4 +1,5 @@
require "padrino-helpers"
+require "rack"
require "sprockets"
module Machined
|
Adding Rack for Context helpers, to make sure mail_to works
|
diff --git a/Bridges/HttpKernel.php b/Bridges/HttpKernel.php
index <HASH>..<HASH> 100644
--- a/Bridges/HttpKernel.php
+++ b/Bridges/HttpKernel.php
@@ -7,7 +7,6 @@ use PHPPM\Bootstraps\BootstrapInterface;
use PHPPM\Bootstraps\HooksInterface;
use PHPPM\Bootstraps\RequestClassProviderInterface;
use PHPPM\Utils;
-use React\EventLoop\LoopInterface;
use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Message\ResponseInterface;
use RingCentral\Psr7;
@@ -44,9 +43,8 @@ class HttpKernel implements BridgeInterface
* @param string $appBootstrap The name of the class used to bootstrap the application
* @param string|null $appenv The environment your application will use to bootstrap (if any)
* @param boolean $debug If debug is enabled
- * @param LoopInterface $loop Event loop
*/
- public function bootstrap($appBootstrap, $appenv, $debug, LoopInterface $loop)
+ public function bootstrap($appBootstrap, $appenv, $debug)
{
$appBootstrap = $this->normalizeAppBootstrap($appBootstrap);
|
Remove AsyncInterface (#<I>)
|
diff --git a/tests/ResponseTest.php b/tests/ResponseTest.php
index <HASH>..<HASH> 100644
--- a/tests/ResponseTest.php
+++ b/tests/ResponseTest.php
@@ -194,4 +194,11 @@ class ResponseTest extends \PHPUnit_Framework_TestCase
]
], $response);
}
+
+ public function testResponseWithArrayContainsArray()
+ {
+ $response = $this->response ->withArray(['test' => 'array']);
+
+ $this->assertSame('array', $response['test']);
+ }
}
|
Added test to cover withArray function (#<I>)
|
diff --git a/vanilla/core.py b/vanilla/core.py
index <HASH>..<HASH> 100644
--- a/vanilla/core.py
+++ b/vanilla/core.py
@@ -84,6 +84,8 @@ class C(object):
self.q.control([event], 0)
def poll(self, timeout=None):
+ if timeout == -1:
+ timeout = None
events = self.q.control(None, 3, timeout)
return [(e.ident, self.to_C[e.filter]) for e in events]
|
kqueue expects None for no timeout
|
diff --git a/app/controllers/assets_controller.rb b/app/controllers/assets_controller.rb
index <HASH>..<HASH> 100644
--- a/app/controllers/assets_controller.rb
+++ b/app/controllers/assets_controller.rb
@@ -23,11 +23,8 @@ class AssetsController < ApplicationController
end
@assets = Asset.search(params[:q], load: {:include => %w(user tags)}, :page => page, :per => per_page)
- @assets.each_with_hit do |result, hit|
- result.taxon = hit['_source']['taxon']
- end
- set_pagination_results(Asset, @assets, @assets.count)
+ set_pagination_results(Asset, @assets, @assets.total_count)
render :index
end
|
Removed property-loading from ES until we can determine how to use paging with each_with_hit
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -52,16 +52,16 @@ if sys.platform == 'win32':
int(get_build_version() * 10) % 10
)
try:
- os.environ[vscomntools_env] = os.environ['VS120COMNTOOLS']
+ os.environ[vscomntools_env] = os.environ['VS140COMNTOOLS']
except KeyError:
- distutils.log.warn('You probably need Visual Studio 2013 (12.0) '
+ distutils.log.warn('You probably need Visual Studio 2015 (14.0) '
'or higher')
from distutils import msvccompiler, msvc9compiler
- if msvccompiler.get_build_version() < 12.0:
- msvccompiler.get_build_version = lambda: 12.0
- if get_build_version() < 12.0:
- msvc9compiler.get_build_version = lambda: 12.0
- msvc9compiler.VERSION = 12.0
+ if msvccompiler.get_build_version() < 14.0:
+ msvccompiler.get_build_version = lambda: 14.0
+ if get_build_version() < 14.0:
+ msvc9compiler.get_build_version = lambda: 14.0
+ msvc9compiler.VERSION = 14.0
# Workaround http://bugs.python.org/issue4431 under Python <= 2.6
if sys.version_info < (2, 7):
def spawn(self, cmd):
|
Require VS<I>
|
diff --git a/test_project/manage.py b/test_project/manage.py
index <HASH>..<HASH> 100644
--- a/test_project/manage.py
+++ b/test_project/manage.py
@@ -3,7 +3,6 @@ import os
import sys
grandparent_dir = os.path.abspath(os.path.join(os.path.abspath(os.path.splitext(__file__)[0]), '../..'))
-print grandparent_dir
sys.path.insert(0, grandparent_dir)
if __name__ == "__main__":
|
Make manage work relative to dublincore
|
diff --git a/h2o-core/src/main/java/water/parser/FVecParseWriter.java b/h2o-core/src/main/java/water/parser/FVecParseWriter.java
index <HASH>..<HASH> 100644
--- a/h2o-core/src/main/java/water/parser/FVecParseWriter.java
+++ b/h2o-core/src/main/java/water/parser/FVecParseWriter.java
@@ -152,7 +152,7 @@ public class FVecParseWriter extends Iced implements StreamParseWriter {
if (_ctypes[colIdx] == Vec.T_BAD && id > 1) _ctypes[colIdx] = Vec.T_ENUM;
_nvs[colIdx].addEnum(id);
} else { // maxed out enum map
- throw new H2OParseException("Exceeded enumeration limit. Consider reparsing this column as a string.");
+ throw new H2OParseException("Exceeded enumeration limit on column #"+(colIdx+1)+" (using 1-based indexing). Consider reparsing this column as a string.");
}
}
}
|
Gives the column number when the enumeration limit is exceeded.
|
diff --git a/src/language/CSSUtils.js b/src/language/CSSUtils.js
index <HASH>..<HASH> 100644
--- a/src/language/CSSUtils.js
+++ b/src/language/CSSUtils.js
@@ -156,7 +156,7 @@ define(function (require, exports, module) {
if (!state || !state.context) {
return false;
}
- return (state.context.type === "at");
+ return (state.context.type === "atBlock_parens");
}
/**
|
In CSSUtils, detect when in an @ rule correctly
|
diff --git a/example/src/examples/AsyncExample.js b/example/src/examples/AsyncExample.js
index <HASH>..<HASH> 100644
--- a/example/src/examples/AsyncExample.js
+++ b/example/src/examples/AsyncExample.js
@@ -35,6 +35,7 @@ const AsyncExample = () => {
return (
<AsyncTypeahead
+ filterBy={() => true}
id="async-example"
isLoading={isLoading}
labelKey="login"
|
Update AsyncExample.js
Do not filter results in async example
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -19,9 +19,11 @@ setup(name = 'jplephem',
'Intended Audience :: Science/Research',
'License :: OSI Approved :: MIT License',
'Programming Language :: Python :: 2',
+ 'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.3',
+ 'Programming Language :: Python :: 3.4',
'Topic :: Scientific/Engineering :: Astronomy',
],
packages = ['jplephem'],
|
Add claims of Python <I> and <I> compatibility
|
diff --git a/lib/WorseReflection/Core/Inference/NodeContextResolver.php b/lib/WorseReflection/Core/Inference/NodeContextResolver.php
index <HASH>..<HASH> 100644
--- a/lib/WorseReflection/Core/Inference/NodeContextResolver.php
+++ b/lib/WorseReflection/Core/Inference/NodeContextResolver.php
@@ -59,10 +59,15 @@ class NodeContextResolver
}
/**
- * @param Node|Token|MissingToken $node
+ * @param Node|Token|MissingToken|array<MissingToken> $node
*/
private function doResolveNodeWithCache(Frame $frame, $node): NodeContext
{
+ // somehow we can get an array of missing tokens here instead of an object...
+ if (!is_object($node)) {
+ return NodeContext::none();
+ }
+
$key = 'sc:'.spl_object_hash($node);
return $this->cache->getOrSet($key, function () use ($frame, $node) {
|
Avoid trying to generate spl object hash for array (#<I>)
|
diff --git a/intranet/apps/eighth/views/admin/general.py b/intranet/apps/eighth/views/admin/general.py
index <HASH>..<HASH> 100644
--- a/intranet/apps/eighth/views/admin/general.py
+++ b/intranet/apps/eighth/views/admin/general.py
@@ -132,11 +132,6 @@ def cache_view(request):
@eighth_admin_required
-def not_implemented_view(request, *args, **kwargs):
- raise NotImplementedError("This view has not been implemented yet.")
-
-
-@eighth_admin_required
def history_view(request):
history_timeframe = datetime.now() - timedelta(minutes=15)
history = {
|
chore(eighth): remove unused view:
not_implemented_view
|
diff --git a/test/complex.test.js b/test/complex.test.js
index <HASH>..<HASH> 100644
--- a/test/complex.test.js
+++ b/test/complex.test.js
@@ -1,6 +1,7 @@
var assert = require('assert');
var numbers = require('../index.js');
var Complex = numbers.complex;
+var basic = numbers.basic;
suite('numbers', function() {
@@ -59,7 +60,7 @@ suite('numbers', function() {
var A = new Complex(3, 4);
var res = A.phase();
- assert.equal(true, (res - numbers.EPSILON < 0.9272952180016122) && (0.9272952180016122 < res + numbers.EPSILON));
+ assert.equal(true, basic.numbersEqual(res, 0.9272952180016122, numbers.EPSILON));
done();
});
|
clean up complex test to use new number equality method.
|
diff --git a/lib/dpl/provider/pages.rb b/lib/dpl/provider/pages.rb
index <HASH>..<HASH> 100644
--- a/lib/dpl/provider/pages.rb
+++ b/lib/dpl/provider/pages.rb
@@ -83,7 +83,12 @@ module DPL
def api # Borrowed from Releases provider
error 'gh-token must be provided for Pages provider to work.' unless @gh_token
- @api ||= Octokit::Client.new(:access_token => @gh_token)
+ return @api if @api
+
+ api_opts = { :access_token => @gh_token }
+ api_opts[:api_endpoint] = "https://#{gh_url}/api/v3/" unless @gh_url.empty?
+
+ @api = Octokit::Client.new(api_opts)
end
def user
|
Consider GHE endpoint for Pages deployment
|
diff --git a/mod/quiz/report/attemptsreport_table.php b/mod/quiz/report/attemptsreport_table.php
index <HASH>..<HASH> 100644
--- a/mod/quiz/report/attemptsreport_table.php
+++ b/mod/quiz/report/attemptsreport_table.php
@@ -152,7 +152,11 @@ abstract class quiz_attempts_report_table extends table_sql {
* @return string HTML content to go inside the td.
*/
public function col_state($attempt) {
- return quiz_attempt::state_name($attempt->state);
+ if (!is_null($attempt->attempt)) {
+ return quiz_attempt::state_name($attempt->state);
+ } else {
+ return '-';
+ }
}
/**
|
MDL-<I> quiz reports: error when showing users without attempts.
We were not checking if attempt state was null before trying to convert it to a string.
|
diff --git a/satpy/tests/reader_tests/test_eum_base.py b/satpy/tests/reader_tests/test_eum_base.py
index <HASH>..<HASH> 100644
--- a/satpy/tests/reader_tests/test_eum_base.py
+++ b/satpy/tests/reader_tests/test_eum_base.py
@@ -17,12 +17,10 @@
# satpy. If not, see <http://www.gnu.org/licenses/>.
"""EUMETSAT base reader tests package."""
+import numpy as np
import unittest
from datetime import datetime
-import numpy as np
-from satpy.readers.seviri_base import mpef_product_header
-
from satpy.readers.eum_base import (
get_service_mode,
recarray2dict,
@@ -31,6 +29,7 @@ from satpy.readers.eum_base import (
time_cds_short,
timecds2datetime,
)
+from satpy.readers.seviri_base import mpef_product_header
class TestMakeTimeCdsDictionary(unittest.TestCase):
|
Updated test script - to optimise imports
|
diff --git a/src/unistorage/adapters/amazon.py b/src/unistorage/adapters/amazon.py
index <HASH>..<HASH> 100644
--- a/src/unistorage/adapters/amazon.py
+++ b/src/unistorage/adapters/amazon.py
@@ -101,5 +101,8 @@ class AmazonS3(Adapter):
key = self.bucket.get_key(name)
if not key:
raise FileNotFound(name)
- metadata = key.get_metadata()
- return metadata
+ return key.size
+
+ def list(self):
+ for key in self.bucket.list():
+ yield key.name
|
implemented size() and list() for amazon s3 adapter
|
diff --git a/lib/cursor.js b/lib/cursor.js
index <HASH>..<HASH> 100644
--- a/lib/cursor.js
+++ b/lib/cursor.js
@@ -53,7 +53,7 @@ Cursor.prototype._next = function(callback) {
var self = this;
return new Promise(function(resolve, reject) {
if (self._closed === true) {
- reject(new Err.ReqlDriverError('You cannot call `next` on a closed '+this._type))
+ reject(new Err.ReqlDriverError('You cannot call `next` on a closed '+self._type).setOperational())
}
else if ((self._data.length === 0) && (self._canFetch === false)) {
reject(new Err.ReqlDriverError('No more rows in the '+self._type.toLowerCase()).setOperational())
|
Fix an unhandled error because we are not setting an error operational
|
diff --git a/src/sap.f/test/sap/f/qunit/DynamicPageWithStickySubheader.qunit.js b/src/sap.f/test/sap/f/qunit/DynamicPageWithStickySubheader.qunit.js
index <HASH>..<HASH> 100644
--- a/src/sap.f/test/sap/f/qunit/DynamicPageWithStickySubheader.qunit.js
+++ b/src/sap.f/test/sap/f/qunit/DynamicPageWithStickySubheader.qunit.js
@@ -511,8 +511,8 @@ sap.ui.define([
setTimeout(function() {
// Assert
assert.strictEqual(this.oDynamicPage._getScrollBar().$("sbcnt").height(),
- this.oDynamicPage._getTitleHeight() + this.oDynamicPage._oStickySubheader.$().height() + this.oDynamicPage.$wrapper[0].scrollHeight,
- "Scrollbar content size includes title, scrollheight of wrapper and the sticky subheader");
+ Math.round(this.oDynamicPage._getTitleHeight() + this.oDynamicPage._oStickySubheader.$().height() + this.oDynamicPage.$wrapper[0].scrollHeight,
+ "Scrollbar content size includes title, scrollheight of wrapper and the sticky subheader"));
fnDone();
}.bind(this), 200);
});
|
[FIX] sap.f.DynamicPage: Fix failing QUnit on Firefox
Problem: On Firefox a fraction value is returned for the height of
DynamicPageTitle.
Solution: The fraction value is rounded.
BCP: <I>
Change-Id: Ib<I>eb<I>c<I>df<I>d<I>fd6b6ce5cc
|
diff --git a/client/lib/importer/store.js b/client/lib/importer/store.js
index <HASH>..<HASH> 100644
--- a/client/lib/importer/store.js
+++ b/client/lib/importer/store.js
@@ -98,7 +98,7 @@ const ImporterStore = createReducerStore( function( state, payload ) {
break;
}
- newState = state
+ newState = newState
.setIn( [ 'importers', action.importerStatus.importerId ], Immutable.fromJS( action.importerStatus ) );
break;
|
Bug fix: don't ignore state updates on fetch from importer API
|
diff --git a/flashpolicies/tests/policies.py b/flashpolicies/tests/policies.py
index <HASH>..<HASH> 100644
--- a/flashpolicies/tests/policies.py
+++ b/flashpolicies/tests/policies.py
@@ -124,7 +124,7 @@ class PolicyGeneratorTests(TestCase):
"""
policy = policies.Policy()
- self.assertRaises(TypeError, policy.site_control, 'not-valid')
+ self.assertRaises(TypeError, policy.metapolicy, 'not-valid')
def test_element_order(self):
"""
|
Fix a bug caught by coverage.py; thanks, Ned
|
diff --git a/src/main/python/yamlreader/__init__.py b/src/main/python/yamlreader/__init__.py
index <HASH>..<HASH> 100644
--- a/src/main/python/yamlreader/__init__.py
+++ b/src/main/python/yamlreader/__init__.py
@@ -2,6 +2,6 @@
from __future__ import print_function, absolute_import, unicode_literals, division
-from .yamlreader import data_merge, yaml_load, YamlReaderError
+from .yamlreader import data_merge, yaml_load, YamlReaderError, __main
-__all__ = ['data_merge', 'yaml_load', 'YamlReaderError']
+__all__ = ['data_merge', 'yaml_load', 'YamlReaderError', '__main']
|
expose main launcher in package too
This unbreaks the setuptools entry point since it wants to call
`yamlreader.__main` and not `yamlreader.yamlreader.__main`
This resolves #9
|
diff --git a/src/compiler.js b/src/compiler.js
index <HASH>..<HASH> 100644
--- a/src/compiler.js
+++ b/src/compiler.js
@@ -241,6 +241,9 @@
address += size;
}
}
+ labels.palette = 0xE000; //#TODO stealing on test
+ labels.sprites = 0xE000 + 32; //#TODO stealing on test
+
for (var l in ast) {
leaf = ast[l];
if (leaf.type == 'S_DIRECTIVE'){
diff --git a/tests/movingsprite_test.js b/tests/movingsprite_test.js
index <HASH>..<HASH> 100644
--- a/tests/movingsprite_test.js
+++ b/tests/movingsprite_test.js
@@ -5,7 +5,7 @@ var sys = require('util');
var compiler = require('../src/compiler.js');
var lines = fs.readFileSync(__dirname + '/../fixtures/movingsprite/movingsprite.asm', 'utf8').split("\n");
-lines.length = 58;
+lines.length = 73;
var code = lines.join("\n");
var bin = fs.readFileSync(__dirname + '/../fixtures/movingsprite/movingsprite.nes', 'binary');
|
stealing on movingsprite_test so i can walk slowly on the source
|
diff --git a/openquake/commands/plot.py b/openquake/commands/plot.py
index <HASH>..<HASH> 100644
--- a/openquake/commands/plot.py
+++ b/openquake/commands/plot.py
@@ -274,9 +274,9 @@ def make_figure_rupture_info(extractors, what):
info = ex.get(what)
fig, ax = plt.subplots()
ax.grid(True)
- sitecol = ex.get('sitecol')
- bmap = basemap('cyl', sitecol)
- bmap.plot(sitecol['lon'], sitecol['lat'], '+')
+ # sitecol = ex.get('sitecol')
+ # bmap = basemap('cyl', sitecol)
+ # bmap.plot(sitecol['lon'], sitecol['lat'], '+')
n = 0
tot = 0
for rec in info:
|
Removed basemap in plot rupture_info
Former-commit-id: <I>a3c4d2b<I>ffc8dc7bb4ad<I>f1ac<I>a<I>b
|
diff --git a/lib/helper.js b/lib/helper.js
index <HASH>..<HASH> 100644
--- a/lib/helper.js
+++ b/lib/helper.js
@@ -145,7 +145,7 @@ class Helper {
const method = Reflect.get(classType.prototype, 'emit');
Reflect.set(classType.prototype, 'emit', function(event, ...args) {
let argsText = [JSON.stringify(event)].concat(args.map(stringifyArgument)).join(', ');
- if (debug.enabled)
+ if (debug.enabled && this.listenerCount(event))
debug(`${className}.emit(${argsText})`);
if (apiCoverage && this.listenerCount(event))
apiCoverage.set(`${className}.emit(${JSON.stringify(event)})`, true);
|
[DEBUG] Trace only those events which have listeners. (#<I>)
The `DEBUG=*page npm run unit` is too verbose due to events spamming
the console.
This patch starts tracing emitted events only if there are any
listeners.
|
diff --git a/shoebot/core/__init__.py b/shoebot/core/__init__.py
index <HASH>..<HASH> 100644
--- a/shoebot/core/__init__.py
+++ b/shoebot/core/__init__.py
@@ -39,5 +39,4 @@ from cairo_canvas import CairoCanvas
from drawqueue import DrawQueue
from drawqueue_sink import DrawQueueSink
-from cairo_drawqueue import CairoDrawQueue
from cairo_sink import CairoImageSink
|
More removal of cairo draw queue.
|
diff --git a/bin/php-cs-fixer-config.php b/bin/php-cs-fixer-config.php
index <HASH>..<HASH> 100644
--- a/bin/php-cs-fixer-config.php
+++ b/bin/php-cs-fixer-config.php
@@ -31,7 +31,6 @@ return
->level(CS\FixerInterface::PSR1_LEVEL)
->fixers([
'align_double_arrow',
- 'align_equals',
'blankline_after_open_tag',
'concat_with_spaces',
'self_accessor',
|
Removed align_equals rule.
Fixes #2
|
diff --git a/src/jquery.fancytree.clones.js b/src/jquery.fancytree.clones.js
index <HASH>..<HASH> 100644
--- a/src/jquery.fancytree.clones.js
+++ b/src/jquery.fancytree.clones.js
@@ -230,7 +230,7 @@ $.ui.fancytree._FancytreeNodeClass.prototype.reRegister = function(key, refKey){
// Key has changed: update all references
if( key != null && key !== this.key ) {
if( keyMap[key] ) {
- $.error("[ext-clones] reRegister(" + key + "): already exists.");
+ $.error("[ext-clones] reRegister(" + key + "): already exists: " + this);
}
// Update keyMap
delete keyMap[prevKey];
@@ -371,7 +371,7 @@ $.ui.fancytree.registerExtension({
if( add ) {
if( keyMap[node.key] != null ) {
- $.error("clones.treeRegisterNode: node.key already exists: " + node.key);
+ $.error("clones.treeRegisterNode: node.key already exists: " + node);
}
keyMap[key] = node;
if( refKey ) {
|
Improve logging for ext-clones
|
diff --git a/contrib/benchmark.py b/contrib/benchmark.py
index <HASH>..<HASH> 100755
--- a/contrib/benchmark.py
+++ b/contrib/benchmark.py
@@ -19,12 +19,6 @@ from benchexec import __version__ # noqa E402
import benchexec.benchexec # noqa E402
import benchexec.tools # noqa E402
-# Add ./benchmark/tools to __path__ of benchexec.tools package
-# such that additional tool-wrapper modules can be placed in this directory.
-benchexec.tools.__path__ = [
- os.path.join(os.path.dirname(__file__), "benchmark", "tools")
-] + benchexec.tools.__path__
-
class Benchmark(BenchmarkBase):
"""
@@ -32,16 +26,13 @@ class Benchmark(BenchmarkBase):
"""
def load_executor(self):
- if self.config.cloud:
- import vcloud.benchmarkclient_executor as executor
-
- logging.debug(
- "This is vcloud-benchmark.py (based on benchexec %s) "
- "using the VerifierCloud internal API.",
- __version__,
- )
- else:
- executor = super(Benchmark, self).load_executor()
+ import vcloud.benchmarkclient_executor as executor
+
+ logging.debug(
+ "This is vcloud-benchmark.py (based on benchexec %s) "
+ "using the VerifierCloud internal API.",
+ __version__,
+ )
return executor
|
removed explicit tool paths, and using only cloud executor
|
diff --git a/src/Client.php b/src/Client.php
index <HASH>..<HASH> 100644
--- a/src/Client.php
+++ b/src/Client.php
@@ -11,7 +11,6 @@ use Interop\Container\ContainerInterface;
use Psr\Http\Message\RequestInterface;
use Psr\Http\Message\ResponseInterface;
use React\EventLoop\LoopInterface;
-use React\EventLoop\Timer\TimerInterface;
use React\Promise\CancellablePromiseInterface;
use React\Promise\PromiseInterface;
use function React\Promise\reject;
@@ -150,25 +149,6 @@ class Client
});
}
- protected function streamBody(Response $response)
- {
- $stream = $response->getResponse()->getBody();
- $this->loop->addPeriodicTimer(0.001, function (TimerInterface $timer) use ($stream, $response) {
- if ($stream->eof()) {
- $timer->cancel();
- $response->emit('end');
- return;
- }
-
- $size = $stream->getSize();
- if ($size === 0) {
- return;
- }
-
- $response->emit('data', [$stream->read($size)]);
- });
- }
-
protected function applyApiSettingsToRequest(RequestInterface $request): RequestInterface
{
$uri = $request->getUri();
|
Removed streamBody since we stream by default now
|
diff --git a/lib/groupme/client.rb b/lib/groupme/client.rb
index <HASH>..<HASH> 100644
--- a/lib/groupme/client.rb
+++ b/lib/groupme/client.rb
@@ -3,13 +3,11 @@
module GroupMe
class Client
API_BASE_URL = 'https://api.groupme.com/v3/'
+ API_DEFAULT_HEADER = { 'Content-Type': 'application/json' }.freeze
def initialize(access_token:)
@access_token = access_token
- @client = HTTPClient.new do |config|
- config.base_url = API_BASE_URL
- config.default_header = { 'Content-Type': 'application/json' }
- end
+ @client = HTTPClient.new(base_url: API_BASE_URL, default_header: API_DEFAULT_HEADER)
end
def request(method, path, query: {}, body: {})
|
Update client class to be more readable
|
diff --git a/src/Enum.php b/src/Enum.php
index <HASH>..<HASH> 100644
--- a/src/Enum.php
+++ b/src/Enum.php
@@ -188,7 +188,7 @@ abstract class Enum
*/
final public static function byValue($value)
{
- if (!isset(self::$names[static::class])) {
+ if (!isset(self::$constants[static::class])) {
self::detectConstants(static::class);
}
|
Less diff var usage on Enum::byValue()
|
diff --git a/src/layertree/component.js b/src/layertree/component.js
index <HASH>..<HASH> 100644
--- a/src/layertree/component.js
+++ b/src/layertree/component.js
@@ -2,6 +2,7 @@ goog.provide('ngeo.layertree.component');
goog.require('ngeo'); // nowebpack
goog.require('ngeo.layertree.Controller');
+// webpack: import 'bootstrap/js/collapse.js'; // needed to collapse a layertree
/**
|
Add missing dependency on Bootstrap collapse
|
diff --git a/tests/test_sklearn_transform.py b/tests/test_sklearn_transform.py
index <HASH>..<HASH> 100644
--- a/tests/test_sklearn_transform.py
+++ b/tests/test_sklearn_transform.py
@@ -5,11 +5,8 @@ import numpy as np
from sklearn.base import BaseEstimator, TransformerMixin
from sklearn.feature_selection import SelectPercentile, SelectKBest
from sklearn.pipeline import FeatureUnion
-from sklearn.datasets import load_iris
from eli5 import transform_feature_names
-iris_X, iris_y = load_iris(return_X_y=True)
-
class MyFeatureExtractor(BaseEstimator, TransformerMixin):
def fit(self, X, y=None):
@@ -36,8 +33,9 @@ def selection_score_func(X, y):
('p', SelectPercentile(selection_score_func, 40))]),
['k:<NAME1>', 'k:<NAME2>', 'p:<NAME2>']),
])
-def test_transform_feature_names_iris(transformer, expected):
- transformer.fit(iris_X, iris_y)
+def test_transform_feature_names_iris(transformer, expected, iris_train):
+ X, y, _, _ = iris_train
+ transformer.fit(X, y)
# Test in_names being provided
assert (transform_feature_names(transformer,
['<NAME0>', '<NAME1>', '<NAME2>'])
|
TST small cleanup: use pytest fixtures. See GH-<I>.
|
diff --git a/src/Plugin.php b/src/Plugin.php
index <HASH>..<HASH> 100644
--- a/src/Plugin.php
+++ b/src/Plugin.php
@@ -151,6 +151,13 @@ class Plugin implements PluginInterface, EventSubscriberInterface
return;
}
+ $workingDir = dirname($composerFile);
+ $grumPhpFile = $workingDir . DIRECTORY_SEPARATOR . 'grumphp.yml';
+
+ if (file_exists($grumPhpFile)) {
+ unlink($grumPhpFile);
+ }
+
if (!array_key_exists('extra', $definition)) {
$definition['extra'] = [];
}
|
Make sure fresh installs do not have a grumphp.yml in the project root
|
diff --git a/src/Event/EventLDProjector.php b/src/Event/EventLDProjector.php
index <HASH>..<HASH> 100644
--- a/src/Event/EventLDProjector.php
+++ b/src/Event/EventLDProjector.php
@@ -121,12 +121,16 @@ class EventLDProjector extends Projector
$document = $this->loadDocumentFromRepository($tagErased);
$eventLd = $document->getBody();
- $eventLd->concept = (object)array_filter(
- (array)$eventLd->concept,
+
+ $eventLd->concept = array_filter(
+ $eventLd->concept,
function ($keyword) use ($tagErased) {
return $keyword !== (string)$tagErased->getKeyword();
}
);
+ // Ensure array keys start with 0 so json_encode() does encode it
+ // as an array and not as an object.
+ $eventLd->concept = array_values($eventLd->concept);
$this->repository->save($document->withBody($eventLd));
}
|
Slightly better fix for the concept object vs. array encoding problem
|
diff --git a/django_extensions/db/fields/json.py b/django_extensions/db/fields/json.py
index <HASH>..<HASH> 100644
--- a/django_extensions/db/fields/json.py
+++ b/django_extensions/db/fields/json.py
@@ -17,12 +17,12 @@ from django.conf import settings
from django.core.serializers.json import DjangoJSONEncoder
try:
- # Django <= 1.6 backwards compatibility
- from django.utils import simplejson as json
-except ImportError:
# Django >= 1.7
import json
-
+except ImportError:
+ # Django <= 1.6 backwards compatibility
+ from django.utils import simplejson as json
+
def dumps(value):
return DjangoJSONEncoder().encode(value)
|
Try to import json before simplejson
Follow up for #<I> and #<I>
So that we don't get the deprecation warning on django <I> and python >= <I> (since it supports json)
|
diff --git a/src/Core/Framework/DataAbstractionLayer/Dbal/EntityAggregator.php b/src/Core/Framework/DataAbstractionLayer/Dbal/EntityAggregator.php
index <HASH>..<HASH> 100644
--- a/src/Core/Framework/DataAbstractionLayer/Dbal/EntityAggregator.php
+++ b/src/Core/Framework/DataAbstractionLayer/Dbal/EntityAggregator.php
@@ -167,6 +167,8 @@ class EntityAggregator implements EntityAggregatorInterface
$query = new QueryBuilder($this->connection);
$query = $this->buildQueryByCriteria($query, $definition, $clone, $context);
+ $query->resetQueryPart('orderBy');
+
$this->addIdCondition($criteria, $definition, $query);
$table = $definition->getEntityName();
|
NEXT-<I> - Reset _score sorting when fetching aggregations
|
diff --git a/server/bin.js b/server/bin.js
index <HASH>..<HASH> 100644
--- a/server/bin.js
+++ b/server/bin.js
@@ -6,10 +6,10 @@ var express = require('express'),
path = require('path'),
socket = require('./socket'),
api = require('./')
+ .use(express.static(path.join(__dirname, '../dist')))
.use(express.static(path.join(__dirname, '../.tmp')))
- .use(express.static(path.join(__dirname, '../app')))
- .use(express.static(path.join(__dirname, '../dist')));
+ .use(express.static(path.join(__dirname, '../app')));
var server = http.createServer(api);
socket(server);
-server.listen(9000);
\ No newline at end of file
+server.listen(9000);
|
prioritize `dist` over source files
|
diff --git a/tests/Bitpay/PrivateKeyTest.php b/tests/Bitpay/PrivateKeyTest.php
index <HASH>..<HASH> 100644
--- a/tests/Bitpay/PrivateKeyTest.php
+++ b/tests/Bitpay/PrivateKeyTest.php
@@ -111,10 +111,13 @@ class PrivateKeyTest extends \PHPUnit_Framework_TestCase
$priKey = new PrivateKey();
$this->assertNotNull($priKey);
+ $auth = new BitAuth();
+
$priKey->generate();
- $signature = $priKey->sign('BitPay');
-
+ //$signature = $priKey->sign('BitPay');
+
+ $signature = $auth->sign('BitPay', $priKey);
$this->assertNotNull($signature);
}
|
Use Bitauth signature method in test
|
diff --git a/models/ExampleUser.php b/models/ExampleUser.php
index <HASH>..<HASH> 100644
--- a/models/ExampleUser.php
+++ b/models/ExampleUser.php
@@ -331,7 +331,7 @@ abstract class ExampleUser extends \yii\db\ActiveRecord implements components\Id
*/
public function getActivationKey()
{
- $this->activation_key = md5(time().mt_rand().$this->username);
+ $this->activation_key = Security::generateRandomKey();
return $this->save(false) ? $this->activation_key : false;
}
|
resolves #<I>, use Security::generateRandomKey() to generate activation_key instead of md5
|
diff --git a/builtin/logical/nomad/backend.go b/builtin/logical/nomad/backend.go
index <HASH>..<HASH> 100644
--- a/builtin/logical/nomad/backend.go
+++ b/builtin/logical/nomad/backend.go
@@ -44,6 +44,10 @@ func (b *backend) client(s logical.Storage) (*api.Client, error) {
return nil, err
}
+ if conf == nil {
+ return nil, err
+ }
+
nomadConf := api.DefaultConfig()
nomadConf.Address = conf.Address
nomadConf.SecretID = conf.Token
|
Return error before creating a client if conf is nil
|
diff --git a/src/renderer/tilelayer/Renderer.TileLayer.Dom.js b/src/renderer/tilelayer/Renderer.TileLayer.Dom.js
index <HASH>..<HASH> 100644
--- a/src/renderer/tilelayer/Renderer.TileLayer.Dom.js
+++ b/src/renderer/tilelayer/Renderer.TileLayer.Dom.js
@@ -201,8 +201,9 @@ Z.renderer.tilelayer.Dom = Z.Class.extend(/** @lends Z.renderer.tilelayer.Dom.pr
if (this._pruneTimeout) {
clearTimeout(this._pruneTimeout);
}
- var timeout = this.getMap() ? this.getMap().options['zoomAnimationDuration'] : 250,
- pruneLevels = this.getMap() ? !this.getMap().options['zoomBackground'] : true;
+ var map = this.getMap();
+ var timeout = map ? map.options['zoomAnimationDuration'] : 250,
+ pruneLevels = (map && this.layer === map.getBaseLayer()) ? !map.options['zoomBackground'] : true;
// Wait a bit more than 0.2 secs (the duration of the tile fade-in)
// to trigger a pruning.
this._pruneTimeout = setTimeout(Z.Util.bind(this._pruneTiles, this, pruneLevels), timeout + 100);
|
fix #<I>, always prune tiles when zooming a tilelayer other than the baselayer
|
diff --git a/src/components/swipe-action/index.js b/src/components/swipe-action/index.js
index <HASH>..<HASH> 100644
--- a/src/components/swipe-action/index.js
+++ b/src/components/swipe-action/index.js
@@ -219,7 +219,7 @@ export default class AtSwipeAction extends AtComponent {
>
{options.map((item, key) => (
<View
- key={key}
+ key={`${item.text}-${key}`}
style={item.style}
onClick={this.handleClick.bind(this, item, key)}
className={classNames(
|
fix(swipe-action): 修复 AtSwipeAction 循环 key 反优化
|
diff --git a/src/watch.js b/src/watch.js
index <HASH>..<HASH> 100644
--- a/src/watch.js
+++ b/src/watch.js
@@ -44,18 +44,14 @@ function watch(context, options) {
context.execute(paths).then(function(ctx) {
context = ctx;
paths.forEach(function(path) {
- console.log("[changed]", path);
+ console.log("[updated]", path);
});
- inProgress = false;
-
- var pendingPaths = Object.keys(nextPaths);
-
- if (pendingPaths.length) {
- nextPaths = {};
- onChange(pendingPaths);
- }
- }, logError);
+ executePending();
+ }, function(err) {
+ logError(err);
+ executePending();
+ });
}
}
@@ -70,6 +66,17 @@ function watch(context, options) {
console.warn("[removed]", path);
}
}
+
+ function executePending() {
+ inProgress = false;
+
+ var pendingPaths = Object.keys(nextPaths);
+
+ if (pendingPaths.length) {
+ nextPaths = {};
+ onChange(pendingPaths);
+ }
+ }
}
module.exports = watch;
|
Added logic in watcher to recover from errors
|
diff --git a/code/plugins/system/koowa/controller/form.php b/code/plugins/system/koowa/controller/form.php
index <HASH>..<HASH> 100644
--- a/code/plugins/system/koowa/controller/form.php
+++ b/code/plugins/system/koowa/controller/form.php
@@ -130,11 +130,11 @@ class KControllerForm extends KControllerBread
*/
protected function _actionBrowse()
{
- $layout = KRequest::get('get.layout', 'cmd', 'form' );
+ if(!KRequest::get('get.layout', 'cmd')) {
+ KRequest::set('get.layout', $layout);
+ }
- $this->getView()
- ->setLayout($layout)
- ->display();
+ return parent::_actionBrowse();
}
/**
@@ -144,11 +144,10 @@ class KControllerForm extends KControllerBread
*/
protected function _actionRead()
{
- $layout = KRequest::get('get.layout', 'cmd', 'form' );
-
- $this->getView()
- ->setLayout($layout)
- ->display();
+ if(!KRequest::get('get.layout', 'cmd')) {
+ KRequest::set('get.layout', $layout);
+ }
+ return parent::_actionRead();
}
/*
|
Reduced duplication, KControllerForm::_actionRead and Browse now properly extends their parent methods
|
diff --git a/bin/index.js b/bin/index.js
index <HASH>..<HASH> 100644
--- a/bin/index.js
+++ b/bin/index.js
@@ -51,7 +51,7 @@ function randomName(num) {
var joined = ads.length > 1 ? ads.join(' ') : ads[0];
return joined + ' ' + an;
} else {
- return randomName();
+ return randomName(num);
}
}
diff --git a/package.json b/package.json
index <HASH>..<HASH> 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "randanimal",
- "version": "1.0.3",
+ "version": "1.0.4",
"description": "Generates a random combination of adjective and animal name.",
"main": "bin/index.js",
"repository": "git@github.com:jgnewman/randanimal",
diff --git a/src/index.js b/src/index.js
index <HASH>..<HASH> 100644
--- a/src/index.js
+++ b/src/index.js
@@ -42,7 +42,7 @@ function randomName(num) {
const joined = ads.length > 1 ? ads.join(' ') : ads[0];
return joined + ' ' + an;
} else {
- return randomName();
+ return randomName(num);
}
}
|
fix a bug where sometimes the amount of adjectives requested wasn't honored
|
diff --git a/appveyor/build_glpk.py b/appveyor/build_glpk.py
index <HASH>..<HASH> 100644
--- a/appveyor/build_glpk.py
+++ b/appveyor/build_glpk.py
@@ -11,8 +11,8 @@ except ImportError: # python 3
import urllib.request as urllib2
# these need to be set to the latest glpk version
-glpk_version = "4.59"
-glpk_md5 = "c84ce7b8286ab91f2e871cd82050e2fe"
+glpk_version = "4.60"
+glpk_md5 = "eda7965907f6919ffc69801646f13c3e"
glpk_build_dir = "glpk_build/glpk-%s" % glpk_version
url = "http://ftp.gnu.org/gnu/glpk/glpk-%s.tar.gz" % glpk_version
|
bump appveyor glpk to <I>
|
diff --git a/openid.js b/openid.js
index <HASH>..<HASH> 100644
--- a/openid.js
+++ b/openid.js
@@ -1254,7 +1254,7 @@ var _checkSignatureUsingAssociation = function(params, callback)
message += param + ':' + value + '\n';
}
- var hmac = crypto.createHmac(association.type, _fromBase64(association.secret));
+ var hmac = crypto.createHmac(association.type, convert.base64.decode(association.secret));
hmac.update(message, 'utf8');
var ourSignature = hmac.digest('base64');
|
keep associate secret unchanged when verifying signature
|
diff --git a/wpull/http/connection.py b/wpull/http/connection.py
index <HASH>..<HASH> 100644
--- a/wpull/http/connection.py
+++ b/wpull/http/connection.py
@@ -230,6 +230,9 @@ class Connection(object):
else:
error_class = (ConnectionError, StreamClosedError, ssl.SSLError)
+ if not self._keep_alive and 'Connection' not in request.fields:
+ request.fields['Connection'] = 'close'
+
try:
yield self._send_request_header(request)
yield self._send_request_body(request)
|
connection.py: Sets connection close on request header if not keep-alive.
|
diff --git a/src/selection.js b/src/selection.js
index <HASH>..<HASH> 100644
--- a/src/selection.js
+++ b/src/selection.js
@@ -146,7 +146,7 @@ export default class FeatureSelection {
}
// No feature found, but still need to resolve promise
else {
- this.finishRead({ id: request.id, feature: null });
+ this.finishRead({ id: request.id });
}
request.sent = true;
|
consistent undefined results when no feature found in selection buffer
(was either null or undefined depending on code path)
|
diff --git a/Kwf/Exception/NotFound.php b/Kwf/Exception/NotFound.php
index <HASH>..<HASH> 100644
--- a/Kwf/Exception/NotFound.php
+++ b/Kwf/Exception/NotFound.php
@@ -21,6 +21,9 @@ class Kwf_Exception_NotFound extends Kwf_Exception_Abstract
if (in_array($requestUri, $ignore)) {
return false;
}
+ if (substr($requestUri, 0, 8) == '/files/' || substr($requestUri, 0, 12) == '/monitoring/') { //TODO: don't hardcode here
+ return false;
+ }
$body = '';
$body .= $this->_format('REQUEST_URI', isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '(none)');
|
don't log <I> errors starting with /files or /monitoring
this just floods the <I> log
|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index <HASH>..<HASH> 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -10,7 +10,6 @@ SimpleCov.start
require 'xmldsig'
RSpec.configure do |config|
- config.treat_symbols_as_metadata_keys_with_true_values = true
config.run_all_when_everything_filtered = true
config.filter_run :focus
|
remove old configuration.
Remove the following warning:
RSpec::Core::Configuration#treat_symbols_as_metadata_keys_with_true_values=
is deprecated, it is now set to true as default and setting it to
false has no effect.
|
diff --git a/iamine/api.py b/iamine/api.py
index <HASH>..<HASH> 100644
--- a/iamine/api.py
+++ b/iamine/api.py
@@ -30,11 +30,10 @@ def search(query=None, params=None, mine_ids=None, info_only=None, **kwargs):
try:
loop.add_signal_handler(signal.SIGINT, loop.stop)
+ loop.run_until_complete(miner.search(query, params=params, mine_ids=mine_ids))
except RuntimeError:
pass
- loop.run_until_complete(miner.search(query, params=params, mine_ids=mine_ids))
-
def mine_items(identifiers, params=None, callback=None, **kwargs):
"""Concurrently retrieve metadata from Archive.org items.
@@ -55,6 +54,6 @@ def mine_items(identifiers, params=None, callback=None, **kwargs):
miner = Miner(loop, **kwargs)
try:
loop.add_signal_handler(signal.SIGINT, loop.stop)
+ loop.run_until_complete(miner.mine_items(identifiers, callback))
except RuntimeError:
pass
- loop.run_until_complete(miner.mine_items(identifiers, callback))
|
Ignore RuntimeError exceptions.
|
diff --git a/tarbell/s3.py b/tarbell/s3.py
index <HASH>..<HASH> 100644
--- a/tarbell/s3.py
+++ b/tarbell/s3.py
@@ -17,7 +17,7 @@ from clint.textui import puts
from .utils import show_error
EXCLUDES = ['.git', '^\.']
-
+GZIP_TIMESTAMP = 326073600 # Timestamp of Eads' birthday
class S3Url(str):
def __new__(self, content):
@@ -70,7 +70,7 @@ class S3Sync:
key_parts = keyname.split('/')
filename = key_parts.pop()
temp_path = os.path.join(self.tempdir, filename)
- gzfile = gzip.open(temp_path, 'wb')
+ gzfile = gzip.GzipFile(temp_path, 'wb', 9, None, GZIP_TIMESTAMP)
gzfile.write(upload.read())
gzfile.close()
absolute_path = temp_path
|
use arbitrary, constant timestamp (my birthdate) to avoid re-uploading gzipped assets
|
diff --git a/lib/bullet/detector/counter.rb b/lib/bullet/detector/counter.rb
index <HASH>..<HASH> 100644
--- a/lib/bullet/detector/counter.rb
+++ b/lib/bullet/detector/counter.rb
@@ -32,11 +32,6 @@ module Bullet
Bullet.add_notification notice
end
- def self.unique(array)
- array.flatten!
- array.uniq!
- end
-
def self.possible_objects
@@possible_objects ||= {}
end
|
Remove unique method - already in Base
|
diff --git a/ReText/window.py b/ReText/window.py
index <HASH>..<HASH> 100644
--- a/ReText/window.py
+++ b/ReText/window.py
@@ -409,6 +409,8 @@ class ReTextWindow(QMainWindow):
urlstr = url.toString()
if urlstr.startswith('file://') or ':/' not in urlstr:
self.previewBoxes[self.ind].load(url)
+ elif urlstr.startswith('#'):
+ self.previewBoxes[self.ind].page().mainFrame().scrollToAnchor(urlstr[1:])
elif urlstr.startswith('about:blank#'):
self.previewBoxes[self.ind].page().mainFrame().scrollToAnchor(urlstr[12:])
else:
|
Extend linkClicked() anchor handling to work with Qt 5
(cherry picked from commit bb<I>f<I>f7aff<I>e<I>f<I>c<I>bb<I>d<I>a0)
|
diff --git a/java/client/src/org/openqa/selenium/os/WindowsUtils.java b/java/client/src/org/openqa/selenium/os/WindowsUtils.java
index <HASH>..<HASH> 100644
--- a/java/client/src/org/openqa/selenium/os/WindowsUtils.java
+++ b/java/client/src/org/openqa/selenium/os/WindowsUtils.java
@@ -173,7 +173,7 @@ public class WindowsUtils {
cmd.execute();
String output = cmd.getStdOut();
- if (cmd.getExitCode() == 0 || cmd.getExitCode() == 128) {
+ if (cmd.getExitCode() == 0 || cmd.getExitCode() == 128 || cmd.getExitCode() == 255) {
return;
}
throw new RuntimeException("exec return code " + cmd.getExitCode() + ": " + output);
|
Error code <I> returned by taskkill means that the process or one of its children is already dead and can't be killed.
|
diff --git a/fusesoc/edatools/modelsim.py b/fusesoc/edatools/modelsim.py
index <HASH>..<HASH> 100644
--- a/fusesoc/edatools/modelsim.py
+++ b/fusesoc/edatools/modelsim.py
@@ -159,11 +159,14 @@ class Modelsim(Simulator):
cwd = self.work_root,
errormsg = "Failed to build simulation model. Log is available in '{}'".format(os.path.join(self.work_root, 'transcript'))).run()
if self.vpi_modules:
+ f = open(os.path.join(self.work_root, 'vpi_build.log'),'w')
args = ['all']
Launcher('make', args,
cwd = self.work_root,
- stdout = open(os.path.join(self.work_root, 'vpi_build.log'),'w'),
+ stdout = f,
+ stderr = f,
errormsg = " vpi build failed. log is available in '{}'".format(os.path.join(self.work_root, 'vpi_build.log'))).run()
+ f.close()
def run(self, args):
self.model_tech = os.getenv('MODEL_TECH')
|
Merged stderr and stdout for vpi build
|
diff --git a/lib/cocoapods-amimono/integrator.rb b/lib/cocoapods-amimono/integrator.rb
index <HASH>..<HASH> 100644
--- a/lib/cocoapods-amimono/integrator.rb
+++ b/lib/cocoapods-amimono/integrator.rb
@@ -40,11 +40,13 @@ module Amimono
configuration = ENV['CONFIGURATION']
platform = ENV['EFFECTIVE_PLATFORM_NAME']
archs = ENV['ARCHS']
+ target_name = ENV['TARGET_NAME']
archs.split(" ").each do |architecture|
Dir.chdir("\#{intermediates_directory}/Pods.build") do
filelist = ""
Dir.glob("\#{configuration}\#{platform}/*.build/Objects-normal/\#{architecture}/*.o") do |object_file|
+ next if ["Pods-\#{target_name}-dummy", "Pods_\#{target_name}_vers"].any? { |dummy_object| object_file.include? dummy_object }
filelist += File.absolute_path(object_file) + "\\n"
end
File.write("\#{configuration}\#{platform}-\#{architecture}.objects.filelist", filelist)
|
Exclude CocoaPods dummy symbols from the filelist
|
diff --git a/Assets/ImageManipulation.php b/Assets/ImageManipulation.php
index <HASH>..<HASH> 100644
--- a/Assets/ImageManipulation.php
+++ b/Assets/ImageManipulation.php
@@ -486,7 +486,7 @@ trait ImageManipulation {
*/
public function PreviewThumbnail() {
$width = (int)Config::inst()->get(get_class($this), 'asset_preview_width');
- return $this->ScaleWidth($width) ?: $this->IconTag();
+ return $this->ScaleMaxWidth($width) ?: $this->IconTag();
}
/**
|
API PreviewThumbnail now uses ScaleMaxWidth
This will mean that if a thumbnail image is smaller than the preview_width defined, then it will no longer get blown up to the defined size.
|
diff --git a/lib/volt/cli/generate.rb b/lib/volt/cli/generate.rb
index <HASH>..<HASH> 100644
--- a/lib/volt/cli/generate.rb
+++ b/lib/volt/cli/generate.rb
@@ -30,6 +30,11 @@ class Generate < Thor
def gem(name)
require 'volt/cli/new_gem'
+ if name =~ /[-]/
+ Volt.logger.error("Gem names should use underscores for their names. Currently volt only supports a single namespace for a compoennt.")
+ return
+ end
+
NewGem.new(self, name, options)
end
|
Restrict component gems to only have _’s in them for now.
|
diff --git a/flat/style/flat.editor.js b/flat/style/flat.editor.js
index <HASH>..<HASH> 100644
--- a/flat/style/flat.editor.js
+++ b/flat/style/flat.editor.js
@@ -1337,7 +1337,7 @@ function editor_submit(addtoqueue) {
//delete
queries.push(useclause + " DELETE " + editdata[i].higherorder[j].type + " WHERE text = \"" + escape_fql_value(editdata[i].higherorder[j].oldvalue) + "\" FORMAT flat RETURN ancestor-focus");
}
- } else {
+ } else if (editdata[i].higherorder[j].value !== "") {
//add
if (editdata[i].id !== undefined) {
queries.push(useclause + " ADD " + editdata[i].higherorder[j].type + " WITH text \"" + escape_fql_value(editdata[i].higherorder[j].value) + "\" annotator \"" + escape_fql_value(username) + "\" annotatortype \"manual\" datetime now FOR ID " + editdata[i].id + " FORMAT flat RETURN ancestor-focus");
|
Do not add comments/descriptions with empty text (should solve issue #<I>)
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -23,7 +23,11 @@ function Launcher(dotEnsime, ensimeVersion, installDir, sbtCmd) {
* @return nothing */
Launcher.prototype.update = function(output, callback) {
console.log("Updating ensime-server.");
- fs.unlinkSync(this.classpathFile);
+ try {
+ fs.unlinkSync(this.classpathFile);
+ } catch (e) {
+ //didn't exist
+ }
this.install(output, callback);
};
|
Update handles missing classpathFiles.
|
diff --git a/azurerm/resource_arm_app_service_plan.go b/azurerm/resource_arm_app_service_plan.go
index <HASH>..<HASH> 100644
--- a/azurerm/resource_arm_app_service_plan.go
+++ b/azurerm/resource_arm_app_service_plan.go
@@ -270,8 +270,10 @@ func expandAppServicePlanProperties(d *schema.ResourceData, name string) *web.Ap
config := configs[0].(map[string]interface{})
appServiceEnvironmentId := config["app_service_environment_id"].(string)
- properties.HostingEnvironmentProfile = &web.HostingEnvironmentProfile{
- ID: utils.String(appServiceEnvironmentId),
+ if appServiceEnvironmentId != "" {
+ properties.HostingEnvironmentProfile = &web.HostingEnvironmentProfile{
+ ID: utils.String(appServiceEnvironmentId),
+ }
}
perSiteScaling := config["per_site_scaling"].(bool)
|
Only setting the App Service Environment ID if it's specified
|
diff --git a/tests/LinkORB/Tests/Component/Etcd/ClientTest.php b/tests/LinkORB/Tests/Component/Etcd/ClientTest.php
index <HASH>..<HASH> 100644
--- a/tests/LinkORB/Tests/Component/Etcd/ClientTest.php
+++ b/tests/LinkORB/Tests/Component/Etcd/ClientTest.php
@@ -33,7 +33,7 @@ class ClientTest extends PHPUnit_Framework_TestCase
public function testDoRequest()
{
$version = $this->client->doRequest('/version');
- $this->assertArrayHasKey('releaseVersion', json_decode($version, true));
+ $this->assertArrayHasKey('etcdserver', json_decode($version, true));
}
/**
|
Fixing broken test that expected old response from /version
|
diff --git a/config/default.go b/config/default.go
index <HASH>..<HASH> 100644
--- a/config/default.go
+++ b/config/default.go
@@ -205,7 +205,7 @@ func setDefaultNeighborConfigValuesWithViper(v *viper.Viper, n *Neighbor, asn ui
vv.Set("afi-safi", afs[i])
}
af.State.AfiSafiName = af.Config.AfiSafiName
- if !vv.IsSet("afi-safi.config") {
+ if !vv.IsSet("afi-safi.config.enabled") {
af.Config.Enabled = true
}
af.MpGracefulRestart.State.Enabled = af.MpGracefulRestart.Config.Enabled
|
config/default: Fix unfilled "neighbors.afi-safis.config.enabled"
Currently, if "neighbors.afi-safis.config.enabled" is omitted, this
field will not initialised as expected when GoBGPd reads config file,
but will initialised when AddNeighbor API is called.
This cause the miss comparison whether reloaded neighbor config is
updated or not (always determined updated).
This patch fixes the condition more strictly and solves this problem.
|
diff --git a/tests/DatastoreTest.php b/tests/DatastoreTest.php
index <HASH>..<HASH> 100644
--- a/tests/DatastoreTest.php
+++ b/tests/DatastoreTest.php
@@ -207,18 +207,33 @@ class DatastoreTest extends PHPUnit_Framework_TestCase
}
}
- sleep(10);
+ sleep(5);
foreach ($tests as $test)
{
- $t2 = json_decode(
- Guzzlehttp\get('http://127.0.0.1:8080/test/'.$test->id)
- ->getBody()
- );
-
- foreach ($test as $key => $val)
+ // Really lame way to avoid problems with App Engine SDK
+ // and the asynchronous nature of Datastore.
+ do
{
- $this->assertEquals($val, $t2->{$key}, "Test[$idx]: Incorrectly retrieved value for {$key}");
+ try
+ {
+ $t2 = json_decode(
+ Guzzlehttp\get('http://127.0.0.1:8080/test/'.$test->id)
+ ->getBody()
+ );
+
+ foreach ($test as $key => $val)
+ {
+ $this->assertEquals($val, $t2->{$key}, "Test[$idx]: Incorrectly retrieved value for {$key}");
+ }
+ }
+ catch (Exception $e)
+ {
+ continue;
+ }
+ break;
}
+ while (1);
+
}
}
|
Make the async fix (on saving/then querying) for DatastoreTest a little more resilient.
... It might be best to get rid of this test in the future.
|
diff --git a/client.go b/client.go
index <HASH>..<HASH> 100644
--- a/client.go
+++ b/client.go
@@ -35,6 +35,9 @@ func (this *Client) Send(pn *PushNotification) (resp *PushNotificationResponse)
resp.Error = err
}
+ resp.Success = true
+ resp.Error = nil
+
return
}
|
Setting response values accordingly at the end of the request.
|
diff --git a/hazelcast-client-new/src/main/java/com/hazelcast/client/cache/impl/AbstractClientCacheProxy.java b/hazelcast-client-new/src/main/java/com/hazelcast/client/cache/impl/AbstractClientCacheProxy.java
index <HASH>..<HASH> 100644
--- a/hazelcast-client-new/src/main/java/com/hazelcast/client/cache/impl/AbstractClientCacheProxy.java
+++ b/hazelcast-client-new/src/main/java/com/hazelcast/client/cache/impl/AbstractClientCacheProxy.java
@@ -398,7 +398,7 @@ abstract class AbstractClientCacheProxy<K, V>
int completionId = nextCompletionId();
// TODO If there is a single entry, we could make use of a put operation since that is a bit cheaper
ClientMessage request =
- CachePutAllCodec.encodeRequest(nameWithPrefix, entries, expiryPolicyData, partitionId);
+ CachePutAllCodec.encodeRequest(nameWithPrefix, entries, expiryPolicyData, completionId);
Future f = invoke(request, partitionId, completionId);
futureEntriesTuples.add(new FutureEntriesTuple(f, entries));
if (nearCache != null) {
|
`CachePutAllCodec.encodeRequest` fixed by passing `completionId` instead of `partitionId` for putAll operation on new-client
|
diff --git a/alot/helper.py b/alot/helper.py
index <HASH>..<HASH> 100644
--- a/alot/helper.py
+++ b/alot/helper.py
@@ -295,7 +295,7 @@ def call_cmd(cmdlist, stdin=None):
:type cmdlist: list of str
:param stdin: string to pipe to the process
:type stdin: str
- :return: triple of stdout, error msg, return value of the shell command
+ :return: triple of stdout, stderr, return value of the shell command
:rtype: str, str, int
"""
@@ -308,11 +308,14 @@ def call_cmd(cmdlist, stdin=None):
out, err = proc.communicate(stdin)
ret = proc.poll()
else:
- out = subprocess.check_output(cmdlist)
- # todo: get error msg. rval
- except (subprocess.CalledProcessError, OSError), e:
- err = str(e)
- ret = -1
+ try:
+ out = subprocess.check_output(cmdlist)
+ except subprocess.CalledProcessError as e:
+ err = e.output
+ ret = -1
+ except OSError as e:
+ err = e.strerror
+ ret = e.errno
out = string_decode(out, urwid.util.detected_encoding)
err = string_decode(err, urwid.util.detected_encoding)
|
properly read stderr in call_command helper
|
diff --git a/lib/evidence/mongo.rb b/lib/evidence/mongo.rb
index <HASH>..<HASH> 100644
--- a/lib/evidence/mongo.rb
+++ b/lib/evidence/mongo.rb
@@ -20,7 +20,7 @@ module OpenBEL
end
def create_evidence(evidence)
- @evidence.insert(evidence.to_h)
+ @evidence.insert(evidence.to_h, :j => true)
end
def find_evidence_by_id(value)
@@ -41,13 +41,16 @@ module OpenBEL
def update_evidence_by_id(value, evidence)
evidence_h = evidence.to_h
evidence_h[:_id] = BSON::ObjectId(value)
- @evidence.save(evidence_h)
+ @evidence.save(evidence_h, :j => true)
end
def delete_evidence_by_id(value)
- @evidence.remove({
- :_id => to_id(value)
- })
+ @evidence.remove(
+ {
+ :_id => to_id(value)
+ },
+ :j => true
+ )
end
private
|
block while evidence is committed to mongo journal
this change was made to ensure modifications to mongo blocked while
committing to the journal
|
diff --git a/wallet.js b/wallet.js
index <HASH>..<HASH> 100644
--- a/wallet.js
+++ b/wallet.js
@@ -129,7 +129,7 @@ function sendSignature(device_address, signed_text, signature, signing_path, add
function handleMessageFromHub(ws, json, device_pubkey, bIndirectCorrespondent, callbacks){
var subject = json.subject;
var body = json.body;
- if (!subject || !body)
+ if (!subject || typeof body == "undefined")
return callbacks.ifError("no subject or body");
//if (bIndirectCorrespondent && ["cancel_new_wallet", "my_xpubkey", "new_wallet_address"].indexOf(subject) === -1)
// return callbacks.ifError("you're indirect correspondent, cannot trust "+subject+" from you");
|
fix chat recording OFF not being handling
|
diff --git a/lib/chef/deprecated.rb b/lib/chef/deprecated.rb
index <HASH>..<HASH> 100644
--- a/lib/chef/deprecated.rb
+++ b/lib/chef/deprecated.rb
@@ -206,6 +206,8 @@ class Chef
# Returned when using the deprecated option on a property
class Property < Base
+ target 24
+
def to_s
"#{message}\n#{location}"
end
|
Give property deprecations an ID just for tracking if nothing else, even if they don't have a docs page.
|
diff --git a/did/cli.py b/did/cli.py
index <HASH>..<HASH> 100644
--- a/did/cli.py
+++ b/did/cli.py
@@ -91,6 +91,9 @@ class Options(object):
if (self.arguments is not None
and isinstance(self.arguments, basestring)):
self.arguments = self.arguments.split()
+ # Otherwise properly decode command line arguments
+ if self.arguments is None:
+ self.arguments = [arg.decode("utf-8") for arg in sys.argv[1:]]
(opt, arg) = self.parser.parse_args(self.arguments)
self.opt = opt
self.arg = arg
|
Decode command line arguments from utf-8
|
diff --git a/examples/glyphs/maps.py b/examples/glyphs/maps.py
index <HASH>..<HASH> 100644
--- a/examples/glyphs/maps.py
+++ b/examples/glyphs/maps.py
@@ -7,7 +7,8 @@ from bokeh.models.glyphs import Circle
from bokeh.models import (
GMapPlot, Range1d, ColumnDataSource, LinearAxis,
PanTool, WheelZoomTool, BoxSelectTool,
- BoxSelectionOverlay, GMapOptions)
+ BoxSelectionOverlay, GMapOptions,
+ NumeralTickFormatter, PrintfTickFormatter)
from bokeh.resources import INLINE
x_range = Range1d()
@@ -39,10 +40,10 @@ box_select = BoxSelectTool()
plot.add_tools(pan, wheel_zoom, box_select)
-xaxis = LinearAxis(axis_label="lat", major_tick_in=0)
+xaxis = LinearAxis(axis_label="lat", major_tick_in=0, formatter=NumeralTickFormatter(format="0.00"))
plot.add_layout(xaxis, 'below')
-yaxis = LinearAxis(axis_label="lon", major_tick_in=0)
+yaxis = LinearAxis(axis_label="lon", major_tick_in=0, formatter=PrintfTickFormatter(format="%.2f"))
plot.add_layout(yaxis, 'left')
overlay = BoxSelectionOverlay(tool=box_select)
|
Use new formatters in glyphs/maps example
|
diff --git a/pmml-converter/src/main/java/org/jpmml/converter/PMMLUtil.java b/pmml-converter/src/main/java/org/jpmml/converter/PMMLUtil.java
index <HASH>..<HASH> 100644
--- a/pmml-converter/src/main/java/org/jpmml/converter/PMMLUtil.java
+++ b/pmml-converter/src/main/java/org/jpmml/converter/PMMLUtil.java
@@ -38,6 +38,7 @@ import org.dmg.pmml.Array;
import org.dmg.pmml.ComplexArray;
import org.dmg.pmml.Constant;
import org.dmg.pmml.DataType;
+import org.dmg.pmml.DefineFunction;
import org.dmg.pmml.Expression;
import org.dmg.pmml.Extension;
import org.dmg.pmml.Field;
@@ -159,6 +160,11 @@ public class PMMLUtil {
}
static
+ public Apply createApply(DefineFunction defineFunction, Expression... expressions){
+ return createApply(defineFunction.requireName(), expressions);
+ }
+
+ static
public Apply createApply(String function, Expression... expressions){
Apply apply = new Apply(function)
.addExpressions(expressions);
|
Added PMMLUtil#createApply(DefineFunction, Expression[]) utility method
|
diff --git a/pyws/protocols/__init__.py b/pyws/protocols/__init__.py
index <HASH>..<HASH> 100644
--- a/pyws/protocols/__init__.py
+++ b/pyws/protocols/__init__.py
@@ -26,8 +26,6 @@ class Protocol(object):
'type': error_type_name,
'name': error_type.__name__,
'prefix': error_type.__module__,
- 'full_name': '%s.%s' % (
- error_type.__module__, error_type.__name__),
'message': unicode(error),
'params': error.args,
}
@@ -50,7 +48,9 @@ class SoapProtocol(Protocol):
class RestProtocol(Protocol):
def get_function(self, request):
- return request.tail, request.GET
+ return (request.tail,
+ dict((k, len(v) > 1 and v or v[0])
+ for k, v in request.GET.iteritems()))
def get_response(self, result):
return Response(json.dumps({'result': result}))
|
REST protocol extracts single values as single values, not lists
|
diff --git a/app/auto_scale.go b/app/auto_scale.go
index <HASH>..<HASH> 100644
--- a/app/auto_scale.go
+++ b/app/auto_scale.go
@@ -23,7 +23,7 @@ type Action struct {
}
func NewAction(expression string, units uint, wait time.Duration) (*Action, error) {
- if validateExpression(expression) {
+ if expressionIsValid(expression) {
return &Action{Wait: wait, Expression: expression, Units: units}, nil
}
return nil, errors.New("Expression is not valid.")
@@ -31,7 +31,7 @@ func NewAction(expression string, units uint, wait time.Duration) (*Action, erro
var expressionRegex = regexp.MustCompile("{(.*)} ([><=]) ([0-9]+)")
-func validateExpression(expression string) bool {
+func expressionIsValid(expression string) bool {
return expressionRegex.MatchString(expression)
}
diff --git a/app/auto_scale_test.go b/app/auto_scale_test.go
index <HASH>..<HASH> 100644
--- a/app/auto_scale_test.go
+++ b/app/auto_scale_test.go
@@ -181,7 +181,7 @@ func (s *S) TestValidateExpression(c *gocheck.C) {
"100": false,
}
for expression, expected := range cases {
- c.Assert(validateExpression(expression), gocheck.Equals, expected)
+ c.Assert(expressionIsValid(expression), gocheck.Equals, expected)
}
}
|
aut scale: renamed validateExpression to expressionIsValid.
related to #<I>.
|
diff --git a/src/Bkwld/Decoy/Controllers/Elements.php b/src/Bkwld/Decoy/Controllers/Elements.php
index <HASH>..<HASH> 100644
--- a/src/Bkwld/Decoy/Controllers/Elements.php
+++ b/src/Bkwld/Decoy/Controllers/Elements.php
@@ -160,7 +160,7 @@ class Elements extends Base {
$elements->clearCache();
// Redirect back to index
- return Redirect::to(URL::current());;
+ return Redirect::to(URL::current())->with('success', '<b>Elements</b> were successfully saved.');
}
|
Showing a success notification on elements save
|
diff --git a/revel/build.go b/revel/build.go
index <HASH>..<HASH> 100644
--- a/revel/build.go
+++ b/revel/build.go
@@ -62,6 +62,7 @@ func buildApp(c *model.CommandConfig) (err error) {
// Convert target to absolute path
c.Build.TargetPath, _ = filepath.Abs(destPath)
c.Build.Mode = mode
+ c.Build.ImportPath = appImportPath
revel_paths, err := model.NewRevelPaths(mode, appImportPath, "", model.NewWrappedRevelCallback(nil, c.PackageResolver))
if err != nil {
|
Update build.go
add missing c.Build.ImportPath, which is required to generate run.sh and run.bat
|
diff --git a/transloadit.go b/transloadit.go
index <HASH>..<HASH> 100755
--- a/transloadit.go
+++ b/transloadit.go
@@ -10,6 +10,7 @@ import (
"fmt"
"io"
"io/ioutil"
+ "math/rand"
"net/http"
"net/url"
"strings"
@@ -98,7 +99,9 @@ func (client *Client) sign(params map[string]interface{}) (string, string, error
Key: client.config.AuthKey,
Expires: getExpireString(),
}
-
+ // Add a random nonce to make signatures unique and prevent error about
+ // signature reuse: https://github.com/transloadit/go-sdk/pull/35
+ params["nonce"] = rand.Int()
b, err := json.Marshal(params)
if err != nil {
return "", "", fmt.Errorf("unable to create signature: %s", err)
|
Add a random element in the payload to prevent Signature reuse (#<I>)
* Add a random element in the payload to prevent Signature reuse
* Update transloadit.go
|
diff --git a/src/utils/resolvers/docs.js b/src/utils/resolvers/docs.js
index <HASH>..<HASH> 100644
--- a/src/utils/resolvers/docs.js
+++ b/src/utils/resolvers/docs.js
@@ -1,6 +1,12 @@
import { getFileContents } from 'ochre-liberator';
+function getDocInfo(file, cb) {
+ getFileContents(file, (err, contents) => {
+ cb(err, { contents });
+ });
+}
+
module.exports = {
- resolve: getFileContents,
- types: ['doc', 'docx', 'txt', 'rtf', 'ppt', 'pptx', 'xls', 'xlsx']
+ resolve: getDocInfo,
+ types: ['.doc', '.docx', '.txt', '.rtf', '.ppt', '.pptx', '.xls', '.xlsx']
};
|
sends the file contents in an object to match object.assign
|
diff --git a/src/helpers/form-data.js b/src/helpers/form-data.js
index <HASH>..<HASH> 100644
--- a/src/helpers/form-data.js
+++ b/src/helpers/form-data.js
@@ -26,7 +26,6 @@
const carriage = '\r\n'
const dashes = '-'.repeat(2)
-const carriageLength = Buffer.byteLength(carriage)
const NAME = Symbol.toStringTag
@@ -101,28 +100,4 @@ module.exports.formDataIterator = function * (form, boundary) {
yield getFooter(boundary)
}
-/**
- * @param {FormData} form
- * @param {string} boundary
- */
-module.exports.getFormDataLength = function (form, boundary) {
- let length = 0
-
- for (const [name, value] of form) {
- length += Buffer.byteLength(getHeader(boundary, name, value))
-
- if (isBlob(value)) {
- length += value.size
- } else {
- length += Buffer.byteLength(String(value))
- }
-
- length += carriageLength
- }
-
- length += Buffer.byteLength(getFooter(boundary))
-
- return length
-}
-
module.exports.isBlob = isBlob
|
style: removing some unused code
|
diff --git a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
index <HASH>..<HASH> 100644
--- a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
@@ -770,7 +770,16 @@ class VanillaChronicleMap<K, V> extends AbstractMap<K, V>
return usingValue;
} else {
try {
- return valueFactory.create();
+ usingValue = valueFactory.create();
+ if (usingValue == null) {
+ throw new IllegalStateException("acquireUsing() method requires" +
+ "valueFactory.create() result to be non-null. " +
+ "By default it is so when value class is" +
+ "a Byteable/BytesMarshallable/Externalizable subclass." +
+ "Note that acquireUsing() anyway makes very little sense " +
+ "when value class is not a Byteable subclass.");
+ }
+ return usingValue;
} catch (Exception e) {
throw new IllegalStateException(e);
}
|
Ensure acquireUsing() doesn't return null
|
diff --git a/tests/test_common.py b/tests/test_common.py
index <HASH>..<HASH> 100644
--- a/tests/test_common.py
+++ b/tests/test_common.py
@@ -31,11 +31,13 @@ class TestClasses(object):
assert _class is not eval(repr(_class))
def test_equality(self, _class, _copy):
- _copy.foo = 'bar'
- assert not _class == _copy
+ copy_ = _copy(_class)
+ copy_.foo = 'bar'
+ assert not _class == copy_
assert not _class == "not a class instance"
def test_inequality(self, _class, _copy):
- _copy.foo = 'bar'
- assert not _class != _copy
+ copy_ = _copy(_class)
+ copy_.foo = 'bar'
+ assert not _class != copy_
assert _class != "not a class instance"
|
Fix original not passed to deepcopy fixture
|
diff --git a/src/index.js b/src/index.js
index <HASH>..<HASH> 100644
--- a/src/index.js
+++ b/src/index.js
@@ -11,7 +11,7 @@ function genForeachArray(t, loopVar, arrayVar, loopStatement) {
return t.forStatement(
t.variableDeclaration("var", [ t.variableDeclarator(loopVar, t.numericLiteral(0)) ]),
t.binaryExpression("<", loopVar, t.memberExpression(arrayVar, t.identifier("length"))),
- t.unaryExpression("++", loopVar),
+ t.updateExpression("++", loopVar),
loopStatement
);
}
|
fix #2 issue - TypeError crush in babel 7
|
diff --git a/stripe.go b/stripe.go
index <HASH>..<HASH> 100644
--- a/stripe.go
+++ b/stripe.go
@@ -23,7 +23,7 @@ const (
)
// apiversion is the currently supported API version
-const apiversion = "2017-04-06"
+const apiversion = "2017-05-25"
// clientversion is the binding version
const clientversion = "21.5.1"
|
Bump the supported API version to <I>-<I>-<I>
All the necessary changes are already in master.
|
diff --git a/spec/dotenv_spec.rb b/spec/dotenv_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/dotenv_spec.rb
+++ b/spec/dotenv_spec.rb
@@ -141,7 +141,7 @@ describe Dotenv do
it "fixture file has UTF-8 BOM" do
contents = File.open(subject, "rb", &:read).force_encoding("UTF-8")
- expect(contents).to start_with("\xEF\xBB\xBF")
+ expect(contents).to start_with("\xEF\xBB\xBF".force_encoding("UTF-8"))
end
end
|
Fix a failure spec at Ruby <I>
By default, Strings with non-ASCII 8bit character in Ruby <I> are tagged with the "ASCII-8BIT" encoding.
|
diff --git a/pkg/datapath/maps/map.go b/pkg/datapath/maps/map.go
index <HASH>..<HASH> 100644
--- a/pkg/datapath/maps/map.go
+++ b/pkg/datapath/maps/map.go
@@ -169,6 +169,9 @@ func RemoveDisabledMaps() {
"cilium_lb6_reverse_nat",
"cilium_lb6_rr_seq",
"cilium_lb6_services",
+ "cilium_lb6_services_v2",
+ "cilium_lb6_rr_seq_v2",
+ "cilium_lb6_backends",
"cilium_snat_v6_external",
"cilium_proxy6"}...)
}
@@ -180,6 +183,9 @@ func RemoveDisabledMaps() {
"cilium_lb4_reverse_nat",
"cilium_lb4_rr_seq",
"cilium_lb4_services",
+ "cilium_lb4_services_v2",
+ "cilium_lb4_rr_seq_v2",
+ "cilium_lb4_backends",
"cilium_snat_v4_external",
"cilium_proxy4"}...)
}
|
maps: Remove disabled svc v2 maps
Previously, the svc v2 related maps were not removed when ipv4 or ipv6
services were disabled.
|
diff --git a/lib/review/htmlutils.rb b/lib/review/htmlutils.rb
index <HASH>..<HASH> 100644
--- a/lib/review/htmlutils.rb
+++ b/lib/review/htmlutils.rb
@@ -39,16 +39,20 @@ module ReVIEW
begin
require 'pygments'
- Pygments.highlight(
- unescape_html(body),
- :options => {
- :nowrap => true,
- :noclasses => true
- },
- :formatter => format,
- :lexer => lexer)
- rescue LoadError, MentosError
- body
+ begin
+ Pygments.highlight(
+ unescape_html(body),
+ :options => {
+ :nowrap => true,
+ :noclasses => true
+ },
+ :formatter => format,
+ :lexer => lexer)
+ rescue MentosError
+ body
+ end
+ rescue LoadError
+ body
end
end
end
|
supported not exists pygments on Ruby <I>
|
diff --git a/tests/testviews.py b/tests/testviews.py
index <HASH>..<HASH> 100644
--- a/tests/testviews.py
+++ b/tests/testviews.py
@@ -179,8 +179,6 @@ class GridLayoutTest(CompositeTest):
grid = GridLayout([self.view1, self.view2, self.view3, self.view2])
self.assertEqual(grid.shape, (1,4))
- def test_gridlayout_cols(self):
- GridLayout([self.view1, self.view2,self.view3, self.view2])
|
Removed incomplete unit test of GridLayout
|
diff --git a/visidata/movement.py b/visidata/movement.py
index <HASH>..<HASH> 100644
--- a/visidata/movement.py
+++ b/visidata/movement.py
@@ -1,7 +1,7 @@
import itertools
import re
-from visidata import vd, VisiData, error, status, Sheet, Column, regex_flags, rotate_range
+from visidata import vd, VisiData, error, status, Sheet, Column, regex_flags, rotate_range, warning
vd.searchContext = {} # regex, columns, backward to kwargs from previous search
@@ -75,7 +75,7 @@ def searchRegex(vd, sheet, moveCursor=False, reverse=False, **kwargs):
if regex:
vd.searchContext["regex"] = re.compile(regex, regex_flags()) or error('invalid regex: %s' % regex)
- regex = vd.searchContext.get("regex") or error("no regex")
+ regex = vd.searchContext.get("regex") or warning("no regex")
columns = vd.searchContext.get("columns")
if columns == "cursorCol":
|
[warning] change prompt invoked when n, N are pressed before /,? into a warning
|
diff --git a/tests/polysh_tests.py b/tests/polysh_tests.py
index <HASH>..<HASH> 100755
--- a/tests/polysh_tests.py
+++ b/tests/polysh_tests.py
@@ -65,7 +65,7 @@ def parse_cmdline():
default=False, help='include coverage tests')
parser.add_option('--log', type='str', dest='log',
help='log all pexpect I/O and polysh debug info')
- parser.add_option('--python', type='str', dest='python', default='python',
+ parser.add_option('--python', type='str', dest='python', default='python3',
help='python binary to use')
options, args = parser.parse_args()
return options, args
|
PY3: Use python3 as python for tests by default
|
diff --git a/src/Psalm/Codebase.php b/src/Psalm/Codebase.php
index <HASH>..<HASH> 100644
--- a/src/Psalm/Codebase.php
+++ b/src/Psalm/Codebase.php
@@ -1170,10 +1170,6 @@ class Codebase
break;
}
}
-
- if ($offset - $end_pos > 3) {
- break;
- }
}
if (!$recent_type
diff --git a/tests/LanguageServer/CompletionTest.php b/tests/LanguageServer/CompletionTest.php
index <HASH>..<HASH> 100644
--- a/tests/LanguageServer/CompletionTest.php
+++ b/tests/LanguageServer/CompletionTest.php
@@ -621,8 +621,6 @@ class CompletionTest extends \Psalm\Tests\TestCase
$codebase->scanFiles();
$this->analyzeFile('somefile.php', new Context());
- $this->markTestSkipped();
-
$this->assertSame(['B\Collection', '->'], $codebase->getCompletionDataAtPosition('somefile.php', new Position(10, 61)));
}
}
|
Fix problem locating end of completion area
|
diff --git a/lib/axlsx/workbook/worksheet/cell.rb b/lib/axlsx/workbook/worksheet/cell.rb
index <HASH>..<HASH> 100644
--- a/lib/axlsx/workbook/worksheet/cell.rb
+++ b/lib/axlsx/workbook/worksheet/cell.rb
@@ -67,7 +67,7 @@ module Axlsx
# Indicates if the cell is good for shared string table
def plain_string?
@type == :string && # String typed
- !@is_text_run && # No inline styles
+ !is_text_run? && # No inline styles
!@value.nil? && # Not nil
!@value.empty? && # Not empty
!@value.start_with?('=') # Not a formula
|
use method not instance variable for determining if cell level style customizations have been made and the cell is now a text run.
|
diff --git a/src/main/java/org/takes/facets/auth/PsByFlag.java b/src/main/java/org/takes/facets/auth/PsByFlag.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/takes/facets/auth/PsByFlag.java
+++ b/src/main/java/org/takes/facets/auth/PsByFlag.java
@@ -106,6 +106,7 @@ public final class PsByFlag implements Pass {
for (final Map.Entry<Pattern, Pass> ent : this.passes.entrySet()) {
if (ent.getKey().matcher(value).matches()) {
user = ent.getValue().enter(req);
+ break;
}
}
}
|
Added a break clause that was removed by mistake.
|
diff --git a/test/extended/authorization/rbac/groups_default_rules.go b/test/extended/authorization/rbac/groups_default_rules.go
index <HASH>..<HASH> 100644
--- a/test/extended/authorization/rbac/groups_default_rules.go
+++ b/test/extended/authorization/rbac/groups_default_rules.go
@@ -93,7 +93,7 @@ var (
// this is from upstream kube
rbacv1helpers.NewRule("get").URLs(
- "/healthz",
+ "/healthz", "/livez",
"/version",
"/version/",
).RuleOrDie(),
|
extended: add /livez endpoint to RBAC coverage test
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.