diff stringlengths 65 26.7k | message stringlengths 7 9.92k |
|---|---|
diff --git a/config.go b/config.go
index <HASH>..<HASH> 100644
--- a/config.go
+++ b/config.go
@@ -31,6 +31,7 @@ type Config struct {
AsyncConnect bool
MarshalAsJSON bool
SubSecondPrecision bool
+ RequestAck bool
}
// FluentConfig converts data to fluent.Config.
@@ -49,5 +50,6 @@ func (c Config) FluentConfig() fluent.Config {
Async: c.AsyncConnect,
MarshalAsJSON: c.MarshalAsJSON,
SubSecondPrecision: c.SubSecondPrecision,
+ RequestAck: c.RequestAck,
}
} | Add RequestAck to config (#<I>) |
diff --git a/lib/queue/job.js b/lib/queue/job.js
index <HASH>..<HASH> 100644
--- a/lib/queue/job.js
+++ b/lib/queue/job.js
@@ -160,7 +160,10 @@ exports.rangeByType = function( type, state, from, to, order, fn ) {
*/
exports.get = function( id, jobType, fn ) {
- if (typeof jobType === 'function' && !fn) fn = jobType;
+ if (typeof jobType === 'function' && !fn) {
+ fn = jobType;
+ jobType = '';
+ }
var client = redis.client()
, job = new Job; | Set jobType to empty string if it wasn't supplied as the function parameter |
diff --git a/bundles/org.eclipse.orion.client.editor/web/orion/editor/contentAssist.js b/bundles/org.eclipse.orion.client.editor/web/orion/editor/contentAssist.js
index <HASH>..<HASH> 100644
--- a/bundles/org.eclipse.orion.client.editor/web/orion/editor/contentAssist.js
+++ b/bundles/org.eclipse.orion.client.editor/web/orion/editor/contentAssist.js
@@ -409,7 +409,9 @@ define("orion/editor/contentAssist", ['i18n!orion/editor/nls/messages', 'orion/k
self.position();
}
};
- document.addEventListener("scroll", this.scrollListener);
+ if (document.addEventListener) {
+ document.addEventListener("scroll", this.scrollListener);
+ }
}
ContentAssistWidget.prototype = /** @lends orion.editor.ContentAssistWidget.prototype */ {
/** @private */ | addEventListener is not available on IE8 |
diff --git a/lib/beaker-pe/version.rb b/lib/beaker-pe/version.rb
index <HASH>..<HASH> 100644
--- a/lib/beaker-pe/version.rb
+++ b/lib/beaker-pe/version.rb
@@ -3,7 +3,7 @@ module Beaker
module PE
module Version
- STRING = '1.16.0'
+ STRING = '1.17.0'
end
end | (GEM) update beaker-pe version to <I> |
diff --git a/lib/github_api.rb b/lib/github_api.rb
index <HASH>..<HASH> 100644
--- a/lib/github_api.rb
+++ b/lib/github_api.rb
@@ -53,6 +53,7 @@ module Github
:Users => 'users',
:CoreExt => 'core_ext',
:MimeType => 'mime_type',
- :Authorization => 'authorization'
+ :Authorization => 'authorization',
+ :Authorizations => 'authorizations'
end # Github | Register authorizations api with github module. |
diff --git a/lib/Widget/DbCache.php b/lib/Widget/DbCache.php
index <HASH>..<HASH> 100644
--- a/lib/Widget/DbCache.php
+++ b/lib/Widget/DbCache.php
@@ -7,7 +7,6 @@
*/
namespace Widget;
-use Widget\Exception;
use Widget\Stdlib\AbstractCache;
/**
diff --git a/lib/Widget/Validator/AbstractValidator.php b/lib/Widget/Validator/AbstractValidator.php
index <HASH>..<HASH> 100644
--- a/lib/Widget/Validator/AbstractValidator.php
+++ b/lib/Widget/Validator/AbstractValidator.php
@@ -9,7 +9,6 @@
namespace Widget\Validator;
use Widget\AbstractWidget;
-use Widget\Exception\UnexpectedValueException;
/**
* The base class of validator
diff --git a/lib/Widget/Validator/File.php b/lib/Widget/Validator/File.php
index <HASH>..<HASH> 100644
--- a/lib/Widget/Validator/File.php
+++ b/lib/Widget/Validator/File.php
@@ -8,8 +8,6 @@
namespace Widget\Validator;
-use Widget\Exception;
-
/**
* Check if the input is valid file
* | removed extra use Widget\Exception code |
diff --git a/EnvVarProcessor/KeyEnvVarProcessor.php b/EnvVarProcessor/KeyEnvVarProcessor.php
index <HASH>..<HASH> 100644
--- a/EnvVarProcessor/KeyEnvVarProcessor.php
+++ b/EnvVarProcessor/KeyEnvVarProcessor.php
@@ -38,7 +38,7 @@ final class KeyEnvVarProcessor implements EnvVarProcessorInterface
public static function getProvidedTypes()
{
return [
- 'jwk' => 'string',
+ 'jwk' => 'string',
'jwkset' => 'string',
];
} | Apply fixes from StyleCI (#<I>)
[ci skip] [skip ci] |
diff --git a/tests/test_phase1.py b/tests/test_phase1.py
index <HASH>..<HASH> 100644
--- a/tests/test_phase1.py
+++ b/tests/test_phase1.py
@@ -58,3 +58,8 @@ class TestPhase1(fake_filesystem_unittest.TestCase):
self.fs.create_file('/a', contents="include { file myVar }")
with self.assertRaises(TypeError):
phase1.load('/a')
+
+ def test_step_path(self):
+ self.fs.create_file('/a/b/c.trask', contents="set {}")
+ result = phase1.load('/a/b/c.trask')
+ self.assertEqual(result[0].path, '/a/b')
diff --git a/trask/phase1.py b/trask/phase1.py
index <HASH>..<HASH> 100644
--- a/trask/phase1.py
+++ b/trask/phase1.py
@@ -61,7 +61,7 @@ def expand_includes(step, path):
new_path = os.path.abspath(os.path.join(dirname, rel_path))
return load(new_path)
else:
- step.path = path
+ step.path = os.path.dirname(path)
return [step] | Fix step path again and add a test |
diff --git a/spec/helpers/package-helper-spec.rb b/spec/helpers/package-helper-spec.rb
index <HASH>..<HASH> 100644
--- a/spec/helpers/package-helper-spec.rb
+++ b/spec/helpers/package-helper-spec.rb
@@ -34,8 +34,8 @@ module BoxGrinder
it "should package deliverables" do
File.should_receive(:exists?).with('destination/package.tgz').and_return(false)
File.should_receive(:expand_path).with('a/dir').and_return('a/dir/expanded')
- FileUtils.should_receive(:ln_s).with("'a/dir/expanded'", "'destination/package'")
- FileUtils.should_receive(:rm).with("'destination/package'")
+ FileUtils.should_receive(:ln_s).with('a/dir/expanded', 'destination/package')
+ FileUtils.should_receive(:rm).with('destination/package')
@exec_helper.should_receive(:execute).with("tar -C 'destination' -hcvzf 'destination/package.tgz' 'package'") | Fixed test for PakageHelper |
diff --git a/install/migrations/2.4.1.php b/install/migrations/2.4.1.php
index <HASH>..<HASH> 100644
--- a/install/migrations/2.4.1.php
+++ b/install/migrations/2.4.1.php
@@ -5,7 +5,7 @@
static $publish_filtering_disabled = false;
static function getVersion(){
- return '2.4.1';
+ return '2.4.1beta1';
}
static function getReleaseNotes(){ | Set version to <I>beta1 |
diff --git a/lib/oktakit/client.rb b/lib/oktakit/client.rb
index <HASH>..<HASH> 100644
--- a/lib/oktakit/client.rb
+++ b/lib/oktakit/client.rb
@@ -31,12 +31,17 @@ module Oktakit
builder.adapter Faraday.default_adapter
end
- def initialize(token:, organization: nil, api_endpoint: nil)
+ def initialize(token: nil, access_token: nil, organization: nil, api_endpoint: nil)
if organization.nil? && api_endpoint.nil?
raise ArgumentError, "Please provide either the organization or the api_endpoint argument"
end
+ if token.blank? && access_token.blank?
+ raise ArgumentError, "Please provide either the token or the access_token argument"
+ end
+
@token = token
+ @access_token = access_token
@organization = organization
@api_endpoint = api_endpoint
end
@@ -182,7 +187,8 @@ module Oktakit
http.headers[:accept] = 'application/json'
http.headers[:content_type] = 'application/json'
http.headers[:user_agent] = "Oktakit v#{Oktakit::VERSION}"
- http.authorization 'SSWS ', @token
+ http.authorization 'SSWS ', @token if @token
+ http.authorization :Bearer, @access_token if @access_token
end
end
@@ -195,7 +201,7 @@ module Oktakit
def absolute_to_relative_url(next_ref)
return unless next_ref
-
+
next_ref.href.sub(api_endpoint, '')
end
end | Ability to use OAuth <I> access token instead of
just the API token |
diff --git a/law/sandbox/base.py b/law/sandbox/base.py
index <HASH>..<HASH> 100644
--- a/law/sandbox/base.py
+++ b/law/sandbox/base.py
@@ -286,8 +286,6 @@ class SandboxTask(Task):
def __getattribute__(self, attr, proxy=True):
if proxy:
- if attr == "deps" and self.sandboxed:
- return lambda: []
if attr == "run" and not self.sandboxed:
return self.sandbox_proxy.run
elif attr == "inputs" and _sandbox_stagein_dir and self.sandboxed: | Fix sandboxing dependencies. |
diff --git a/unixfs/data.pb.go b/unixfs/data.pb.go
index <HASH>..<HASH> 100644
--- a/unixfs/data.pb.go
+++ b/unixfs/data.pb.go
@@ -13,7 +13,7 @@ It has these top-level messages:
*/
package unixfs
-import proto "code.google.com/p/goprotobuf/proto"
+import proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
import math "math"
// Reference imports to suppress errors if they are not otherwise used. | make vendor is your friend
cc @whyrusleeping |
diff --git a/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js b/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js
index <HASH>..<HASH> 100644
--- a/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js
+++ b/guacamole/src/main/webapp/app/client/directives/guacFileBrowser.js
@@ -250,7 +250,11 @@ angular.module('client').directive('guacFileBrowser', [function guacFileBrowser(
// Refresh file browser when any upload completes
$scope.$on('guacUploadComplete', function uploadComplete(event, filename) {
- ManagedFilesystem.refresh($scope.filesystem, $scope.filesystem.currentDirectory);
+
+ // Refresh filesystem, if it exists
+ if ($scope.filesystem)
+ ManagedFilesystem.refresh($scope.filesystem, $scope.filesystem.currentDirectory);
+
});
}] | GUAC-<I>: Verify existence of filesystem before refreshing. |
diff --git a/lib/minify.js b/lib/minify.js
index <HASH>..<HASH> 100644
--- a/lib/minify.js
+++ b/lib/minify.js
@@ -3,7 +3,7 @@ var pkg = require( './packages' );
module.exports = {
'application/javascript' : function( file, content ) {
try {
- return pkg.ugy.minify( file );
+ return pkg.ugy.minify( file ).code;
} // in these case a create file has been triggered when the file is saved but not valid
catch ( e ) { // todo: should we check if the file is in a valid state, period, before re-writing it?
console.log( e ); | update uglify-js version |
diff --git a/connection/commands.js b/connection/commands.js
index <HASH>..<HASH> 100644
--- a/connection/commands.js
+++ b/connection/commands.js
@@ -315,7 +315,8 @@ GetMore.prototype.toBin = function() {
/**************************************************************
* KILLCURSOR
**************************************************************/
-var KillCursor = function(bson, cursorIds) {
+var KillCursor = function(bson, ns, cursorIds) {
+ this.ns = ns;
this.requestId = _requestId++;
this.cursorIds = cursorIds;
}; | refactor(kill-cursor): include ns with KillCursor for upconverting
NODE-<I> |
diff --git a/lib/Cake/Utility/ClassRegistry.php b/lib/Cake/Utility/ClassRegistry.php
index <HASH>..<HASH> 100644
--- a/lib/Cake/Utility/ClassRegistry.php
+++ b/lib/Cake/Utility/ClassRegistry.php
@@ -137,7 +137,9 @@ class ClassRegistry {
if (class_exists($class)) {
${$class} = new $class($settings);
- ${$class} = (${$class} instanceof Model) ? ${$class} : null;
+ if ($strict) {
+ ${$class} = (${$class} instanceof Model) ? ${$class} : null;
+ }
}
if (!isset(${$class})) {
if ($strict) { | Adding a backwards compatible check to ClassRegistry::init() so it is still able to return classes that are not instance of Model |
diff --git a/question/format/hotpot/format.php b/question/format/hotpot/format.php
index <HASH>..<HASH> 100644
--- a/question/format/hotpot/format.php
+++ b/question/format/hotpot/format.php
@@ -48,7 +48,9 @@ class qformat_hotpot extends qformat_default {
// get import file name
global $params;
- if (isset($params) && !empty($params->choosefile)) {
+ if (! empty($this->realfilename)) {
+ $filename = $this->realfilename;
+ } else if (isset($params) && !empty($params->choosefile)) {
// course file (Moodle >=1.6+)
$filename = $params->choosefile;
} else { | MDL-<I>: fix setting of absolute urls for images in subfolders of course files |
diff --git a/tests/OpenGraphTests.php b/tests/OpenGraphTests.php
index <HASH>..<HASH> 100644
--- a/tests/OpenGraphTests.php
+++ b/tests/OpenGraphTests.php
@@ -6,7 +6,10 @@ if (!class_exists('\PHPUnit\Framework\TestCase')) {
class_alias('\PHPUnit_Framework_TestCase', '\PHPUnit\Framework\TestCase');
}
-class OpenGraphTest extends PHPUnit_Framework_TestCase
+/**
+ * Class OpenGraphTest for tests with PHPUnit.
+ */
+class OpenGraphTest extends PHPUnit_Framework_TestCase \PHPUnit\Framework\TestCase
{
/** | Updated class for PHPUnit 6 |
diff --git a/lib/dependor/class_name_resolver.rb b/lib/dependor/class_name_resolver.rb
index <HASH>..<HASH> 100644
--- a/lib/dependor/class_name_resolver.rb
+++ b/lib/dependor/class_name_resolver.rb
@@ -8,7 +8,7 @@ module Dependor
def for_name(name)
class_name = camelize(name)
- modules = search_modules.concat([Object])
+ modules = search_modules + [Object]
klass = nil
modules.each do |mod|
diff --git a/spec/dependor/class_name_resolver_spec.rb b/spec/dependor/class_name_resolver_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/dependor/class_name_resolver_spec.rb
+++ b/spec/dependor/class_name_resolver_spec.rb
@@ -40,4 +40,11 @@ describe Dependor::ClassNameResolver do
resolver.for_name(:foo_bar_baz_2).should == FooBarBaz2
end
+
+ it "doesnt have Object in search modules after calling for_name" do
+ resolver = Dependor::ClassNameResolver.new([])
+
+ resolver.for_name(:something)
+ resolver.search_modules.should_not include(Object)
+ end
end | remove multiple addition of Object inside ClassNameResolver search modules |
diff --git a/genson/generator.py b/genson/generator.py
index <HASH>..<HASH> 100644
--- a/genson/generator.py
+++ b/genson/generator.py
@@ -107,7 +107,9 @@ class Schema(object):
schema['required'] = self._get_required()
elif 'array' in self._type:
- schema['items'] = self._get_items(recurse)
+ items = self._get_items(recurse)
+ if items:
+ schema['items'] = items
return schema
diff --git a/test/test_gen_single.py b/test/test_gen_single.py
index <HASH>..<HASH> 100644
--- a/test/test_gen_single.py
+++ b/test/test_gen_single.py
@@ -38,7 +38,7 @@ class TestArray(unittest.TestCase):
def test_empty(self):
s = Schema().add_object([])
self.assertEqual(s.to_dict(),
- {"type": "array", "items": []})
+ {"type": "array"})
def test_monotype(self):
s = Schema().add_object(["spam", "spam", "spam", "egg", "spam"]) | Emit valid schema when arrays in sample objects are empty.
Fixes a bug where an empty `items` array is specified in the schema
when the "training" objects all contain empty arrays. In other words,
the schema contains `{"type": "array", "items": []}`. The empty array
in the `items` entry is not valid.
The fix was to not emit the `items` entry if the array is empty. |
diff --git a/test/actions/status.js b/test/actions/status.js
index <HASH>..<HASH> 100644
--- a/test/actions/status.js
+++ b/test/actions/status.js
@@ -12,6 +12,11 @@ describe('Action: status', function(){
});
});
+ before((done) => {
+ // time for serer to settle for health check
+ setTimeout(done, 4000);
+ });
+
after(function(done){
actionhero.stop(function(){
done();
@@ -21,7 +26,6 @@ describe('Action: status', function(){
var firstNumber = null;
it('returns node status', function(done){
api.specHelper.runAction('status', function(response){
- response.nodeStatus.should.equal('Node Healthy');
response.problems.length.should.equal(0);
response.id.should.equal('test-server');
done(); | time for serer to settle for health check |
diff --git a/lib/metacrunch/elasticsearch/reader.rb b/lib/metacrunch/elasticsearch/reader.rb
index <HASH>..<HASH> 100644
--- a/lib/metacrunch/elasticsearch/reader.rb
+++ b/lib/metacrunch/elasticsearch/reader.rb
@@ -45,11 +45,8 @@ module Metacrunch
end
def count
- body = @body.dup
- body.delete(:fields)
-
client.count({
- body: body,
+ body: { query: @body[:query] },
index: @uri.index,
type: @uri.type
})["count"] | Use only the query part for count. |
diff --git a/request/request.go b/request/request.go
index <HASH>..<HASH> 100644
--- a/request/request.go
+++ b/request/request.go
@@ -338,6 +338,8 @@ func (r *Request) Clear() {
r.port = ""
r.localPort = ""
r.family = 0
+ r.size = 0
+ r.do = false
}
// Match checks if the reply matches the qname and qtype from the request, it returns | [request] Also clear `do` and `size` (#<I>)
Those 2 attriburtes were not cleared as part of `Clear()` call. |
diff --git a/src/css.js b/src/css.js
index <HASH>..<HASH> 100644
--- a/src/css.js
+++ b/src/css.js
@@ -173,6 +173,7 @@ jQuery.extend({
"fontWeight": true,
"lineHeight": true,
"opacity": true,
+ "order": true,
"orphans": true,
"widows": true,
"zIndex": true,
diff --git a/test/unit/css.js b/test/unit/css.js
index <HASH>..<HASH> 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -111,7 +111,7 @@ test("css(String|Hash)", function() {
});
test("css() explicit and relative values", function() {
- expect(29);
+ expect( 30 );
var $elem = jQuery("#nothiddendiv");
$elem.css({ "width": 1, "height": 1, "paddingLeft": "1px", "opacity": 1 });
@@ -196,6 +196,9 @@ test("css() explicit and relative values", function() {
$elem.css( "opacity", "+=0.5" );
equal( $elem.css("opacity"), "1", "'+=0.5' on opacity (params)" );
+
+ $elem.css( "order", 2 );
+ equal( $elem.css("order"), "2", "2 on order" );
});
test("css(String, Object)", function() { | Fixes #<I>: don't append px to CSS order value. Close gh-<I>. |
diff --git a/salt/renderers/pyobjects.py b/salt/renderers/pyobjects.py
index <HASH>..<HASH> 100644
--- a/salt/renderers/pyobjects.py
+++ b/salt/renderers/pyobjects.py
@@ -263,7 +263,7 @@ from __future__ import absolute_import
import logging
import re
-from six import exec_
+from salt.utils.six import exec_
from salt.loader import _create_loader
from salt.fileclient import get_file_client | Replaced module six in file /salt/renderers/pyobjects.py |
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -242,6 +242,7 @@ function writeStreamToFs(opts, stream) {
walker.on('end', function () {
stream.emit('end');
+ stream.emit('finish');
});
} | emit 'finish' event on end (compatibility with Gulp@^<I> |
diff --git a/src/mg/Ding/HttpSession/HttpSession.php b/src/mg/Ding/HttpSession/HttpSession.php
index <HASH>..<HASH> 100644
--- a/src/mg/Ding/HttpSession/HttpSession.php
+++ b/src/mg/Ding/HttpSession/HttpSession.php
@@ -68,7 +68,6 @@ class HttpSession
*/
public function getAttribute($name)
{
- global $_SESSION;
if (isset($_SESSION[$name])) {
return $_SESSION[$name];
}
@@ -85,7 +84,6 @@ class HttpSession
*/
public function setAttribute($name, $value)
{
- global $_SESSION;
$_SESSION[$name] = $value;
} | Closes #<I> removed global keyword for $_SESSION |
diff --git a/winrm/command.go b/winrm/command.go
index <HASH>..<HASH> 100644
--- a/winrm/command.go
+++ b/winrm/command.go
@@ -4,6 +4,7 @@ import (
"bytes"
"errors"
"io"
+ "strings"
)
type commandWriter struct {
@@ -105,6 +106,11 @@ func (command *Command) slurpAllOutput() (finished bool, err error) {
response, err := command.client.sendRequest(request)
if err != nil {
+ if strings.Contains(err.Error(), "OperationTimeout") {
+ // Operation timeout because there was no command output
+ return
+ }
+
command.Stderr.write.CloseWithError(err)
command.Stdout.write.CloseWithError(err)
return true, err | Fix an issue where no output for <I> seconds would throw an error |
diff --git a/source/application/models/oxuser.php b/source/application/models/oxuser.php
index <HASH>..<HASH> 100644
--- a/source/application/models/oxuser.php
+++ b/source/application/models/oxuser.php
@@ -843,7 +843,7 @@ class oxUser extends oxBase
}
$this->oxuser__oxshopid = new oxField($sShopID, oxField::T_RAW);
- if (!($blOK = $this->save())) {
+ if (($blOK = $this->save())) {
// dropping/cleaning old delivery address/payment info
$oDb->execute("delete from oxaddress where oxaddress.oxuserid = " . $oDb->quote($this->oxuser__oxid->value) . " ");
$oDb->execute("update oxuserpayments set oxuserpayments.oxuserid = " . $oDb->quote($this->oxuser__oxusername->value) . " where oxuserpayments.oxuserid = " . $oDb->quote($this->oxuser__oxid->value) . " "); | Use correct error translations in user creation
EXCEPTION_USER_USERCREATIONFAILED was changed to ERROR_MESSAGE_USER_USERCREATIONFAILED, therefore usages had to be updated.
Also removed not used translations.
closes #<I> |
diff --git a/src/Embedder/AttachmentEmbedder.php b/src/Embedder/AttachmentEmbedder.php
index <HASH>..<HASH> 100644
--- a/src/Embedder/AttachmentEmbedder.php
+++ b/src/Embedder/AttachmentEmbedder.php
@@ -2,17 +2,17 @@
namespace Eduardokum\LaravelMailAutoEmbed\Embedder;
-use Eduardokum\LaravelMailAutoEmbed\Models\EmbeddableEntity;
-use Swift_EmbeddedFile;
use Swift_Image;
use Swift_Message;
+use Swift_EmbeddedFile;
+use Eduardokum\LaravelMailAutoEmbed\Models\EmbeddableEntity;
class AttachmentEmbedder extends Embedder
{
/**
* @var Swift_Message
*/
- private $message;
+ protected $message;
/**
* AttachmentEmbedder constructor.
@@ -57,7 +57,7 @@ class AttachmentEmbedder extends Embedder
* @param Swift_EmbeddedFile $attachment
* @return string
*/
- private function embed(Swift_EmbeddedFile $attachment)
+ protected function embed(Swift_EmbeddedFile $attachment)
{
return $this->message->embed($attachment);
} | Change to protected instead private
It's should be like this. No need to make function private. |
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -22,13 +22,13 @@ install_requires = [
setup(
name='figgypy',
- version='1.1.7',
+ version='1.2.dev',
description='Simple configuration tool. Get config from yaml, json, or xml.',
long_description=readme,
author='Herkermer Sherwood',
author_email='theherk@gmail.com',
url='https://github.com/theherk/figgypy',
- download_url='https://github.com/theherk/figgypy/archive/1.1.7.zip',
+ download_url='https://github.com/theherk/figgypy/archive/1.2.dev.zip',
packages=find_packages(),
platforms=['all'],
license='MIT', | Update setup.py to develop version |
diff --git a/spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationContextLoader.java b/spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationContextLoader.java
index <HASH>..<HASH> 100644
--- a/spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationContextLoader.java
+++ b/spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationContextLoader.java
@@ -212,7 +212,7 @@ public class SpringApplicationContextLoader extends AbstractContextLoader {
public void processContextConfiguration(
ContextConfigurationAttributes configAttributes) {
super.processContextConfiguration(configAttributes);
- if (!configAttributes.hasLocations() && !configAttributes.hasClasses()) {
+ if (!configAttributes.hasResources()) {
Class<?>[] defaultConfigClasses = detectDefaultConfigurationClasses(configAttributes
.getDeclaringClass());
configAttributes.setClasses(defaultConfigClasses); | Polish d<I>bc<I>
Closes gh-<I> |
diff --git a/src/saml2/entity.py b/src/saml2/entity.py
index <HASH>..<HASH> 100644
--- a/src/saml2/entity.py
+++ b/src/saml2/entity.py
@@ -867,16 +867,16 @@ class Entity(HTTPBase):
if "asynchop" not in kwargs:
if binding in [BINDING_SOAP, BINDING_PAOS]:
- asynchop = False
+ kwargs["asynchop"] = False
else:
- asynchop = True
+ kwargs["asynchop"] = True
if xmlstr:
if "return_addrs" not in kwargs:
if binding in [BINDING_HTTP_REDIRECT, BINDING_HTTP_POST]:
try:
# expected return address
- return_addrs = self.config.endpoint(
+ kwargs["return_addrs"] = self.config.endpoint(
service, binding=binding)
except Exception:
logger.info("Not supposed to handle this!") | Fixed proposed by Erick Tryzelaar |
diff --git a/jenkins/check_projects.py b/jenkins/check_projects.py
index <HASH>..<HASH> 100644
--- a/jenkins/check_projects.py
+++ b/jenkins/check_projects.py
@@ -84,9 +84,8 @@ def CheckProjects(needed, fix=False):
for role, needs in sorted(needed.items()):
print >>sys.stderr, ' %s: %s' % (role, ','.join(Sane(n) for n in needs))
- mutate = fix == '--fix'
threads = [
- threading.Thread(target=Check, args=(p, needed, mutate))
+ threading.Thread(target=Check, args=(p, needed, fix))
for p in sorted(projects)
] | fix is a bool, not a string |
diff --git a/Resources/public/angularjs/Editor/EditorApp.js b/Resources/public/angularjs/Editor/EditorApp.js
index <HASH>..<HASH> 100644
--- a/Resources/public/angularjs/Editor/EditorApp.js
+++ b/Resources/public/angularjs/Editor/EditorApp.js
@@ -6,7 +6,6 @@ var EditorApp = angular.module('EditorApp', [
'ngSanitize',
'ui.bootstrap',
'ui.pageslide',
- /*'ui.sortable', */
'ui.tinymce',
'ui.translation',
'ui.resourcePicker', | [PathBundle] Drag and Drop path scenario steps |
diff --git a/lib/cisco_node_utils/portchannel_global.rb b/lib/cisco_node_utils/portchannel_global.rb
index <HASH>..<HASH> 100644
--- a/lib/cisco_node_utils/portchannel_global.rb
+++ b/lib/cisco_node_utils/portchannel_global.rb
@@ -39,6 +39,10 @@ module Cisco
# PROPERTIES #
########################################################
+ def load_balance_type
+ config_get('portchannel_global', 'load_balance_type')
+ end
+
def hash_distribution
config_get('portchannel_global', 'hash_distribution')
end | Adding a new method to get lb type |
diff --git a/lib/watchaggregator/aggregator.go b/lib/watchaggregator/aggregator.go
index <HASH>..<HASH> 100644
--- a/lib/watchaggregator/aggregator.go
+++ b/lib/watchaggregator/aggregator.go
@@ -98,6 +98,9 @@ func (dir *eventDir) eventType() fs.EventType {
}
type aggregator struct {
+ // folderID never changes and is accessed in CommitConfiguration, which
+ // asynchronously updates folderCfg -> can't use folderCfg.ID (racy)
+ folderID string
folderCfg config.FolderConfiguration
folderCfgUpdate chan config.FolderConfiguration
// Time after which an event is scheduled for scanning when no modifications occur.
@@ -112,6 +115,7 @@ type aggregator struct {
func newAggregator(folderCfg config.FolderConfiguration, ctx context.Context) *aggregator {
a := &aggregator{
+ folderID: folderCfg.ID,
folderCfgUpdate: make(chan config.FolderConfiguration),
notifyTimerNeedsReset: false,
notifyTimerResetChan: make(chan time.Duration),
@@ -390,7 +394,7 @@ func (a *aggregator) VerifyConfiguration(from, to config.Configuration) error {
func (a *aggregator) CommitConfiguration(from, to config.Configuration) bool {
for _, folderCfg := range to.Folders {
- if folderCfg.ID == a.folderCfg.ID {
+ if folderCfg.ID == a.folderID {
select {
case a.folderCfgUpdate <- folderCfg:
case <-a.ctx.Done(): | lib/watchaggregator: Prevent race on config update (#<I>) |
diff --git a/bundles/org.eclipse.orion.client.ui/web/browse/builder/browse.js b/bundles/org.eclipse.orion.client.ui/web/browse/builder/browse.js
index <HASH>..<HASH> 100644
--- a/bundles/org.eclipse.orion.client.ui/web/browse/builder/browse.js
+++ b/bundles/org.eclipse.orion.client.ui/web/browse/builder/browse.js
@@ -117,7 +117,7 @@ define('browse/builder/browse', ['orion/widgets/browse/fileBrowser', 'orion/serv
selectorNumber: selectorNumber,
rootName: params.rootName,
widgetSource: _browser_script_source ? {repo: params.repo, base: params.base, js: _browser_script_source , css: _browser_script_source.replace(/built-browser.*.js/, "built-browser.css")} : null,
- maxEditorLines: params.snippetShareOptions && params.snippetShareOptions.maxL ? params.snippetShareOptions.maxL : 300,
+ maxEditorLines: params.snippetShareOptions && params.snippetShareOptions.maxL ? params.snippetShareOptions.maxL : 45,
init: true
});
var pluginRegistry = new mPluginRegistry.PluginRegistry(serviceRegistry, { | R/O file widget: reduce the number of visible lines in the editor for better scroll UX. |
diff --git a/Swat/SwatString.php b/Swat/SwatString.php
index <HASH>..<HASH> 100644
--- a/Swat/SwatString.php
+++ b/Swat/SwatString.php
@@ -1056,7 +1056,7 @@ class SwatString extends SwatObject
} else {
if ($significant_digits !== null) {
// round to number of significant digits
- $integer_digits = ceil(log10($value));
+ $integer_digits = floor(log10($value)) + 1;
$fractional_digits =
max($significant_digits - $integer_digits, 0); | Count integer digits properly.
svn commit r<I> |
diff --git a/handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java b/handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java
index <HASH>..<HASH> 100644
--- a/handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java
+++ b/handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java
@@ -351,7 +351,7 @@ public class ChunkedWriteHandler
void fail(Throwable cause) {
ReferenceCountUtil.release(msg);
if (promise != null) {
- promise.setFailure(cause);
+ promise.tryFailure(cause);
}
} | [#<I>] Fix IllegalStateException which was produced during failing ChunkedWrite after the channel was closed |
diff --git a/src/Addressable.php b/src/Addressable.php
index <HASH>..<HASH> 100644
--- a/src/Addressable.php
+++ b/src/Addressable.php
@@ -82,9 +82,7 @@ class Addressable extends DataExtension
public function updateFrontEndFields(FieldList $fields)
{
- if (!$fields->dataFieldByName("Address")) {
- $fields->merge($this->getAddressFields());
- }
+ $fields->merge($this->getAddressFields());
}
public function populateDefaults() | Removed a check as merge simply overrides keys |
diff --git a/htmresearch/frameworks/layers/l2_l4_inference.py b/htmresearch/frameworks/layers/l2_l4_inference.py
index <HASH>..<HASH> 100644
--- a/htmresearch/frameworks/layers/l2_l4_inference.py
+++ b/htmresearch/frameworks/layers/l2_l4_inference.py
@@ -141,7 +141,7 @@ class L4L2Experiment(object):
longDistanceConnections = 0,
maxConnectionDistance = 1,
columnPositions = None,
- decayFunction = lambda x: 1./(x**2),
+ decayFunction = lambda x: 1./x,
L4Overrides=None,
numLearningPoints=3,
seed=42, | RES-<I> Upload experiment details to domino |
diff --git a/lib/tripod/resource.rb b/lib/tripod/resource.rb
index <HASH>..<HASH> 100644
--- a/lib/tripod/resource.rb
+++ b/lib/tripod/resource.rb
@@ -53,7 +53,7 @@ module Tripod::Resource
# performs equality checking on the uris
def ==(other)
self.class == other.class &&
- uri.to_s == other.to_s
+ uri.to_s == other.uri.to_s
end
# performs equality checking on the class
diff --git a/lib/tripod/version.rb b/lib/tripod/version.rb
index <HASH>..<HASH> 100644
--- a/lib/tripod/version.rb
+++ b/lib/tripod/version.rb
@@ -1,3 +1,3 @@
module Tripod
- VERSION = "0.7.25"
+ VERSION = "0.7.26"
end | fix to the last fix (resource equality) |
diff --git a/foolbox/attacks/lbfgs.py b/foolbox/attacks/lbfgs.py
index <HASH>..<HASH> 100644
--- a/foolbox/attacks/lbfgs.py
+++ b/foolbox/attacks/lbfgs.py
@@ -140,7 +140,7 @@ class LBFGSAttack(Attack):
def crossentropy(x):
logits, gradient, _ = a.predictions_and_gradient(
- x.reshape(shape), target_class)
+ x.reshape(shape), target_class, strict=False)
gradient = gradient.reshape(-1)
ce = utils.crossentropy(logits=logits, label=target_class)
return ce, gradient | Removed strict bound checks in LBFGS |
diff --git a/backup/restorelib.php b/backup/restorelib.php
index <HASH>..<HASH> 100644
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -4696,7 +4696,7 @@
break;
}
}
- if ($this->level == 6 && $this->tree[5]!="ROLE_ASSIGNMENTS" && $this->tree[5]!="ROLE_OVERRIDES") {
+ if ($this->level == 6 && $this->tree[5]!="ROLES_ASSIGNMENTS" && $this->tree[5]!="ROLES_OVERRIDES") {
switch ($tagName) {
case "ROLE":
//We've finalized a role, get it
@@ -4711,7 +4711,7 @@
}
}
- if ($this->level == 7 && $this->tree[5]!="ROLE_ASSIGNMENTS" && $this->tree[5]!="ROLE_OVERRIDES") {
+ if ($this->level == 7) {
switch ($tagName) {
case "TYPE":
$this->info->temprole->type = $this->getContents();
@@ -6743,4 +6743,4 @@
fclose($restorelog);
}
}
-?>
\ No newline at end of file
+?> | merged, apply nick's patch for MDL-<I>, typo in restorelib.php |
diff --git a/src/main/java/org/minimalj/frontend/impl/json/JsonPasswordField.java b/src/main/java/org/minimalj/frontend/impl/json/JsonPasswordField.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/minimalj/frontend/impl/json/JsonPasswordField.java
+++ b/src/main/java/org/minimalj/frontend/impl/json/JsonPasswordField.java
@@ -7,13 +7,13 @@ import org.minimalj.frontend.Frontend.InputComponentListener;
import org.minimalj.frontend.Frontend.PasswordField;
public class JsonPasswordField extends JsonInputComponent<char[]> implements PasswordField {
- private static final String MAX_LENGTH = "maxLength";
private InputComponentListener changeListener;
public JsonPasswordField(int maxLength, InputComponentListener changeListener) {
- super("PasswordField", changeListener);
- put(MAX_LENGTH, maxLength);
+ super("TextField", changeListener);
+ put(JsonTextField.INPUT_TYPE, "password");
+ put(JsonTextField.MAX_LENGTH, maxLength);
this.changeListener = changeListener;
} | JsonPasswordField: no need for special field type |
diff --git a/api/server/sdk/volume_migrate.go b/api/server/sdk/volume_migrate.go
index <HASH>..<HASH> 100644
--- a/api/server/sdk/volume_migrate.go
+++ b/api/server/sdk/volume_migrate.go
@@ -43,14 +43,14 @@ func (s *VolumeServer) Start(
labels := make(map[string]string, 0)
labels["group"] = volumeGroup.GetGroupId()
if !s.haveOwnership(ctx, labels) {
- return nil, status.Error(codes.InvalidArgument, "Volume Operation not Permitted.")
+ return nil, status.Error(codes.PermissionDenied, "Volume Operation not Permitted.")
}
//migrate volume groups
return s.volumeGroupMigrate(ctx, req, volumeGroup)
} else if allVolumes := req.GetAllVolumes(); allVolumes != nil {
// migrate all volumes
if !s.haveOwnership(ctx, nil) {
- return nil, status.Error(codes.InvalidArgument, "Volume Operation not Permitted.")
+ return nil, status.Error(codes.PermissionDenied, "Volume Operation not Permitted.")
}
return s.allVolumesMigrate(ctx, req, allVolumes)
} | Change returned error to PermissionDenied |
diff --git a/jquery.smoothState.js b/jquery.smoothState.js
index <HASH>..<HASH> 100644
--- a/jquery.smoothState.js
+++ b/jquery.smoothState.js
@@ -282,8 +282,8 @@
/** Forces browser to redraw elements */
redraw: function ($element) {
- $element.height(0);
- setTimeout(function(){$element.height("auto");}, 0);
+ $element.height();
+ //setTimeout(function(){$element.height("100%");}, 0);
}
}, // eo utility | More lightweight redrawing.
I could not find any szenario in which this solution isn't sufficient. But I and many others (see issues) run into problem with the old solution, which requires two full repaints. |
diff --git a/backend/commands/case.go b/backend/commands/case.go
index <HASH>..<HASH> 100644
--- a/backend/commands/case.go
+++ b/backend/commands/case.go
@@ -95,7 +95,6 @@ func (c *LowerCaseCommand) Run(v *View, e *Edit) error {
for i := 0; i < sel.Len(); i++ {
r := sel.Get(i)
if r.Size() != 0 {
-
t := v.Buffer().Substr(r)
v.Replace(e, r, strings.ToLower(t))
} | Remove extra whitespace
Pedantic style commit to remove extra whitespace for consistency. |
diff --git a/src/grid/ClientRepresentations.php b/src/grid/ClientRepresentations.php
index <HASH>..<HASH> 100644
--- a/src/grid/ClientRepresentations.php
+++ b/src/grid/ClientRepresentations.php
@@ -28,11 +28,11 @@ class ClientRepresentations extends RepresentationCollection
'login',
'name_language',
'description',
+ $user->can('bill.read') ? 'balance' : null,
+ $user->can('bill.read') ? 'credit' : null,
$user->can('client.read') ? 'seller_id' : null,
$user->can('client.read') ? 'type' : null,
'state',
- $user->can('bill.read') ? 'balance' : null,
- $user->can('bill.read') ? 'credit' : null,
]),
],
'servers' => [ | Move Client `credit` column from right edge of the screen, cause a visual bug with Control Sidebar |
diff --git a/src/Query.php b/src/Query.php
index <HASH>..<HASH> 100644
--- a/src/Query.php
+++ b/src/Query.php
@@ -175,11 +175,12 @@ class Query extends Sql implements QueryInterface
/**
* @param int $id
+ * @param string $column
* @return string
*/
- public function delete( $id=null )
+ public function delete( $id=null, $column=null )
{
- $this->setId($id);
+ $this->setId($id, $column);
$this->setBuilderByType();
$sql = $this->builder->toDelete( $this );
$this->reset();
diff --git a/src/QueryInterface.php b/src/QueryInterface.php
index <HASH>..<HASH> 100644
--- a/src/QueryInterface.php
+++ b/src/QueryInterface.php
@@ -58,9 +58,10 @@ interface QueryInterface
* builds delete statement.
*
* @param int $id
+ * @param string $column
* @return string
*/
- public function delete( $id=null );
+ public function delete( $id=null, $column=null );
/**
* builds update statement. | add $column in delete method. |
diff --git a/homely/_utils.py b/homely/_utils.py
index <HASH>..<HASH> 100644
--- a/homely/_utils.py
+++ b/homely/_utils.py
@@ -326,7 +326,7 @@ class RepoListConfig(JsonConfig):
"""
# note that the paths in self.jsondata were already _homepath2real()'d
# in the class' __init__()
- resolved = _homepath2real(path)
+ resolved = _homepath2real(path.rstrip('/'))
for row in self.jsondata:
if resolved == os.path.realpath(row["localpath"]):
return self._infofromdict(row) | Fix bug where you couldn't run 'homely update ~/dotfiles/' |
diff --git a/test/integration/test.visual_recognition.js b/test/integration/test.visual_recognition.js
index <HASH>..<HASH> 100644
--- a/test/integration/test.visual_recognition.js
+++ b/test/integration/test.visual_recognition.js
@@ -175,11 +175,9 @@ describe('visual_recognition_integration', function() {
});
});
- // todo: enable after our test key is allowed to have multiple classifiers (Should be done by early November 2016)
- // this works right now when only testing against one version of node.js, but travis tests run against 3+ versions
- // simultaneously, so the second and third ones to run all fail
+
// todo: add more tests, consider splitting things between a permanent and a temporary classifier
- describe.skip("custom classifiers", function() {
+ describe("custom classifiers", function() {
var classifier_id;
this.retries(0);
@@ -237,7 +235,6 @@ describe('visual_recognition_integration', function() {
}); // custom classifiers
- // todo: enable after our test key is allowed to have multiple collections (Should be done by early November 2016)
// todo: consider creating a permanent collection to run most of these against so that a failure in creation will only kill the creation/deletion tests
describe("collections", function() {
this.retries(0); | enabling skipped VR tests now that our key has been upgraded |
diff --git a/lib/draught/point.rb b/lib/draught/point.rb
index <HASH>..<HASH> 100644
--- a/lib/draught/point.rb
+++ b/lib/draught/point.rb
@@ -27,7 +27,7 @@ module Draught
end
def translation_to(point)
- Vector.new(point.x - x, point.y - y)
+ Vector.translation_between(self, point)
end
def to_matrix
diff --git a/spec/draught/point_spec.rb b/spec/draught/point_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/draught/point_spec.rb
+++ b/spec/draught/point_spec.rb
@@ -38,7 +38,7 @@ module Draught
end
describe "manipulations in space" do
- specify "a Point can be translated using a second Point to produce a new Point" do
+ specify "a Point can be translated using a Vector to produce a new Point" do
translation = Vector.new(1,2)
expect(subject.translate(translation)).to eq(Point.new(2,4))
@@ -50,7 +50,7 @@ module Draught
specify "a Point can be transformed by a lambda-like object which takes the point and returns a new one" do
transformer = ->(point) {
- point.translate(Vector.new(1,1))
+ Point.new(point.x + 1, point.y + 1)
}
expect(subject.transform(transformer)).to eq(Point.new(2,3)) | Point spec readability tweak & clean use of Vector
Tweak Point specs to clean spec title after moving to Vectors for
translation.
Use Vector.translation_between in #translate_to now it exists. |
diff --git a/resources/lang/ja-JP/cachet.php b/resources/lang/ja-JP/cachet.php
index <HASH>..<HASH> 100644
--- a/resources/lang/ja-JP/cachet.php
+++ b/resources/lang/ja-JP/cachet.php
@@ -34,7 +34,7 @@ return [
'stickied' => '固定している障害情報',
'scheduled' => '計画メンテナンス',
'scheduled_at' => ', 予定日時 :timestamp',
- 'posted' => '掲載日時 :timestamp',
+ 'posted' => 'Posted :timestamp by :username',
'posted_at' => '掲載日時 :timestamp',
'status' => [
1 => '調査中', | New translations cachet.php (Japanese) |
diff --git a/lib/stove/cookbook.rb b/lib/stove/cookbook.rb
index <HASH>..<HASH> 100644
--- a/lib/stove/cookbook.rb
+++ b/lib/stove/cookbook.rb
@@ -108,7 +108,7 @@ module Stove
git "add metadata.rb"
git "add CHANGELOG.md"
- git "commit -m 'Version bump to #{tag_version}'"
+ git "commit -m \"Version bump to #{tag_version}\""
git "push #{options[:remote]} #{options[:branch]}"
if options[:github]
@@ -145,7 +145,7 @@ module Stove
if options[:git]
Dir.chdir(path) do
git "add metadata.rb"
- git "commit -m 'Version bump to #{tag_version}'"
+ git "commit -m \"Version bump to #{tag_version}\""
git "push #{options[:remote]} #{options[:branch]}"
end
end | Fix single quotes on windows (#6) |
diff --git a/src/index.js b/src/index.js
index <HASH>..<HASH> 100644
--- a/src/index.js
+++ b/src/index.js
@@ -71,8 +71,6 @@ export { default as TimeRangePicker } from './components/time-range-picker';
export { default as Text } from './components/typography/text';
-export { default as HorizontalConstraint } from './components/constraints/horizontal';
-
export { default as withMouseDownState } from './hocs/with-mouse-down-state';
export { default as withMouseOverState } from './hocs/with-mouse-over-state'; | fix: remove HorizontalConstraint export (#<I>)
It is already avialable as Constraints.Horizontal.
BREAKING CHANGE: HorizontalConstraint export is no longer available. |
diff --git a/cdm/src/main/java/ucar/nc2/iosp/hdf5/H5header.java b/cdm/src/main/java/ucar/nc2/iosp/hdf5/H5header.java
index <HASH>..<HASH> 100644
--- a/cdm/src/main/java/ucar/nc2/iosp/hdf5/H5header.java
+++ b/cdm/src/main/java/ucar/nc2/iosp/hdf5/H5header.java
@@ -3646,7 +3646,7 @@ public class H5header {
data = new int[nValues];
for (int i = 0; i < nValues; i++)
data[i] = raf.readInt();
- if ((nValues & 1) != 0) // check if odd
+ if ((version == 1) && (nValues & 1) != 0) // check if odd
raf.skipBytes(4);
if (debug1 && (debugOut != null)) debugOut.println(this); | fix issue #<I>.
should be trivial to retrofit to <I> |
diff --git a/lib/srgs/elements/rule_ref.rb b/lib/srgs/elements/rule_ref.rb
index <HASH>..<HASH> 100644
--- a/lib/srgs/elements/rule_ref.rb
+++ b/lib/srgs/elements/rule_ref.rb
@@ -4,7 +4,7 @@ module Srgs
attr_accessor :uri, :special
def initialize(rule, special=nil)
- @uri = "##{rule}" unless rule.nil? or rule.empty?
+ @uri = rule unless rule.nil? or rule.empty?
@special =special
end
diff --git a/lib/srgs/grammar_builder.rb b/lib/srgs/grammar_builder.rb
index <HASH>..<HASH> 100644
--- a/lib/srgs/grammar_builder.rb
+++ b/lib/srgs/grammar_builder.rb
@@ -41,6 +41,8 @@ module Srgs
tag(element, xml)
when String
text(element, xml)
+ when OneOf
+ one_of(element, xml)
else
raise "Can't add #{element.class} to item."
end
diff --git a/lib/srgs/version.rb b/lib/srgs/version.rb
index <HASH>..<HASH> 100644
--- a/lib/srgs/version.rb
+++ b/lib/srgs/version.rb
@@ -1,3 +1,3 @@
module Srgs
- VERSION = "1.1.0"
+ VERSION = "1.1.1"
end | item can contain one of. uri doesn't assume local fixes #1 |
diff --git a/addon/utils/load-polyfills.js b/addon/utils/load-polyfills.js
index <HASH>..<HASH> 100644
--- a/addon/utils/load-polyfills.js
+++ b/addon/utils/load-polyfills.js
@@ -1,5 +1,7 @@
export async function loadPolyfills() {
- await Promise.all([intlLocale(), intlPluralRules(), intlRelativeTimeFormat()]);
+ await intlLocale();
+ await intlPluralRules();
+ await intlRelativeTimeFormat();
}
async function intlLocale() { | Load polyfills in order
Both the PluralRules and RelativeTime polyfills require the intlLocale
to be already loading. This mostly worked, but sporadic network delays
could cause them to process out of order and break. Load them
sequentially for the best experience. |
diff --git a/doc/source/conf.py b/doc/source/conf.py
index <HASH>..<HASH> 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -84,7 +84,7 @@ extensions = [
'sphinx.ext.autosummary',
'sphinx.ext.autodoc',
'sphinx.ext.viewcode',
- 'sphinx.ext.pngmath',
+ 'sphinx.ext.imgmath',
'numpydoc'
] | MAINT: replace deprecated pngmath extension by imgmath |
diff --git a/lib/Doctrine/ORM/Version.php b/lib/Doctrine/ORM/Version.php
index <HASH>..<HASH> 100644
--- a/lib/Doctrine/ORM/Version.php
+++ b/lib/Doctrine/ORM/Version.php
@@ -36,7 +36,7 @@ class Version
/**
* Current Doctrine Version
*/
- const VERSION = '2.1.0RC3';
+ const VERSION = '2.1.0RC4-DEV';
/**
* Compares a Doctrine version with the current one. | Bump Dev Version to <I>RC4-DEV |
diff --git a/src/resources/js/directives.js b/src/resources/js/directives.js
index <HASH>..<HASH> 100644
--- a/src/resources/js/directives.js
+++ b/src/resources/js/directives.js
@@ -398,6 +398,10 @@
}
$scope.toggleSelection = function (value) {
+ if ($scope.model == undefined) {
+ $scope.model = [];
+ }
+
for (var i in $scope.model) {
if ($scope.model[i]["value"] == value.value) {
$scope.model.splice(i, 1);
@@ -882,6 +886,9 @@
};
$scope.add = function() {
+ if ($scope.model == undefined) {
+ $scope.model = [];
+ }
$scope.model.push({ value : '' });
$scope.setFocus();
}; | fixed bugs in re validation of angular directives on click. |
diff --git a/PiResults/LastSearchesCommand.php b/PiResults/LastSearchesCommand.php
index <HASH>..<HASH> 100644
--- a/PiResults/LastSearchesCommand.php
+++ b/PiResults/LastSearchesCommand.php
@@ -69,8 +69,13 @@ class Tx_Solr_PiResults_LastSearchesCommand implements Tx_Solr_PluginCommand {
return NULL;
}
+ $lastSearches = $this->getLastSearches();
+ if(empty($lastSearches)) {
+ return NULL;
+ }
+
$marker = array(
- 'loop_lastsearches|lastsearch' => $this->getLastSearches()
+ 'loop_lastsearches|lastsearch' => $lastSearches
);
return $marker; | [TASK] Hide LastSearches facet if no history is present
Change-Id: I4f<I>e5a<I>f3f1a<I>df2b<I>abdd<I>fbe<I> |
diff --git a/src/index.js b/src/index.js
index <HASH>..<HASH> 100644
--- a/src/index.js
+++ b/src/index.js
@@ -295,8 +295,8 @@ window.onload = function() {
// Looks like calling the function immediately returns
// bignumber.js:1177 Uncaught BigNumber Error: new BigNumber() not a base 16 number:
- setTimeout(getAccounts, 0)
- setTimeout(getDetail, 0)
+ setTimeout(getAccounts, 100)
+ setTimeout(getDetail, 100)
eventEmitter.emit('network', network_obj);
})
} | Increase timeout to fix problem not showing accounts on Mist |
diff --git a/src/utils/utils.js b/src/utils/utils.js
index <HASH>..<HASH> 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -2,12 +2,12 @@
export function search(node, selector) {
const result = [];
- let tagsArray;
-
- if (typeof selector === 'string') {
- tagsArray = selector.replace(/\./g, ' ').trim().split(' ');
+ if (typeof selector !== 'string') {
+ throw new Error('selector must be a string');
}
+ const tagsArray = selector.replace(/\./g, ' ').trim().split(' ');
+
const searchIterator = function (node) {
if (typeof selector === 'string') { | throw if selector is not a string |
diff --git a/hystrix-core/src/test/java/com/netflix/hystrix/HystrixCommandTestWithCustomConcurrencyStrategy.java b/hystrix-core/src/test/java/com/netflix/hystrix/HystrixCommandTestWithCustomConcurrencyStrategy.java
index <HASH>..<HASH> 100644
--- a/hystrix-core/src/test/java/com/netflix/hystrix/HystrixCommandTestWithCustomConcurrencyStrategy.java
+++ b/hystrix-core/src/test/java/com/netflix/hystrix/HystrixCommandTestWithCustomConcurrencyStrategy.java
@@ -63,7 +63,7 @@ public class HystrixCommandTestWithCustomConcurrencyStrategy {
try {
HystrixCommand<Boolean> cmd2 = new TestCommand(true, true);
assertTrue(cmd2.execute()); //command execution throws with missing context
- //fail("command should fail and throw (no fallback)");
+ fail("command should fail and throw (no fallback)");
} catch (IllegalStateException ise) {
//expected
ise.printStackTrace();
@@ -71,7 +71,7 @@ public class HystrixCommandTestWithCustomConcurrencyStrategy {
try {
printRequestLog();
- //fail("static access to HystrixRequestLog should fail and throw");
+ fail("static access to HystrixRequestLog should fail and throw");
} catch (IllegalStateException ise) {
//expected
ise.printStackTrace(); | Accidentally commented out some failure assertions |
diff --git a/src/main/java/se/cgbystrom/netty/http/websocket/WebSocketClientHandler.java b/src/main/java/se/cgbystrom/netty/http/websocket/WebSocketClientHandler.java
index <HASH>..<HASH> 100644
--- a/src/main/java/se/cgbystrom/netty/http/websocket/WebSocketClientHandler.java
+++ b/src/main/java/se/cgbystrom/netty/http/websocket/WebSocketClientHandler.java
@@ -62,7 +62,7 @@ public class WebSocketClientHandler extends SimpleChannelUpstreamHandler impleme
}
@Override
- public void channelDisconnected(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
+ public void channelClosed(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
callback.onDisconnect(this);
handshakeCompleted = false;
} | Changed to dispatch onDisconnect() callback on channelClosed instead of channelDisconnect. Was causing erroneous behavior when doing tight disconnects/connects. |
diff --git a/lib/helpers-dom.js b/lib/helpers-dom.js
index <HASH>..<HASH> 100644
--- a/lib/helpers-dom.js
+++ b/lib/helpers-dom.js
@@ -8,10 +8,10 @@ var DOUBLE_NEWLINE_NORMALIZE = /([\n]*)\n\n([\n]*)/g;
var BLOCK_ELEMENTS = {};
[
- 'address', 'article', 'aside', 'audio', 'blockqoute', 'canvas', 'dd', 'div',
+ 'address', 'article', 'aside', 'blockqoute', 'canvas', 'dd', 'div',
'dl', 'fieldset', 'figcaption', 'figure', 'footer', 'form', 'h1', 'h2', 'h3',
- 'h4', 'h5', 'h6', 'header', 'hgroup', 'hr', 'noscript', 'ol', 'output', 'p',
- 'pre', 'section', 'table', 'tfoot', 'ul', 'video',
+ 'h4', 'h5', 'h6', 'header', 'hgroup', 'hr', 'ol', 'output', 'p',
+ 'pre', 'section', 'table', 'tfoot', 'ul',
// Not real block-level elements but treating them at such makes sence
'li'
].forEach(function (tagname) { | [fix] issue where no-text elements would yield text |
diff --git a/heron/common/src/java/com/twitter/heron/common/utils/logging/ErrorReportLoggingHandler.java b/heron/common/src/java/com/twitter/heron/common/utils/logging/ErrorReportLoggingHandler.java
index <HASH>..<HASH> 100644
--- a/heron/common/src/java/com/twitter/heron/common/utils/logging/ErrorReportLoggingHandler.java
+++ b/heron/common/src/java/com/twitter/heron/common/utils/logging/ErrorReportLoggingHandler.java
@@ -104,7 +104,15 @@ public class ErrorReportLoggingHandler extends Handler {
exceptionDataBuilder.setCount(exceptionDataBuilder.getCount() + 1);
exceptionDataBuilder.setLasttime(new Date().toString());
exceptionDataBuilder.setStacktrace(trace);
- exceptionDataBuilder.setLogging(record.getMessage());
+
+ // Can cause NPE and crash HI
+ //exceptionDataBuilder.setLogging(record.getMessage());
+
+ if (record.getMessage() == null) {
+ exceptionDataBuilder.setLogging("");
+ } else {
+ exceptionDataBuilder.setLogging(record.getMessage());
+ }
}
}
} | Fix NPE when logging exceptions that have no message using SLF4J (#<I>)
* Move uploader init above PackingPlan creation to fix NPE in case of bad PackingPlan
* Untested (but probably working) fix for NPE crash
* Set to empty string |
diff --git a/git/repo/base.py b/git/repo/base.py
index <HASH>..<HASH> 100644
--- a/git/repo/base.py
+++ b/git/repo/base.py
@@ -702,7 +702,7 @@ class Repo(object):
Doing so using the "git check-ignore" method.
:param paths: List of paths to check whether they are ignored or not
- :return: sublist of those paths which are ignored
+ :return: subset of those paths which are ignored
"""
try:
proc = self.git.check_ignore(*paths) | rename sublist to subset |
diff --git a/library/CM/Page/Abstract.js b/library/CM/Page/Abstract.js
index <HASH>..<HASH> 100644
--- a/library/CM/Page/Abstract.js
+++ b/library/CM/Page/Abstract.js
@@ -23,7 +23,6 @@ var CM_Page_Abstract = CM_Component_Abstract.extend({
var location = window.location;
var params = queryString.parse(location.search);
var state = _.pick(params, _.intersection(_.keys(params), this.getStateParams()));
- this.setState(state);
this.routeToState(state, location.pathname + location.search);
}
}, | dont call setState() in ready(), call by routeToState() already |
diff --git a/test/src/SolubleTest/Japha/Bridge/Driver/DriverContextTest.php b/test/src/SolubleTest/Japha/Bridge/Driver/DriverContextTest.php
index <HASH>..<HASH> 100644
--- a/test/src/SolubleTest/Japha/Bridge/Driver/DriverContextTest.php
+++ b/test/src/SolubleTest/Japha/Bridge/Driver/DriverContextTest.php
@@ -119,7 +119,12 @@ class DriverContextTest extends \PHPUnit_Framework_TestCase
'php.java.servlet.RemoteServletResponse'
]);
- // @todo future work on session (already committed)
+ if ($this->driver->getClassName($context) == 'io.soluble.pjb.servlet.HttpContext') {
+ $httpServletRequestFromAttribute = $context->getAttribute('io.soluble.pjb.servlet.HttpServletRequest');
+ $this->assertEquals('io.soluble.pjb.servlet.RemoteHttpServletRequest', $this->driver->getClassName($httpServletRequestFromAttribute));
+ }
+
+ // @todo future work on session (issue with session already committed, need more tests)
//var_dump($context->getAttribute('name'));
}
} | Prep <I>, more tests for context |
diff --git a/code/Debug/controllers/IndexController.php b/code/Debug/controllers/IndexController.php
index <HASH>..<HASH> 100644
--- a/code/Debug/controllers/IndexController.php
+++ b/code/Debug/controllers/IndexController.php
@@ -1,7 +1,5 @@
<?php
-// TODO: Test all the refactorings
-
class Magneto_Debug_IndexController extends Mage_Core_Controller_Front_Action
{
/** | Refactorings were tested, remove todo |
diff --git a/pysd/py_backend/external.py b/pysd/py_backend/external.py
index <HASH>..<HASH> 100644
--- a/pysd/py_backend/external.py
+++ b/pysd/py_backend/external.py
@@ -620,8 +620,6 @@ class ExtData(External):
self.roots = [root]
self.coordss = [coords]
self.dims = dims
-
- # This value should be unique
self.interp = interp
def add(self, file_name, tab, time_row_or_col, cell,
@@ -635,6 +633,14 @@ class ExtData(External):
self.cells.append(cell)
self.roots.append(root)
self.coordss.append(coords)
+
+ try:
+ assert interp == self.interp
+ except AssertionError:
+ raise ValueError(self.py_name + "\n"
+ "Error matching interpolation method with "
+ + "previously defined one")
+
try:
assert dims == self.dims
except AssertionError: | Check interpolation method in ExtData.add
Check the consistency in the definition of the interpolation method. |
diff --git a/framework/src/play-test/src/test/java/play/test/WithApplicationTest.java b/framework/src/play-test/src/test/java/play/test/WithApplicationTest.java
index <HASH>..<HASH> 100644
--- a/framework/src/play-test/src/test/java/play/test/WithApplicationTest.java
+++ b/framework/src/play-test/src/test/java/play/test/WithApplicationTest.java
@@ -22,6 +22,6 @@ public class WithApplicationTest extends WithApplication {
public void withApplicationShouldCleanUpApplication() {
stopPlay();
assertNull(app);
- assertTrue(play.api.Play.privateMaybeApplication().isEmpty());
+ assertTrue(play.api.Play.maybeApplication().isEmpty());
}
} | Change privateMaybeApplication to maybeApplication |
diff --git a/src/Users.php b/src/Users.php
index <HASH>..<HASH> 100644
--- a/src/Users.php
+++ b/src/Users.php
@@ -382,12 +382,8 @@ class Users
*/
public function getCurrentUser()
{
- if (!$this->app['session']->isStarted()) {
- return [];
- }
-
- if (is_null($this->currentuser) && $currentuser = $this->app['session']->get('user')) {
- $this->currentuser = $currentuser;
+ if (is_null($this->currentuser)) {
+ $this->currentuser = $this->app['session']->isStarted() ? $this->app['session']->get('user') : false;
}
return $this->currentuser; | Users::getCurrentUser() should return a null for no user |
diff --git a/packages/theme-data/src/index.js b/packages/theme-data/src/index.js
index <HASH>..<HASH> 100644
--- a/packages/theme-data/src/index.js
+++ b/packages/theme-data/src/index.js
@@ -1,7 +1,2 @@
-export { default as basics } from "./basics";
export { default as extendTheme } from "./utils/extendTheme";
export { default as resolveTheme } from "./utils/resolveTheme";
-
-export { default as webLightTheme } from "./themes/webLightTheme";
-export { default as lightGrayTheme } from "./themes/lightGrayTheme";
-export { default as darkBlueTheme } from "./themes/darkBlueTheme"; | BREAKING: Remove deprecated exports |
diff --git a/fast/symbolic.py b/fast/symbolic.py
index <HASH>..<HASH> 100755
--- a/fast/symbolic.py
+++ b/fast/symbolic.py
@@ -1014,8 +1014,14 @@ def part_symbolic(z, s):
re(rho21)
"""
- if s == 1: return re(z)
- else: return im(z)
+ if s == 1:
+ return re(z)
+ elif s == -1:
+ return im(z)
+ elif s == 0:
+ return z
+ else:
+ raise ValueError
def define_rho_vector(rho, Ne): | Added s=0 to part_symbolic. |
diff --git a/Renderer.js b/Renderer.js
index <HASH>..<HASH> 100644
--- a/Renderer.js
+++ b/Renderer.js
@@ -671,10 +671,7 @@ Renderer.prototype.draw = function () {
this.drawDebug()
}
- var numCommands = cmdQueue.flush()
- if (State.profile) {
- console.log('Renderer numCommands', numCommands)
- }
+ cmdQueue.flush()
}
Renderer.prototype.drawDebug = function () { | Renderer stop printing command count logs |
diff --git a/src/Saxulum/ClassFinder/ClassFinder.php b/src/Saxulum/ClassFinder/ClassFinder.php
index <HASH>..<HASH> 100644
--- a/src/Saxulum/ClassFinder/ClassFinder.php
+++ b/src/Saxulum/ClassFinder/ClassFinder.php
@@ -14,7 +14,7 @@ class ClassFinder
for ($i = 0; $i < $tokenCount; $i++) {
- if (is_array($tokens[$i]) && in_array($tokens[$i][0], array(T_NAMESPACE, T_CLASS)) && $tokens[$i-1][0] === T_WHITESPACE) {
+ if (is_array($tokens[$i]) && in_array($tokens[$i][0], array(T_NAMESPACE, T_CLASS)) && $tokens[$i-1][0] !== T_DOUBLE_COLON) {
$type = $tokens[$i][0]; $i++; $namespace = '';
if ($type === T_NAMESPACE) {
$namespaceStack = array(); | yet another try to fix ::class |
diff --git a/src/AudioPlayer.js b/src/AudioPlayer.js
index <HASH>..<HASH> 100644
--- a/src/AudioPlayer.js
+++ b/src/AudioPlayer.js
@@ -270,18 +270,19 @@ class AudioPlayer extends Component {
allowBackShuffle: this.props.allowBackShuffle
});
- if (!this.state.shuffle) {
- const prevSources = getTrackSources(
- prevProps.playlist,
- prevState.activeTrackIndex
- );
- const newSources = getTrackSources(
- this.props.playlist,
- this.state.activeTrackIndex
- );
- if (prevSources[0].src !== newSources[0].src) {
- // cancel playback and re-scan current sources
- this.audio.load();
+ const prevSources = getTrackSources(
+ prevProps.playlist,
+ prevState.activeTrackIndex
+ );
+ const newSources = getTrackSources(
+ this.props.playlist,
+ this.state.activeTrackIndex
+ );
+ if (prevSources[0].src !== newSources[0].src) {
+ // cancel playback and re-scan current sources
+ this.audio.load();
+
+ if (!this.state.shuffle) {
// after toggling off shuffle, we defer clearing the shuffle
// history until we actually change tracks - if the user quickly
// toggles shuffle off then back on again, we don't want to have | Song skip works again in shuffle mode. |
diff --git a/textract/parsers/tesseract.py b/textract/parsers/tesseract.py
index <HASH>..<HASH> 100644
--- a/textract/parsers/tesseract.py
+++ b/textract/parsers/tesseract.py
@@ -6,7 +6,7 @@ def extract(filename, **kwargs):
# Tesseract can't output to console directly so you must first create
# a dummy file to write to, read, and then delete
stdout, stderr = run(
- 'tesseract %(filename)s tmpout && cat tmpout.txt && rm -f tmpout.txt'
+ 'tesseract - - <%(filename)s'
% locals()
)
return stdout | apparently tesseract <I> supports stdout! |
diff --git a/lib/GoCardless/Request.php b/lib/GoCardless/Request.php
index <HASH>..<HASH> 100644
--- a/lib/GoCardless/Request.php
+++ b/lib/GoCardless/Request.php
@@ -71,7 +71,7 @@ class GoCardless_Request {
// Set application specific user agent suffix if found
if (isset($params['ua_tag'])) {
- $curl_options[CURLOPT_USERAGENT] .= '-' . $params['ua_tag'];
+ $curl_options[CURLOPT_USERAGENT] .= ' ' . $params['ua_tag'];
unset($params['ua_tag']);
} | Tweaked user agent suffix syntax |
diff --git a/tinymce/views.py b/tinymce/views.py
index <HASH>..<HASH> 100644
--- a/tinymce/views.py
+++ b/tinymce/views.py
@@ -102,4 +102,6 @@ def filebrowser(request):
content = jsmin(render_to_string('tinymce/filebrowser.js',
context={'fb_url': fb_url},
request=request))
- return HttpResponse(content, content_type='application/javascript')
+ response = HttpResponse(content, content_type='application/javascript')
+ response['Cache-Control'] = 'no-store'
+ return response | Add Cache-Control: no-store header to filebrowser response |
diff --git a/app/Library/Utilities/PitonBuild.php b/app/Library/Utilities/PitonBuild.php
index <HASH>..<HASH> 100644
--- a/app/Library/Utilities/PitonBuild.php
+++ b/app/Library/Utilities/PitonBuild.php
@@ -87,7 +87,7 @@ class PitonBuild
$pdo = new PDO($dsn, $dbConfig['username'], $dbConfig['password'], $dbConfig['options']);
// Insert engine version as key to avoid running install again
- $updateEngineSetting = 'update `setting` set `setting_value` = ?, `updated_date` = ? where `category` = \'piton\' and `setting_key` = \'engine\';';
+ $updateEngineSetting = 'update `data_store` set `setting_value` = ?, `updated_date` = ? where `category` = \'piton\' and `setting_key` = \'engine\';';
$settingValue[] = $engineVersion;
$settingValue[] = date('Y-m-d H:i:s'); | Corrected reference to table `data_store` in PitonBuild. |
diff --git a/config/application.rb b/config/application.rb
index <HASH>..<HASH> 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -40,5 +40,9 @@ module FluentdUi
# config.time_zone =
require Rails.root.join("lib", "fluentd-ui")
+
+ if ENV["FLUENTD_UI_LOG_PATH"].present?
+ config.logger = ActiveSupport::Logger.new(ENV["FLUENTD_UI_LOG_PATH"])
+ end
end
end | Write to specified file path for logging by ENV['FLUENTD_UI_LOG_PATH'] |
diff --git a/elasticpy.py b/elasticpy.py
index <HASH>..<HASH> 100644
--- a/elasticpy.py
+++ b/elasticpy.py
@@ -11,7 +11,7 @@ Apache License 2.0
See COPYING for more information.
'''
__author__ = 'Luke Campbell'
-__version__ = '0.7'
+__version__ = '0.8'
import json
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ from distutils.extension import Extension
setup(
name='elasticpy',
- version='0.7',
+ version='0.8',
description='Python Wrapper for elasticsearch',
author='Luke Campbell',
author_email='LCampbell@ASAScience.com', | Luke: bumps version to <I> |
diff --git a/src/Setup/Documentations/App.php b/src/Setup/Documentations/App.php
index <HASH>..<HASH> 100644
--- a/src/Setup/Documentations/App.php
+++ b/src/Setup/Documentations/App.php
@@ -16,7 +16,7 @@ class App
'setup' => "\t| Default encodage when you using HTML::charset",
];
//
- return $doc[$index]."\n\t|\n\t**/";
+ return "\n".$doc[$index]."\n\t|\n\t**/";
}
protected static function appTitles($index) | fixing bug of the setup docs of return line |
diff --git a/data/Model.php b/data/Model.php
index <HASH>..<HASH> 100644
--- a/data/Model.php
+++ b/data/Model.php
@@ -569,7 +569,7 @@ class Model extends \lithium\core\StaticObject {
* Posts::find('all'); // returns all records
* Posts::find('count'); // returns a count of all records
*
- * // The first ten records that have 'author' set to 'Lithium'
+ * // The first ten records that have 'author' set to 'Bob'
* Posts::find('all', array(
* 'conditions' => array('author' => "Bob"), 'limit' => 10
* )); | fix example within Model::find() docblock |
diff --git a/src/PatternLab/Config.php b/src/PatternLab/Config.php
index <HASH>..<HASH> 100644
--- a/src/PatternLab/Config.php
+++ b/src/PatternLab/Config.php
@@ -241,6 +241,7 @@ class Config {
self::setExposedOption("ishMaximum");
self::setExposedOption("ishMinimum");
self::setExposedOption("patternExtension");
+ self::setExposedOption("outputFileSuffixes");
self::setExposedOption("plugins");
} | adding support to push outputSuffixes |
diff --git a/query/influxql/compiler.go b/query/influxql/compiler.go
index <HASH>..<HASH> 100644
--- a/query/influxql/compiler.go
+++ b/query/influxql/compiler.go
@@ -61,12 +61,8 @@ func (c *Compiler) Compile(ctx context.Context) (flux.Program, error) {
if err != nil {
return nil, err
}
-
- astCompiler := lang.ASTCompiler{
- AST: astPkg,
- Now: now,
- }
- return astCompiler.Compile(ctx)
+ compileOptions := lang.WithLogPlanOpts(c.logicalPlannerOptions...)
+ return lang.CompileAST(astPkg, now, compileOptions), nil
}
func (c *Compiler) CompilerType() flux.CompilerType { | refactor(influxql): compile with planner options (#<I>) |
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -13,7 +13,7 @@ module.exports = function(nodejsOpts, cliOpts){
// watcher
path: process.cwd(),
- debounce: 30,
+ debounce: 0,
sleepAfter: 1000,
match: /.*/,
ignore: [] | Default debounce to 0 |
diff --git a/pfp/interp.py b/pfp/interp.py
index <HASH>..<HASH> 100644
--- a/pfp/interp.py
+++ b/pfp/interp.py
@@ -2362,8 +2362,11 @@ class PfpInterp(object):
names = copy.copy(names)
names.pop()
names += resolved_names
-
- res = switch[names[-1]]
+
+ if len(names) >= 2 and names[-1] == names[-2] and names[-1] == "long":
+ res = "Int64"
+ else:
+ res = switch[names[-1]]
if names[-1] in ["char", "short", "int", "long"] and "unsigned" in names[:-1]:
res = "U" + res | Fix the problem of 'QWORD/long long/unsigned long long' identification error. |
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -14,7 +14,7 @@ function Db (db) {
}
Db.prototype.store = function (pkg, cb) {
- var id = pkg.name + '@' + pkg.version
+ var id = escape(pkg.name) + '@' + pkg.version
var batch = batchDependencies(pkg.dependencies, '!index!dep', id)
.concat(batchDependencies(pkg.devDependencies, '!index!dev', id))
@@ -28,6 +28,7 @@ function batchDependencies (deps, keyprefix, id) {
var batch = []
Object.keys(deps).forEach(function (name) {
+ name = escape(name)
var key = keyprefix + '!' + name + '!' + id // example: !index!dep!request!zulip@0.1.0
var range = deps[name]
try {
@@ -80,6 +81,7 @@ Db.prototype.query = function (name, range, opts, cb) {
opts = {}
}
+ name = escape(name)
range = semver.Range(range)
var keyprefix = opts.devDependencies ? '!index!dev!' : '!index!dep!' | Escape package names so they don't contain the key separator
E.g. npm packages can contain !
Thanks to Brendan Eich for this fabulous escape function that he added
in the first version of JavaScript :) |
diff --git a/src/Components/CreateDefinition.php b/src/Components/CreateDefinition.php
index <HASH>..<HASH> 100644
--- a/src/Components/CreateDefinition.php
+++ b/src/Components/CreateDefinition.php
@@ -226,7 +226,7 @@ class CreateDefinition extends Component
$parser->error(
__('A symbol name was expected! '
. 'A reserved keyword can not be used '
- . 'as a field name without backquotes.'
+ . 'as a column name without backquotes.'
),
$token
); | In SQL we should use 'column' and not 'field' |
diff --git a/smartcard/test/framework/testcase_Card.py b/smartcard/test/framework/testcase_Card.py
index <HASH>..<HASH> 100755
--- a/smartcard/test/framework/testcase_Card.py
+++ b/smartcard/test/framework/testcase_Card.py
@@ -52,6 +52,16 @@ from smartcard.System import readers
class testcase_Card(unittest.TestCase):
"""Test case for smartcard.Card."""
+ def testcase_CardDictionary(self):
+ """Create a dictionnary with Card keys"""
+ mydict = {}
+ for reader in readers():
+ card = Card(reader, expectedATRinReader[str(reader)])
+ mydict[card] = reader
+
+ for card in mydict.keys():
+ self.assert_(str(card.reader) in expectedReaders)
+
def testcase_Card_FromReaders(self):
"""Create a Card from Readers and test that the response
to SELECT DF_TELECOM has two bytes.""" | Added test case for hashable Card |
diff --git a/outbound/queue.js b/outbound/queue.js
index <HASH>..<HASH> 100644
--- a/outbound/queue.js
+++ b/outbound/queue.js
@@ -57,7 +57,7 @@ exports.list_queue = function (cb) {
exports._stat_file = function (file, cb) {
queue_count++;
- cb();
+ setImmediate(cb);
};
exports.stat_queue = function (cb) {
@@ -194,7 +194,7 @@ exports.load_queue_files = function (pid, cb_name, files, callback) {
logger.logdebug("[outbound] File needs processing later: " + (next_process - self.cur_time) + "ms");
temp_fail_queue.add(next_process - self.cur_time, function () { load_queue.push(file);});
}
- cb();
+ async.setImmediate(cb);
}
else {
self[cb_name](file, cb); | Don't blow the stack on qstat (#<I>)
* Don't blow the stack on qstat
* Should fix another call stack blowing issue |
diff --git a/tests/WidgetTest/DbTest.php b/tests/WidgetTest/DbTest.php
index <HASH>..<HASH> 100644
--- a/tests/WidgetTest/DbTest.php
+++ b/tests/WidgetTest/DbTest.php
@@ -288,9 +288,13 @@ class DbTest extends TestCase
$user = $query->find();
$this->assertEquals("SELECT * FROM users u ORDER BY id ASC", $query->getSQL());
- $this->assertEquals("1", $user->id);
+ $this->assertEquals('1', $user->id);
// addOrder
+ $query = $this->db('users')->orderBy('id', 'ASC')->addOrderBy('group_id', 'ASC');
+ $user = $query->find();
+ $this->assertEquals("SELECT * FROM users u ORDER BY id ASC, group_id ASC", $query->getSQL());
+ $this->assertEquals('1', $user->id);
}
}
\ No newline at end of file | added test for addOrderby method, ref #<I> |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.