diff
stringlengths
65
26.7k
message
stringlengths
7
9.92k
diff --git a/vyper/parser/function_definitions/parse_function.py b/vyper/parser/function_definitions/parse_function.py index <HASH>..<HASH> 100644 --- a/vyper/parser/function_definitions/parse_function.py +++ b/vyper/parser/function_definitions/parse_function.py @@ -1,4 +1,6 @@ -from vyper.parser.context import Constancy, Context +# can't use from [module] import [object] because it breaks mocks in testing +from vyper.parser import context as ctx +from vyper.parser.context import Constancy from vyper.parser.function_definitions.parse_external_function import ( # NOTE black/isort conflict parse_external_function, ) @@ -37,7 +39,7 @@ def parse_function(code, sigs, origcode, global_ctx, is_contract_payable, _vars= # Create a local (per function) context. memory_allocator = MemoryAllocator() - context = Context( + context = ctx.Context( vars=_vars, global_ctx=global_ctx, sigs=sigs,
test: adjust import style to allow mocking
diff --git a/classes/Boom/Model/Page.php b/classes/Boom/Model/Page.php index <HASH>..<HASH> 100644 --- a/classes/Boom/Model/Page.php +++ b/classes/Boom/Model/Page.php @@ -529,7 +529,7 @@ class Boom_Model_Page extends ORM_Taggable $this ->join(array('page_versions', 'version'), 'inner') ->on('page.id', '=', 'version.page_id') - ->join(array('page_versions', 'v2'), 'left outer') + ->join(array('page_versions', 'v2'), 'left') ->on('page.id', '=', 'v2.page_id') ->on('version.id', '<', 'v2.id') ->on('v2.stashed', '=', DB::expr(0))
Fixed page visible_from time not being set when a page is created
diff --git a/html5lib/tests/test_encoding.py b/html5lib/tests/test_encoding.py index <HASH>..<HASH> 100644 --- a/html5lib/tests/test_encoding.py +++ b/html5lib/tests/test_encoding.py @@ -54,8 +54,8 @@ def test_encoding(): try: import chardet def test_chardet(): - data = open(os.path.join(test_dir, "encoding" , "chardet", "test_big5.txt"), "rb").read() - encoding = inputstream.HTMLInputStream(data).charEncoding - assert encoding[0].lower() == "big5" + with open(os.path.join(test_dir, "encoding" , "chardet", "test_big5.txt"), "rb") as fp: + encoding = inputstream.HTMLInputStream(fp.read()).charEncoding + assert encoding[0].lower() == "big5" except ImportError: print("chardet not found, skipping chardet tests")
Fix #<I>: ResourceWarning on test_encoding (test_big5.txt unclosed)
diff --git a/rest_framework_simplejwt/serializers.py b/rest_framework_simplejwt/serializers.py index <HASH>..<HASH> 100644 --- a/rest_framework_simplejwt/serializers.py +++ b/rest_framework_simplejwt/serializers.py @@ -94,6 +94,7 @@ class TokenObtainSlidingSerializer(TokenObtainSerializer): class TokenRefreshSerializer(serializers.Serializer): refresh = serializers.CharField() + access = serializers.ReadOnlyField() def validate(self, attrs): refresh = RefreshToken(attrs['refresh'])
Add ReadOnlyField to TokenRefreshSerializer (#<I>) To make TokenRefreshSerializer be more descriptive, by adding access field as a ReadOnlyField()
diff --git a/pygreen.py b/pygreen.py index <HASH>..<HASH> 100644 --- a/pygreen.py +++ b/pygreen.py @@ -37,7 +37,7 @@ class PyGreen: collection_size=100, ) # A list of regular expression. Files whose the name match - # one of those regular expressions will not be outputed when generating + # one of those regular expressions will not be outputted when generating # a static version of the web site self.file_exclusion = [r".*\.mako", r".*\.py", r"(^|.*\/)\..*"] def is_public(path): @@ -94,7 +94,7 @@ class PyGreen: def get(self, path): """ - Get the content of a file, indentified by its path relative to the folder configured + Get the content of a file, identified by its path relative to the folder configured in PyGreen. If the file extension is one of the extensions that should be processed through Mako, it will be processed. """
docs: Fix a few typos There are small typos in: - pygreen.py Fixes: - Should read `outputted` rather than `outputed`. - Should read `identified` rather than `indentified`.
diff --git a/Legobot/Connectors/IRC.py b/Legobot/Connectors/IRC.py index <HASH>..<HASH> 100644 --- a/Legobot/Connectors/IRC.py +++ b/Legobot/Connectors/IRC.py @@ -4,6 +4,7 @@ import logging import ssl import threading +import logging import time import irc.bot
Update IRC connector to handle newlines in responses
diff --git a/security/MemberAuthenticator.php b/security/MemberAuthenticator.php index <HASH>..<HASH> 100644 --- a/security/MemberAuthenticator.php +++ b/security/MemberAuthenticator.php @@ -30,7 +30,12 @@ class MemberAuthenticator extends Authenticator { * @see Security::setDefaultAdmin() */ public static function authenticate($RAW_data, Form $form = null) { - $SQL_user = Convert::raw2sql($RAW_data['Email']); + if(array_key_exists('Email', $RAW_data) && $RAW_data['Email']){ + $SQL_user = Convert::raw2sql($RAW_data['Email']); + } else { + return false; + } + $isLockedOut = false; $result = null;
MINOR Do a isset check before using the value. This happens if someone accidentially access /Security/LoginForm directly.
diff --git a/cmd/testing/tls_server.go b/cmd/testing/tls_server.go index <HASH>..<HASH> 100644 --- a/cmd/testing/tls_server.go +++ b/cmd/testing/tls_server.go @@ -4,16 +4,25 @@ import ( "bytes" "encoding/pem" "net/http/httptest" + "crypto/x509" ) -func ExtractRootCa(server *httptest.Server) (string, error) { +func ExtractRootCa(server *httptest.Server) (rootCaStr string, err error) { rootCa := new(bytes.Buffer) + + cert, err := x509.ParseCertificate(server.TLS.Certificates[0].Certificate[0]) + if err != nil { + panic(err.Error()) + } + // TODO: Replace above with following on Go 1.9 + //cert := server.Certificate() + block := &pem.Block{ Type: "CERTIFICATE", - Bytes: server.Certificate().Raw, + Bytes: cert.Raw, } - err := pem.Encode(rootCa, block) + err = pem.Encode(rootCa, block) if err != nil { return "", err }
Parse httptest server certificate manually to support go <I>
diff --git a/utils/gerrit2el.py b/utils/gerrit2el.py index <HASH>..<HASH> 100755 --- a/utils/gerrit2el.py +++ b/utils/gerrit2el.py @@ -1,5 +1,28 @@ #!/usr/bin/python # -*- coding: utf-8 -*- +# +# Gerrit reviews loader for Elastic Search +# +# Copyright (C) 2015 Bitergia +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# Authors: +# Alvaro del Castillo San Felix <acs@bitergia.com> +# +# import json import os
Added copyright, license and author.
diff --git a/terraform/context_input_test.go b/terraform/context_input_test.go index <HASH>..<HASH> 100644 --- a/terraform/context_input_test.go +++ b/terraform/context_input_test.go @@ -767,6 +767,15 @@ func TestContext2Input_dataSourceRequiresRefresh(t *testing.T) { p := testProvider("null") m := testModule(t, "input-module-data-vars") + p.GetSchemaReturn = &ProviderSchema{ + DataSources: map[string]*configschema.Block{ + "null_data_source": { + Attributes: map[string]*configschema.Attribute{ + "foo": {Type: cty.List(cty.String), Optional: true}, + }, + }, + }, + } p.ReadDataDiffFn = testDataDiffFn state := &State{
core: Fix TestContext2Input_submoduleTriggersInvalidCount This test now needs to provide a mock schema so its fixture can assign to the "foo" argument in null_data_source.
diff --git a/lib/twitter-ads/account.rb b/lib/twitter-ads/account.rb index <HASH>..<HASH> 100644 --- a/lib/twitter-ads/account.rb +++ b/lib/twitter-ads/account.rb @@ -256,9 +256,8 @@ module TwitterAds # @return [Array] An Array of Tweet objects. # # @since 0.2.3 - def scoped_timeline(ids, opts = {}) - ids = ids.join(',') if ids.is_a?(Array) - params = { user_ids: ids }.merge!(opts) + def scoped_timeline(id, opts = {}) + params = { user_id: id }.merge!(opts) resource = SCOPED_TIMELINE % { id: @id } request = Request.new(client, :get, resource, params: params) response = request.perform
Rename user_ids to user_id in Account#timeline (#<I>) * Rename user_ids to user_id in Account#timeline
diff --git a/lib/airbrake/utils/params_cleaner.rb b/lib/airbrake/utils/params_cleaner.rb index <HASH>..<HASH> 100644 --- a/lib/airbrake/utils/params_cleaner.rb +++ b/lib/airbrake/utils/params_cleaner.rb @@ -106,12 +106,12 @@ module Airbrake data.to_hash.inject({}) do |result, (key, value)| result.merge!(key => clean_unserializable_data(value, stack + [data.object_id])) end - elsif data.respond_to?(:collect!) - data.collect! do |value| + elsif data.respond_to?(:collect) and not data.is_a?(IO) + data = data.collect do |value| clean_unserializable_data(value, stack + [data.object_id]) end elsif data.respond_to?(:to_ary) - data.to_ary.collect! do |value| + data = data.to_ary.collect do |value| clean_unserializable_data(value, stack + [data.object_id]) end elsif data.respond_to?(:to_s)
This should fix #<I> * Don't modify data in place with collect! * Don't try to "collect" over IO objects
diff --git a/Gruntfile.js b/Gruntfile.js index <HASH>..<HASH> 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -76,6 +76,7 @@ module.exports = function (grunt) { port: 3000, livereload: true, middleware: function (connect, options, middlewares) { + middlewares = middlewares || []; return middlewares.concat([ require('connect-livereload')(), // livereload middleware connect.static(options.base), // serve static files
Fixed error when there is no existing middlewares.
diff --git a/pyspectral/radiance_tb_conversion.py b/pyspectral/radiance_tb_conversion.py index <HASH>..<HASH> 100644 --- a/pyspectral/radiance_tb_conversion.py +++ b/pyspectral/radiance_tb_conversion.py @@ -297,7 +297,7 @@ class SeviriRadTbConverter(RadTbConverter): def _get_rsr(self): """Overload the _get_rsr method, since RSR data are ignored here.""" - pass + LOG.debug("RSR data are ignored in this converter!") def radiance2tb(self, rad): """Get the Tb from the radiance using the simple non-linear regression method. diff --git a/pyspectral/tests/test_rad_tb_conversions.py b/pyspectral/tests/test_rad_tb_conversions.py index <HASH>..<HASH> 100644 --- a/pyspectral/tests/test_rad_tb_conversions.py +++ b/pyspectral/tests/test_rad_tb_conversions.py @@ -289,10 +289,6 @@ class TestSeviriConversions(unittest.TestCase): rads2 = retv2['radiance'] self.assertTrue(np.allclose(rads1, rads2)) - def tearDown(self): - """Clean up.""" - pass - class TestRadTbConversions(unittest.TestCase): """Testing the conversions between radiances and brightness temperatures."""
Fix a couple of Codefactor complaints
diff --git a/lib/poolparty.rb b/lib/poolparty.rb index <HASH>..<HASH> 100644 --- a/lib/poolparty.rb +++ b/lib/poolparty.rb @@ -2,8 +2,9 @@ $LOAD_PATH<< File.dirname(__FILE__) # Load required gems #TODO: remove activesupport @required_software = Array.new -%w(rubygems ftools logging resolv digest/sha2 json pp).each do |lib| +%w(rubygems fileutils resolv digest/sha2 json pp logging).each do |lib| begin + NSLog('loading up: ' + lib) require lib rescue Exception => e @required_software << lib
ftools has been replaced with fileutils: <URL>
diff --git a/Gemfile.lock b/Gemfile.lock index <HASH>..<HASH> 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,7 +10,7 @@ GIT PATH remote: . specs: - rsvp (0.1.1) + rsvp (0.1.2) rails (~> 4.0, >= 4.0.2) GEM diff --git a/lib/rsvp/engine.rb b/lib/rsvp/engine.rb index <HASH>..<HASH> 100644 --- a/lib/rsvp/engine.rb +++ b/lib/rsvp/engine.rb @@ -6,6 +6,12 @@ module Rsvp g.test_framework :rspec end + config.to_prepare do + Dir.glob(Rails.root + "app/decorators/**/*_decorator*.rb").each do |c| + require_dependency(c) + end + end + # Add engine db/migrate to paths so migrations run with wrapping application # Inspired by: http://pivotallabs.com/leave-your-migrations-in-your-rails-engines/ initializer :append_migrations do |app| diff --git a/lib/rsvp/version.rb b/lib/rsvp/version.rb index <HASH>..<HASH> 100644 --- a/lib/rsvp/version.rb +++ b/lib/rsvp/version.rb @@ -1,3 +1,3 @@ module Rsvp - VERSION = "0.1.3" + VERSION = "0.1.4" end
Added support for main app decorators.
diff --git a/lib/devise/controllers/helpers.rb b/lib/devise/controllers/helpers.rb index <HASH>..<HASH> 100644 --- a/lib/devise/controllers/helpers.rb +++ b/lib/devise/controllers/helpers.rb @@ -98,7 +98,7 @@ module Devise request.env["devise.allow_params_authentication"] = true end - # The scope root url to be used when he's signed in. By default, it first + # The scope root url to be used when they're signed in. By default, it first # tries to find a resource_root_path, otherwise it uses the root_path. def signed_in_root_path(resource_or_scope) scope = Devise::Mapping.find_scope!(resource_or_scope) diff --git a/lib/devise/models/timeoutable.rb b/lib/devise/models/timeoutable.rb index <HASH>..<HASH> 100644 --- a/lib/devise/models/timeoutable.rb +++ b/lib/devise/models/timeoutable.rb @@ -4,7 +4,7 @@ module Devise module Models # Timeoutable takes care of verifyng whether a user session has already # expired or not. When a session expires after the configured time, the user - # will be asked for credentials again, it means, he/she will be redirected + # will be asked for credentials again, it means, they will be redirected # to the sign in page. # # == Options
Remove a couple more gendered pronouns
diff --git a/driver.js b/driver.js index <HASH>..<HASH> 100644 --- a/driver.js +++ b/driver.js @@ -75,6 +75,11 @@ ee(Object.defineProperties(Driver.prototype, assign({ return this.__close(); }.bind(this)); }), + onDrain: d.gs(function () { + return deferred.map(keys(this._storages), function (name) { + return this[name].onDrain; + }, this._storages); + }), _load: d(function (id, value, stamp) { var proto;
Introduce `onDrain` for driver
diff --git a/src/Ouzo/Tools/Model/Template/Dialect/Dialect.php b/src/Ouzo/Tools/Model/Template/Dialect/Dialect.php index <HASH>..<HASH> 100644 --- a/src/Ouzo/Tools/Model/Template/Dialect/Dialect.php +++ b/src/Ouzo/Tools/Model/Template/Dialect/Dialect.php @@ -31,9 +31,4 @@ class Dialect { return array(); } - - public function columnType($columnName) - { - return $columnName; - } } \ No newline at end of file
Deleted column type from Dialect.
diff --git a/Model/ApiPayload.php b/Model/ApiPayload.php index <HASH>..<HASH> 100644 --- a/Model/ApiPayload.php +++ b/Model/ApiPayload.php @@ -273,7 +273,6 @@ class ApiPayload */ private function setSettings($settings) { - return; if ($settings) { foreach ($this->settings as $key => &$value) { if (!empty($settings->{$key}) && $settings->{$key}) { @@ -405,10 +404,6 @@ class ApiPayload 'api_date' => $this->tokenHelper->getDateFormatHelper()->format(new \DateTime()), ] ); - - if (!empty($this->additionalTokenContext)) { - $this->tokenHelper->addContext($this->additionalTokenContext); - } } /**
[ENG-<I>] Removed return that was set in settings. Removed $additionalTokenContext in prepareTokenHelper
diff --git a/Classes/Indexer/NodeIndexer.php b/Classes/Indexer/NodeIndexer.php index <HASH>..<HASH> 100644 --- a/Classes/Indexer/NodeIndexer.php +++ b/Classes/Indexer/NodeIndexer.php @@ -248,7 +248,9 @@ class NodeIndexer extends AbstractNodeIndexer implements BulkNodeIndexerInterfac $handleNode = function (NodeInterface $node, Context $context) use ($targetWorkspaceName, $indexer) { $nodeFromContext = $context->getNodeByIdentifier($node->getIdentifier()); if ($nodeFromContext instanceof NodeInterface) { - $indexer($nodeFromContext, $targetWorkspaceName); + $this->searchClient->withDimensions(function () use ($indexer, $nodeFromContext, $targetWorkspaceName) { + $indexer($nodeFromContext, $targetWorkspaceName); + }, $nodeFromContext->getContext()->getTargetDimensions()); } else { $documentIdentifier = $this->calculateDocumentIdentifier($node, $targetWorkspaceName); if ($node->isRemoved()) {
TASK: Set the correct dimensions before processing the document
diff --git a/daemon/graphdriver/overlay2/mount.go b/daemon/graphdriver/overlay2/mount.go index <HASH>..<HASH> 100644 --- a/daemon/graphdriver/overlay2/mount.go +++ b/daemon/graphdriver/overlay2/mount.go @@ -32,12 +32,6 @@ type mountOptions struct { } func mountFrom(dir, device, target, mType, label string) error { - - r, w, err := os.Pipe() - if err != nil { - return fmt.Errorf("mountfrom pipe failure: %v", err) - } - options := &mountOptions{ Device: device, Target: target, @@ -47,7 +41,10 @@ func mountFrom(dir, device, target, mType, label string) error { } cmd := reexec.Command("docker-mountfrom", dir) - cmd.Stdin = r + w, err := cmd.StdinPipe() + if err != nil { + return fmt.Errorf("mountfrom error on pipe creation: %v", err) + } output := bytes.NewBuffer(nil) cmd.Stdout = output
overlay2: close read end of pipe on mount exec Use StdinPipe to ensure pipe is properly closed after startup Fixes #<I>
diff --git a/traits/PasswordTrait.php b/traits/PasswordTrait.php index <HASH>..<HASH> 100644 --- a/traits/PasswordTrait.php +++ b/traits/PasswordTrait.php @@ -191,6 +191,8 @@ trait PasswordTrait /** * Set new password. + * If $password is empty, the specilty which represents the empty will be taken. + * Finally, it will trigger `static::$eventAfterSetPassword` event. * @param string $password the new password to be set. */ public function setPassword($password = null) diff --git a/traits/RegistrationTrait.php b/traits/RegistrationTrait.php index <HASH>..<HASH> 100644 --- a/traits/RegistrationTrait.php +++ b/traits/RegistrationTrait.php @@ -113,7 +113,7 @@ trait RegistrationTrait if (!$this->save()) { throw new IntegrityException('Registration Error(s) Occured: User Save Failed.', $this->getErrors()); } - if ($authManager = $this->getAuthManager() && !empty($authRoles)) { + if (($authManager = $this->getAuthManager()) && !empty($authRoles)) { if (is_string($authRoles) || $authRoles instanceof Role || !is_array($authRoles)) { $authRoles = [$authRoles]; }
fix registring with roles bug.
diff --git a/game_data_struct.py b/game_data_struct.py index <HASH>..<HASH> 100644 --- a/game_data_struct.py +++ b/game_data_struct.py @@ -225,6 +225,12 @@ def rotate_game_tick_packet_boost_omitted(game_tick_packet): game_tick_packet.gameball.AngularVelocity.Y = -1 * game_tick_packet.gameball.AngularVelocity.Y game_tick_packet.gameball.Acceleration.X = -1 * game_tick_packet.gameball.Acceleration.X game_tick_packet.gameball.Acceleration.Y = -1 * game_tick_packet.gameball.Acceleration.Y + + # ball touch data + game_tick_packet.gameball.Touch.sHitLocation.X = -1 * game_tick_packet.gameball.Touch.sHitLocation.X + game_tick_packet.gameball.Touch.sHitLocation.Y = -1 * game_tick_packet.gameball.Touch.sHitLocation.Y + game_tick_packet.gameball.Touch.sHitNormal.X = -1 * game_tick_packet.gameball.Touch.sHitNormal.X + game_tick_packet.gameball.Touch.sHitNormal.Y = -1 * game_tick_packet.gameball.Touch.sHitNormal.Y # Rotate Yaw 180 degrees is all that is necessary. ball_yaw = game_tick_packet.gameball.Rotation.Yaw
Added flip code to the ball touch data.
diff --git a/spec/lib/file_reverse_reader_spec.rb b/spec/lib/file_reverse_reader_spec.rb index <HASH>..<HASH> 100644 --- a/spec/lib/file_reverse_reader_spec.rb +++ b/spec/lib/file_reverse_reader_spec.rb @@ -1,3 +1,5 @@ +# coding: utf-8 + require "enumerator" require 'spec_helper'
Add magic comment to spec on Ruby <I>.x
diff --git a/src/components/Editor/ConditionalPanel.js b/src/components/Editor/ConditionalPanel.js index <HASH>..<HASH> 100644 --- a/src/components/Editor/ConditionalPanel.js +++ b/src/components/Editor/ConditionalPanel.js @@ -104,6 +104,13 @@ export class ConditionalPanel extends PureComponent<Props> { } renderToWidget(props: Props) { + if (this.cbPanel) { + if (this.props.line && this.props.line == props.line) { + return props.closeConditionalPanel(); + } + this.clearConditionalPanel(); + } + const { selectedLocation, line, editor } = props; const sourceId = selectedLocation ? selectedLocation.sourceId : "";
Prevent the re-rendering of a conditional breakpoint panel (cbp) when opening a new cbp or removing or disabling an open cbp. (#<I>)
diff --git a/custom/gnap-angular/js/develop/gnap/sidebar.directive.js b/custom/gnap-angular/js/develop/gnap/sidebar.directive.js index <HASH>..<HASH> 100644 --- a/custom/gnap-angular/js/develop/gnap/sidebar.directive.js +++ b/custom/gnap-angular/js/develop/gnap/sidebar.directive.js @@ -24,7 +24,8 @@ restrict: 'A', replace: true, templateUrl: 'template/gnap/sidebar/sidebar.html', - link: link + link: link, + transclude: true }; function link(scope) { @@ -139,6 +140,7 @@ " <div class=\"sidebar-collapse\" id=\"sidebar-collapse\" ng-click=\"toggleCollapsed()\">\n" + " <i ng-class=\"{\'icon-double-angle-left\': !settings.collapsed, \'icon-double-angle-right\': settings.collapsed}\"><\/i>\n" + " <\/div>\n" + + " <div ng-transclude><\/div>\n" + "<\/div>\n" + ""); /* jshint ignore:end */
Allow custom content to be transcluded at bottom of sidebar
diff --git a/boot/boot.go b/boot/boot.go index <HASH>..<HASH> 100644 --- a/boot/boot.go +++ b/boot/boot.go @@ -148,7 +148,7 @@ func (b *Bootstrapper) bootTerraform() error { return err } - help("List the environments you would like (comma separated, e.g.: 'dev, test, prod')") + help("List the environments you would like (comma separated, e.g.: 'stage, prod')") envs := readEnvs(prompt.String(indent(" Environments: "))) fmt.Println()
change list of envs in init example
diff --git a/lib/odata/properties/integer.rb b/lib/odata/properties/integer.rb index <HASH>..<HASH> 100644 --- a/lib/odata/properties/integer.rb +++ b/lib/odata/properties/integer.rb @@ -59,11 +59,11 @@ module OData private def min_value - @min ||= -(2**15) + @min ||= -(2**31) end def max_value - @max ||= (2**15)-1 + @max ||= (2**31)-1 end end
Fixed errant implementation of min and max values in OData::Properties::Int<I>.
diff --git a/src/feat/agents/host/host_agent.py b/src/feat/agents/host/host_agent.py index <HASH>..<HASH> 100644 --- a/src/feat/agents/host/host_agent.py +++ b/src/feat/agents/host/host_agent.py @@ -57,6 +57,16 @@ class HostedPartner(agent.BasePartner): def on_restarted(self, agent): agent.call_next(agent.check_if_agency_hosts, self.recipient) + if self.static_name: + agent.resolve_alert(self.static_name, "Restarted") + + def on_died(self, agent): + if self.static_name: + agent.raise_alert(self.static_name, "Agent died") + + def on_buried(self, agent): + if self.static_name: + agent.raise_alert(self.static_name, "Agent was buried!!") @feat.register_restorator
Host agent raises and resolves alerts when static agents are dying/getting resterted.
diff --git a/eiostream.js b/eiostream.js index <HASH>..<HASH> 100644 --- a/eiostream.js +++ b/eiostream.js @@ -14,8 +14,7 @@ function EngineStream(socket) { // forwarding write stream.write = socket.write.bind(socket) - // circular of request so it can be parsed for cookies, etc. - stream.req = socket.transport.request + stream.transport = socket.transport return stream }
Update eiostream.js
diff --git a/lib/fastlane/actions/ensure_xcode_version.rb b/lib/fastlane/actions/ensure_xcode_version.rb index <HASH>..<HASH> 100644 --- a/lib/fastlane/actions/ensure_xcode_version.rb +++ b/lib/fastlane/actions/ensure_xcode_version.rb @@ -12,7 +12,7 @@ module Fastlane versions_match = selected_version == "Xcode #{required_version}" - raise "Selected Xcode version doesn't match your requirement.\nExpected: Xcode #{required_version}\nActual: #{selected_version}" unless versions_match + raise "Selected Xcode version doesn't match your requirement.\nExpected: Xcode #{required_version}\nActual: #{selected_version}\nTo correct this, use xcode_select." unless versions_match end #####################################################
Mention xcode_select as a way to resolve the mismatch of Xcode versions
diff --git a/app_namespace/tests/tests.py b/app_namespace/tests/tests.py index <HASH>..<HASH> 100644 --- a/app_namespace/tests/tests.py +++ b/app_namespace/tests/tests.py @@ -132,3 +132,27 @@ class LoaderTestCase(TestCase): self.assertTrue(mark in template_namespace) self.assertTrue(mark_title in template_namespace) + + def test_extend_with_super(self): + """ + Here we simulate the existence of a template + named admin/base_site.html on the filesystem + overriding the title markup of the template + with a {{ super }}. + """ + context = Context({}) + mark_ok = '<title> | Django site admin - APP NAMESPACE</title>' + mark_ko = '<title> - APP NAMESPACE</title>' + + template_directory = Template( + '{% extends "admin/base.html" %}' + '{% block title %}{{ block.super }} - APP NAMESPACE{% endblock %}' + ).render(context) + + template_namespace = Template( + '{% extends "admin:admin/base_site.html" %}' + '{% block title %}{{ block.super }} - APP NAMESPACE{% endblock %}' + ).render(context) + + self.assertTrue(mark_ok in template_namespace) + self.assertTrue(mark_ko in template_directory)
Add a test for being sure about the {{ block.super }} behavior
diff --git a/msk/repo_action.py b/msk/repo_action.py index <HASH>..<HASH> 100644 --- a/msk/repo_action.py +++ b/msk/repo_action.py @@ -81,7 +81,7 @@ class SkillData(GlobalContext): default_branch = self.repo_git.symbolic_ref('refs/remotes/origin/HEAD') self.repo_git.reset(default_branch, hard=True) - upgrade_branch = 'upgrade/' + self.name + upgrade_branch = 'upgrade-' + self.name self.repo.checkout_branch(upgrade_branch) if not self.repo.git.diff(skill_module) and self.repo.git.ls_files(skill_module): @@ -106,7 +106,7 @@ class SkillData(GlobalContext): default_branch = self.repo_git.symbolic_ref('refs/remotes/origin/HEAD') self.repo_git.reset(default_branch, hard=True) - branch_name = 'add/' + self.name + branch_name = 'add-' + self.name self.repo.checkout_branch(branch_name) self.repo.git.add(self.name) self.repo.git.commit(message='Add ' + self.name)
Change skill branch naming convention to not use slashes If a branch called either `add` or `upgrade` exists, it will cause errors
diff --git a/mapclassify/classifiers.py b/mapclassify/classifiers.py index <HASH>..<HASH> 100644 --- a/mapclassify/classifiers.py +++ b/mapclassify/classifiers.py @@ -2355,7 +2355,6 @@ class UserDefined(MapClassifier): legend=legend, legend_kwds=legend_kwds, classification_kwds={"bins": self.bins}, # for UserDefined - fmt=fmt, ) if not axis_on: ax.axis("off")
BUG: fmt belongs to legend_kwds, no longer stand-alone
diff --git a/msgpong_test.go b/msgpong_test.go index <HASH>..<HASH> 100644 --- a/msgpong_test.go +++ b/msgpong_test.go @@ -99,7 +99,7 @@ func TestPongBIP0031(t *testing.T) { readmsg := btcwire.NewMsgPong(0) err = readmsg.BtcDecode(&buf, pver) if err == nil { - t.Errorf("decode of MsgPong succeeded when it shouldn't have", + t.Errorf("decode of MsgPong succeeded when it shouldn't have %v", spew.Sdump(buf)) }
Add format specifier in pong test error output. The error message did not have a format specifier even though it was passing an argument to show. Found by go vet.
diff --git a/lib/sprockets/sass_cache_store.rb b/lib/sprockets/sass_cache_store.rb index <HASH>..<HASH> 100644 --- a/lib/sprockets/sass_cache_store.rb +++ b/lib/sprockets/sass_cache_store.rb @@ -9,11 +9,11 @@ module Sprockets end def _store(key, version, sha, contents) - environment.cache_set(key, {:version => version, :sha => sha, :contents => contents}) + environment.cache_set("sass/#{key}", {:version => version, :sha => sha, :contents => contents}) end def _retrieve(key, version, sha) - if obj = environment.cache_get(key) + if obj = environment.cache_get("sass/#{key}") return unless obj[:version] == version return unless obj[:sha] == sha obj[:obj]
Prepend sass/ to key
diff --git a/tools/run_tests/xds_k8s_test_driver/tests/affinity_test.py b/tools/run_tests/xds_k8s_test_driver/tests/affinity_test.py index <HASH>..<HASH> 100644 --- a/tools/run_tests/xds_k8s_test_driver/tests/affinity_test.py +++ b/tools/run_tests/xds_k8s_test_driver/tests/affinity_test.py @@ -45,10 +45,14 @@ class AffinityTest(xds_k8s_testcase.RegularXdsKubernetesTestCase): @staticmethod def is_supported(config: skips.TestConfig) -> bool: - if config.client_lang in (_Lang.CPP | _Lang.GO | _Lang.JAVA | - _Lang.PYTHON): - # Versions prior to v1.40.x don't support Affinity. + if config.client_lang in _Lang.CPP | _Lang.JAVA: return not config.version_lt('v1.40.x') + elif config.client_lang == _Lang.GO: + return not config.version_lt('v1.41.x') + elif config.client_lang == _Lang.PYTHON: + # TODO(https://github.com/grpc/grpc/issues/27430): supported after + # the issue is fixed. + return False return True def test_affinity(self) -> None: # pylint: disable=too-many-statements
[xDS interop] Fix the affinity test support range (#<I>)
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ with open('README') as f: setup( name='Flask-Table', packages=['flask_table'], - version='0.3.0', + version='0.3.1', author='Andrew Plummer', author_email='plummer574@gmail.com', url='https://github.com/plumdog/flask_table',
Bump to version <I>
diff --git a/publishable/config/voyager_dummy.php b/publishable/config/voyager_dummy.php index <HASH>..<HASH> 100644 --- a/publishable/config/voyager_dummy.php +++ b/publishable/config/voyager_dummy.php @@ -42,7 +42,7 @@ return [ */ 'models' => [ - //'namespace' => 'App\\', + //'namespace' => 'App\\Models\\', ], /*
Update voyager_dummy.php (#<I>) default model route while creating bread
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -21,6 +21,7 @@ files = [ 'pyontutils/ilx_utils.py', 'pyontutils/namespaces.py', 'pyontutils/necromancy.py', + 'pyontutils/neurons/__init__.py', 'pyontutils/neurons/core.py', 'pyontutils/neurons/lang.py', 'pyontutils/obo_io.py',
setup.py added missing __init__.py for neurons
diff --git a/src/test/java/com/stripe/StripeTest.java b/src/test/java/com/stripe/StripeTest.java index <HASH>..<HASH> 100644 --- a/src/test/java/com/stripe/StripeTest.java +++ b/src/test/java/com/stripe/StripeTest.java @@ -1286,16 +1286,6 @@ public class StripeTest { assertEquals(transfers.size(), 1); } - @Test(expected=InvalidRequestException.class) - public void testTransferReversalCreate() throws StripeException { - Transfer tr = Transfer.create(getTransferParams()); - Map<String, Object> params = new HashMap<String, Object>(); - TransferReversalCollection reversals = tr.getReversals(); - reversals.create(params); - // post-condition: we expect an InvalidRequestException here (caught by JUnit), - // because in test mode, transfers are automatically sent - } - @Test public void testRecipientCreate() throws StripeException { Recipient recipient = Recipient.create(defaultRecipientParams);
Delete TransferReversalCreate test The test asserted stripe functionality, but the tests should assert that the bindings interact with Stripe correctly.
diff --git a/tests/inttests/lib/KushkiIntTest.php b/tests/inttests/lib/KushkiIntTest.php index <HASH>..<HASH> 100644 --- a/tests/inttests/lib/KushkiIntTest.php +++ b/tests/inttests/lib/KushkiIntTest.php @@ -144,7 +144,7 @@ class KushkiIntTest extends \PHPUnit_Framework_TestCase { $token = $tokenTransaction->getToken(); sleep(CommonUtils::THREAD_SLEEP); $chargeTransaction = $this->newSecretKushki->charge($token, $amount); - $ticket = $chargeTransaction->getTicketNumberApi(); + $ticket = $chargeTransaction->getTicketNumber(); sleep(CommonUtils::THREAD_SLEEP); $voidTransaction = $this->secretKushki->voidCharge($ticket, $amount);
[KV-<I>] Refactor
diff --git a/yfinance/utils.py b/yfinance/utils.py index <HASH>..<HASH> 100644 --- a/yfinance/utils.py +++ b/yfinance/utils.py @@ -44,7 +44,8 @@ def empty_df(index=[]): def get_json(url, proxy=None, session=None): session = session or _requests - html = session.get(url=url, proxies=proxy).text + headers = {'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.95 Safari/537.36'} + html = session.get(url=url, proxies=proxy, headers=headers).text if "QuoteSummaryStore" not in html: html = session.get(url=url, proxies=proxy).text
Add headers to session Add headers to session
diff --git a/plenum/test/waits.py b/plenum/test/waits.py index <HASH>..<HASH> 100644 --- a/plenum/test/waits.py +++ b/plenum/test/waits.py @@ -76,7 +76,7 @@ def expectedPoolInterconnectionTime(nodeCount): # TODO check actual state # multiply by 2 because we need to re-create connections which can be done on a second re-try only # (we may send pings on some of the re-tries) - return min(0.8 * config.TestRunningTimeLimitSec, + return max(0.8 * config.TestRunningTimeLimitSec, interconnectionCount * nodeConnectionTimeout + 2 * config.RETRY_TIMEOUT_RESTRICTED + 2)
[INDY-<I>] Radical increase checkConnected timeout
diff --git a/src/models/Core.js b/src/models/Core.js index <HASH>..<HASH> 100644 --- a/src/models/Core.js +++ b/src/models/Core.js @@ -141,6 +141,10 @@ export class Parameter extends Immutable.Record({ } _inferType(type) { + if (!type) { + return null + } + if (type.match(/double/) || type.match(/float/)) { return 'number' }
fixed a minor bug on type infer
diff --git a/src/editor/index.js b/src/editor/index.js index <HASH>..<HASH> 100644 --- a/src/editor/index.js +++ b/src/editor/index.js @@ -312,6 +312,22 @@ module.exports = config => { }, /** + * Get stylable entity from the selected component. + * If you select the component without classes the entity is the Component + * itself and all changes will go inside its 'style' property. Otherwise, + * if the selected component has one or more classes, the function will + * return the corresponding CSS Rule + * @return {Model} + */ + getSelectedToStyle() { + let selected = em.getSelected(); + + if (selected) { + return this.StyleManager.getModelToStyle(selected); + } + }, + + /** * Set device to the editor. If the device exists it will * change the canvas to the proper width * @return {this}
Add getSelectedToStyle to the editor API
diff --git a/src/main/java/com/klarna/hiverunner/builder/HiveShellBase.java b/src/main/java/com/klarna/hiverunner/builder/HiveShellBase.java index <HASH>..<HASH> 100644 --- a/src/main/java/com/klarna/hiverunner/builder/HiveShellBase.java +++ b/src/main/java/com/klarna/hiverunner/builder/HiveShellBase.java @@ -337,8 +337,8 @@ class HiveShellBase implements HiveShell { hiveServerContainer.getBaseDir().getRoot().getAbsolutePath()); Preconditions.checkArgument(isTargetFileWithinTestDir, - "All resource target files should be created in a subdirectory to the test case basedir : %s", - resource); + "All resource target files should be created in a subdirectory to the test case basedir %s : %s", + hiveServerContainer.getBaseDir().getRoot().getAbsolutePath(), resource.getTargetFile()); } protected final void assertFileExists(Path file) {
Better error message when resource file is outside of test dir
diff --git a/src/k8s/statefulSet.js b/src/k8s/statefulSet.js index <HASH>..<HASH> 100644 --- a/src/k8s/statefulSet.js +++ b/src/k8s/statefulSet.js @@ -66,7 +66,7 @@ function checkStatefulSet (client, namespace, name, outcome, resolve, wait) { }, ms) } -function createStatefulSet (client, statefulSet) { +function createStatefulSet (client, deletes, statefulSet) { const namespace = statefulSet.metadata.namespace || 'default' const name = statefulSet.metadata.name let create = (resolve, reject) =>
fix: added deletes param to createStatefulSet
diff --git a/isort/finders.py b/isort/finders.py index <HASH>..<HASH> 100644 --- a/isort/finders.py +++ b/isort/finders.py @@ -265,7 +265,7 @@ class ReqsBaseFinder(BaseFinder): Flask-RESTFul -> flask_restful """ if self.mapping: - name = self.mapping.get(name, name) + name = self.mapping.get(name.replace("-","_"), name) return name.lower().replace("-", "_") def find(self, module_name: str) -> Optional[str]:
Bug fix for #<I> Bug fix for improper handling of packages with - (dash) in name
diff --git a/core/server/master/src/main/java/alluxio/master/file/FileSystemMasterClientRestServiceHandler.java b/core/server/master/src/main/java/alluxio/master/file/FileSystemMasterClientRestServiceHandler.java index <HASH>..<HASH> 100644 --- a/core/server/master/src/main/java/alluxio/master/file/FileSystemMasterClientRestServiceHandler.java +++ b/core/server/master/src/main/java/alluxio/master/file/FileSystemMasterClientRestServiceHandler.java @@ -415,13 +415,10 @@ public final class FileSystemMasterClientRestServiceHandler { @Path(SCHEDULE_ASYNC_PERSIST) @ReturnType("java.lang.Void") public Response scheduleAsyncPersist(@QueryParam("path") final String path) { - return RestUtils.call(new RestUtils.RestCallable<Void>() { - @Override - public Void call() throws Exception { - Preconditions.checkNotNull(path, "required 'path' parameter is missing"); - mFileSystemMaster.scheduleAsyncPersistence(new AlluxioURI(path)); - return null; - } + return RestUtils.call((RestUtils.RestCallable<Void>) () -> { + Preconditions.checkNotNull(path, "required 'path' parameter is missing"); + mFileSystemMaster.scheduleAsyncPersistence(new AlluxioURI(path)); + return null; }); }
replace anonymous type with lambda (#<I>)
diff --git a/basic_auth.go b/basic_auth.go index <HASH>..<HASH> 100644 --- a/basic_auth.go +++ b/basic_auth.go @@ -53,9 +53,9 @@ func (b *basicAuth) authenticate(r *http.Request) bool { return false } - // In simple mode, prevent authentication with empty credentials if User or - // Password is not set. - if b.opts.AuthFunc == nil && (b.opts.User == "" || b.opts.Password == "") { + // In simple mode, prevent authentication with empty credentials if User is + // not set. Allow empty passwords to support non-password use-cases. + if b.opts.AuthFunc == nil && b.opts.User == "" { return false }
[bugfix] Allow empty passwords again. Reverts part of <I>e9a2b<I>.
diff --git a/syntax/tokens.go b/syntax/tokens.go index <HASH>..<HASH> 100644 --- a/syntax/tokens.go +++ b/syntax/tokens.go @@ -318,8 +318,8 @@ const ( TsGtr AndTest = BinTestOperator(andAnd) OrTest = BinTestOperator(orOr) - // TODO(mvdan): == is a pattern match, not a comparison; use a - // more appropriate name like TsMatch in 2.0 + // TODO(mvdan): == and != are pattern matches; use more + // appropriate names like TsMatch and TsNoMatch in 2.0 TsEqual = BinTestOperator(equal) TsNequal = BinTestOperator(nequal) TsBefore = BinTestOperator(rdrIn)
syntax: TsEqual TODO for <I> also affects TsNequal
diff --git a/src/Psalm/Checker/Statements/Expression/AssignmentChecker.php b/src/Psalm/Checker/Statements/Expression/AssignmentChecker.php index <HASH>..<HASH> 100644 --- a/src/Psalm/Checker/Statements/Expression/AssignmentChecker.php +++ b/src/Psalm/Checker/Statements/Expression/AssignmentChecker.php @@ -404,6 +404,10 @@ class AssignmentChecker )) { return false; } + + $context->vars_in_scope[$var_id] = Type::getMixed(); + + return Type::getMixed(); } return $assign_value_type;
Void return types shouldn’t magically become null ones
diff --git a/interfaces/HtmlRequestInterface.php b/interfaces/HtmlRequestInterface.php index <HASH>..<HASH> 100644 --- a/interfaces/HtmlRequestInterface.php +++ b/interfaces/HtmlRequestInterface.php @@ -93,7 +93,7 @@ interface HtmlRequestInterface extends LogAwareObjectInterface{ * Redirect to generated internal URL; * @return null */ - public function goToPage($controller, $action = null, $params = array()); + public function goToPage($controller, $action = null, $params = array(), $module = null); /** * Reload current page diff --git a/web/Controller.php b/web/Controller.php index <HASH>..<HASH> 100644 --- a/web/Controller.php +++ b/web/Controller.php @@ -218,10 +218,11 @@ class Controller extends LogAwareObject { * @param string $controller Controller name where it must be redirected * @param string $action Action name where it must be redirected. Index is the default selected action * @param array $params Optional a list of params can be added also + * @param string $module Optional a different module * @return bool */ - public function goToPage($controller, $action = 'index', $params = []) { - return $this->request->goToPage($controller, $action, $params); + public function goToPage($controller, $action = 'index', $params = [], $module = null) { + return $this->request->goToPage($controller, $action, $params, $module); } /**
Fix request intereface and controller to allow module select on page redirect.
diff --git a/lib/nrser/core_ext/hash.rb b/lib/nrser/core_ext/hash.rb index <HASH>..<HASH> 100644 --- a/lib/nrser/core_ext/hash.rb +++ b/lib/nrser/core_ext/hash.rb @@ -19,6 +19,9 @@ class Hash def str_keys! *args, &block; stringify_keys! *args, &block; end def str_keys *args, &block; stringify_keys *args, &block; end + def to_options! *args, &block; symbolize_keys! *args, &block; end + def to_options *args, &block; symbolize_keys *args, &block; end + # See {NRSER.bury!} def bury! key_path,
Fix {Hash#to_options} method alias (ActiveSupport's fault this time)
diff --git a/EventListener/DisallowedExtensionValidationListener.php b/EventListener/DisallowedExtensionValidationListener.php index <HASH>..<HASH> 100644 --- a/EventListener/DisallowedExtensionValidationListener.php +++ b/EventListener/DisallowedExtensionValidationListener.php @@ -18,4 +18,4 @@ class DisallowedExtensionValidationListener throw new ValidationException('error.blacklist'); } } -} \ No newline at end of file +}
Added newline in ValidationListener.
diff --git a/server/server_test.go b/server/server_test.go index <HASH>..<HASH> 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -104,7 +104,8 @@ func RunServerWithConfig(configFile string) (srv *Server, opts *Options) { func TestVersionMatchesTag(t *testing.T) { tag := os.Getenv("TRAVIS_TAG") - if tag == "" { + // Travis started to return '' when no tag is set. Support both now. + if tag == "" || tag == "''" { t.SkipNow() } // We expect a tag of the form vX.Y.Z. If that's not the case,
Fixed TestVersionMatchesTag test When no tag was set, os.Getenv("TRAVIS_TAG") would return empty string. Travis now set TRAVIS_TAG to `''`. So check for both.
diff --git a/src/main/java/com/lazerycode/jmeter/testrunner/TestManager.java b/src/main/java/com/lazerycode/jmeter/testrunner/TestManager.java index <HASH>..<HASH> 100644 --- a/src/main/java/com/lazerycode/jmeter/testrunner/TestManager.java +++ b/src/main/java/com/lazerycode/jmeter/testrunner/TestManager.java @@ -94,6 +94,7 @@ public class TestManager { for (String file : tests) { if(generateReports) { File outputReportFolder = new File(reportDirectory+File.separator+ FilenameUtils.removeExtension(file)); + LOGGER.info("Will generate HTML report in {}", outputReportFolder.getAbsolutePath()); if(outputReportFolder.mkdirs()) { thisTestArgs.setReportsDirectory(outputReportFolder.getAbsolutePath()); } else {
Remove date_time suffix from path when generating html report Add logging This closes #<I>
diff --git a/lib/gcli/ui/inputter.js b/lib/gcli/ui/inputter.js index <HASH>..<HASH> 100644 --- a/lib/gcli/ui/inputter.js +++ b/lib/gcli/ui/inputter.js @@ -355,6 +355,9 @@ Inputter.prototype.onKeyUp = function(ev) { this._caretChange = Caret.TO_ARG_END; var inputState = this.getInputState(); this._processCaretChange(inputState); + if (this._choice == null) { + this._choice = 0; + } this.requisition.complete(inputState.cursor, this._choice); } this.lastTabDownAt = 0;
Bug <I> (updown): Prevent completion error this._choice == null is valid, but not when we want to complete the default choice.
diff --git a/src/Pool.php b/src/Pool.php index <HASH>..<HASH> 100644 --- a/src/Pool.php +++ b/src/Pool.php @@ -52,9 +52,9 @@ class Pool implements FutureInterface private $isRealized = false; /** - * The option values for 'before', 'after', and 'error' can be a callable, - * an associative array containing event data, or an array of event data - * arrays. Event data arrays contain the following keys: + * The option values for 'before', 'complete', 'error' and 'end' can be a + * callable, an associative array containing event data, or an array of + * event data arrays. Event data arrays contain the following keys: * * - fn: callable to invoke that receives the event * - priority: Optional event priority (defaults to 0) @@ -65,8 +65,9 @@ class Pool implements FutureInterface * @param array $options Associative array of options * - pool_size: (int) Maximum number of requests to send concurrently * - before: (callable|array) Receives a BeforeEvent - * - after: (callable|array) Receives a CompleteEvent + * - complete: (callable|array) Receives a CompleteEvent * - error: (callable|array) Receives a ErrorEvent + * - end: (callable|array) Receives an EndEvent */ public function __construct( ClientInterface $client,
Corrects event docs for Pool constructor. * Changes "after" to "complete" * Adds missing "end" event
diff --git a/regions/shapes/__init__.py b/regions/shapes/__init__.py index <HASH>..<HASH> 100644 --- a/regions/shapes/__init__.py +++ b/regions/shapes/__init__.py @@ -3,5 +3,6 @@ """ from .circle import * from .ellipse import * +from .point import * from .polygon import * from .rectangle import *
Add missing include for point.py
diff --git a/src/share/classes/com/sun/source/util/AbstractTypeProcessor.java b/src/share/classes/com/sun/source/util/AbstractTypeProcessor.java index <HASH>..<HASH> 100644 --- a/src/share/classes/com/sun/source/util/AbstractTypeProcessor.java +++ b/src/share/classes/com/sun/source/util/AbstractTypeProcessor.java @@ -208,6 +208,9 @@ public abstract class AbstractTypeProcessor extends AbstractProcessor { TreePath p = Trees.instance(env).getPath(elem); typeProcess(elem, p); + + // report errors accumulated during type checking + log.reportDeferredDiagnostics(); if (!hasInvokedTypeProcessingOver && elements.isEmpty() && log.nerrors == 0) { typeProcessingOver();
Undo the previous commit. The reportDeferredDiagnostics is actually necessary to report the additional errors found by the type checkers.
diff --git a/src/Parser.php b/src/Parser.php index <HASH>..<HASH> 100644 --- a/src/Parser.php +++ b/src/Parser.php @@ -60,6 +60,10 @@ class Parser { { case 'curl': $this->c->get($url); + if(isset($this->c->error_code) && !empty($this->c->error_code)) + { + return false; + } $responce=$this->c->response; break; case 'file':
get returns fail when response code diferent from <I>
diff --git a/python/sparknlp/embeddings.py b/python/sparknlp/embeddings.py index <HASH>..<HASH> 100644 --- a/python/sparknlp/embeddings.py +++ b/python/sparknlp/embeddings.py @@ -7,6 +7,12 @@ import threading import time import sparknlp.pretrained as _pretrained + +# DONT REMOVE THIS IMPORT +from sparknlp.annotator import WordEmbeddingsModel +#### + + class Embeddings: def __init__(self, embeddings): self.jembeddings = embeddings
[skip travis] import word embedding models as embeddings for jvm compatibility
diff --git a/scapy.py b/scapy.py index <HASH>..<HASH> 100755 --- a/scapy.py +++ b/scapy.py @@ -3611,10 +3611,15 @@ class Packet(Gen): return f[attr] return self.payload.getfieldval(attr) + def getfield_and_val(self, attr): + for f in self.fields, self.overloaded_fields, self.default_fields: + if f.has_key(attr): + return self.fieldtype.get(attr),f[attr] + return self.payload.getfield_and_val(attr) + def __getattr__(self, attr): if self.initialized: - v = self.getfieldval(attr) - fld = self.fieldtype.get(attr,None) + fld,v = self.getfield_and_val(attr) if fld is not None: return fld.i2h(self, v) return v @@ -4395,6 +4400,8 @@ class NoPayload(Packet,object): return "",[] def getfieldval(self, attr): raise AttributeError(attr) + def getfield_and_val(self, attr): + raise AttributeError(attr) def __getattr__(self, attr): if attr in self.__dict__: return self.__dict__[attr]
Fixed bug in Packet.__getattr__() The search for the field value was done recursively while the field object search was only local. This prevented i2h() to be called when the asked field was not in the first layer.
diff --git a/packages/material-ui/src/Table/Table.js b/packages/material-ui/src/Table/Table.js index <HASH>..<HASH> 100644 --- a/packages/material-ui/src/Table/Table.js +++ b/packages/material-ui/src/Table/Table.js @@ -10,7 +10,6 @@ export const styles = theme => ({ width: '100%', borderCollapse: 'collapse', borderSpacing: 0, - overflow: 'hidden', }, });
[Table] Remove overflow (#<I>) The overflow hidden style is preventing the sticky position to work. I can't think of a good motivation for having this style by default. Let's remove it.
diff --git a/src/array/concatMap.js b/src/array/concatMap.js index <HASH>..<HASH> 100644 --- a/src/array/concatMap.js +++ b/src/array/concatMap.js @@ -11,6 +11,7 @@ import curry from '../function/curry' * @return {Array} A newly created array of the concated values * @example * concatMap(x => [x, x], [1, 2, 3]) // => [1, 1, 2, 2, 3, 3] + * concatMap(x => x, [[1, 2], [3, 4], [5, 6]]) // => [1, 2, 3, 4, 5, 6] * * // It's also curried * diff --git a/tests/array/concatMap.js b/tests/array/concatMap.js index <HASH>..<HASH> 100644 --- a/tests/array/concatMap.js +++ b/tests/array/concatMap.js @@ -8,6 +8,13 @@ test('concatMap -- Apples function to values and merges arrays', t => { t.end() }) +test('concatMap -- Shrinks the array', t => { + const results = concatMap(x => x, [[1, 2], [3, 4], [5, 6]]) + + t.same(results, [1, 2, 3, 4, 5, 6]) + t.end() +}) + test('concatMap -- Is properly curried', t => { const con = concatMap(x => [x, x])
Upgraded concatMaps tests/docs
diff --git a/spec/ruby-lint/file_scanner_spec.rb b/spec/ruby-lint/file_scanner_spec.rb index <HASH>..<HASH> 100644 --- a/spec/ruby-lint/file_scanner_spec.rb +++ b/spec/ruby-lint/file_scanner_spec.rb @@ -23,6 +23,12 @@ describe RubyLint::FileScanner do scanner.directories.include?(app).should == false end + example 'glob Ruby source files in a single directory' do + scanner = RubyLint::FileScanner.new([@lib_dir]) + + scanner.glob_ruby_files.empty?.should == false + end + example 'glob Ruby source files in multiple directories' do scanner = RubyLint::FileScanner.new([@lib_dir, @rails_dir])
Test for globbing files in a single directory.
diff --git a/src/PatternLab/InstallerUtil.php b/src/PatternLab/InstallerUtil.php index <HASH>..<HASH> 100644 --- a/src/PatternLab/InstallerUtil.php +++ b/src/PatternLab/InstallerUtil.php @@ -503,9 +503,13 @@ class InstallerUtil { // see if the package has a listener self::scanForListener($pathBase); - // see if the package is a pattern engine + // address other specific needs based on type if ($type == "patternlab-patternengine") { self::scanForPatternEngineRule($pathBase); + } else if ($type == "patternlab-starterkit") { + Config::updateConfigOption("starterKit",$name); + } else if ($type == "patternlab-styleguidekit") { + Config::updateConfigOption("styleguideKit",$name); } }
handle setting needed config options based upon package type
diff --git a/cohorts/plot.py b/cohorts/plot.py index <HASH>..<HASH> 100644 --- a/cohorts/plot.py +++ b/cohorts/plot.py @@ -18,7 +18,7 @@ from scipy.stats import mannwhitneyu, fisher_exact import seaborn as sb import pandas as pd -def stripboxplot(x, y, data): +def stripboxplot(x, y, data, **kwargs): """ Overlay a stripplot on top of a boxplot. """ @@ -31,10 +31,11 @@ def stripboxplot(x, y, data): sb.stripplot( x=x, y=y, - jitter=0.05, - color=".3", data=data, - ax=ax + ax=ax, + jitter=kwargs.pop("jitter", 0.05), + color=kwargs.pop("color", "0.3"), + **kwargs ) def fishers_exact_plot(data, condition1, condition2):
Allow for custom jitter/etc. in stripboxplot
diff --git a/pyghmi/util/webclient.py b/pyghmi/util/webclient.py index <HASH>..<HASH> 100644 --- a/pyghmi/util/webclient.py +++ b/pyghmi/util/webclient.py @@ -162,7 +162,7 @@ class SecureHTTPConnection(httplib.HTTPConnection, object): def grab_json_response(self, url, data=None, referer=None, headers=None): self.lastjsonerror = None - body, status = self.grab_json_response_with_status(self, url, data, referer, headers) + body, status = self.grab_json_response_with_status(url, data, referer, headers) if status == 200: return body self.lastjsonerror = body
Correct mistake with refactoring JSON calls The arguments were incorrect. Change-Id: If<I>c6d<I>b<I>bf<I>b<I>a<I>ad<I>de<I>
diff --git a/ChildNode/replaceWith.js b/ChildNode/replaceWith.js index <HASH>..<HASH> 100644 --- a/ChildNode/replaceWith.js +++ b/ChildNode/replaceWith.js @@ -15,7 +15,7 @@ function ReplaceWith(Ele) { } parent.insertBefore(this.previousSibling, arguments[i]); } - if (firstIsNode) parent.replaceChild(this, Ele); + if (firstIsNode) parent.replaceChild(Ele, this); } if (!Element.prototype.replaceWith) Element.prototype.replaceWith = ReplaceWith;
Fixes issue with replaceWith, it was replacing in reverse
diff --git a/src/structures/Message.js b/src/structures/Message.js index <HASH>..<HASH> 100644 --- a/src/structures/Message.js +++ b/src/structures/Message.js @@ -159,7 +159,7 @@ class Message { const clone = Util.cloneObject(this); this._edits.unshift(clone); - this.editedTimestamp = data.edited_timestamp; + this.editedTimestamp = new Date(data.edited_timestamp).getTime(); if ('content' in data) this.content = data.content; if ('pinned' in data) this.pinned = data.pinned; if ('tts' in data) this.tts = data.tts;
Message.editedTimestamp should be a number (#<I>)
diff --git a/devices/titan_products.js b/devices/titan_products.js index <HASH>..<HASH> 100644 --- a/devices/titan_products.js +++ b/devices/titan_products.js @@ -10,11 +10,12 @@ module.exports = [ vendor: 'Titan Products', description: 'Room CO2, humidity & temperature sensor', fromZigbee: [fz.battery, fz.humidity, fz.temperature, fz.co2], - exposes: [e.battery(), e.humidity(), e.temperature(), e.co2()], + exposes: [e.battery_voltage(), e.humidity(), e.temperature(), e.co2()], toZigbee: [], configure: async (device, coordinatorEndpoint, logger) => { const endpoint = device.getEndpoint(1); await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg', 'msTemperatureMeasurement', 'msCO2']); + await endpoint.read('genPowerCfg', ['batteryVoltage']); await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['msRelativeHumidity']); }, },
Fix TPZRCO2HT-Z3 battery reporting (#<I>) Koenkk/zigbee2mqtt#<I>
diff --git a/cid.go b/cid.go index <HASH>..<HASH> 100644 --- a/cid.go +++ b/cid.go @@ -404,10 +404,15 @@ func (c *Cid) UnmarshalJSON(b []byte) error { obj := struct { CidTarget string `json:"/"` }{} - err := json.Unmarshal(b, &obj) + objptr := &obj + err := json.Unmarshal(b, &objptr) if err != nil { return err } + if objptr == nil { + *c = Cid{} + return nil + } if obj.CidTarget == "" { return fmt.Errorf("cid was incorrectly formatted") @@ -430,6 +435,9 @@ func (c *Cid) UnmarshalJSON(b []byte) error { // Note that this formatting comes from the IPLD specification // (https://github.com/ipld/specs/tree/master/ipld) func (c Cid) MarshalJSON() ([]byte, error) { + if !c.Defined() { + return []byte("null"), nil + } return []byte(fmt.Sprintf("{\"/\":\"%s\"}", c.String())), nil }
Handel undefined Cid is JSON representation.
diff --git a/fixsvgstack.jquery.js b/fixsvgstack.jquery.js index <HASH>..<HASH> 100644 --- a/fixsvgstack.jquery.js +++ b/fixsvgstack.jquery.js @@ -6,7 +6,7 @@ // The fix is for webkit browsers only // [https://bugs.webkit.org/show_bug.cgi?id=91790]() - if(!$.browser.webkit) { + if(!(/WebKit/.test(navigator.userAgent))) { // return functions that do nothing but support chaining $.fn.fixSVGStack = function() { return this; }; $.fn.fixSVGStackBackground = function() { return this; };
compatibility with jQuery <I> $.browser was removed from jquery in <I> - as this fix is for webkit browsers only there is no chance to use $.support
diff --git a/core-bundle/src/Resources/contao/classes/Backend.php b/core-bundle/src/Resources/contao/classes/Backend.php index <HASH>..<HASH> 100644 --- a/core-bundle/src/Resources/contao/classes/Backend.php +++ b/core-bundle/src/Resources/contao/classes/Backend.php @@ -347,7 +347,11 @@ abstract class Backend extends Controller } \define('CURRENT_ID', (Input::get('table') ? $id : Input::get('id'))); - $this->Template->headline = $GLOBALS['TL_LANG']['MOD'][$module][0]; + + if (isset($GLOBALS['TL_LANG']['MOD'][$module][0])) + { + $this->Template->headline = $GLOBALS['TL_LANG']['MOD'][$module][0]; + } // Add the module style sheet if (isset($arrModule['stylesheet']))
Fix another E_WARNING issue (see #<I>) Description ----------- We should maybe keep this PR open and see what else we find. 😄 Commits ------- a<I>af<I> Fix another E_WARNING issue
diff --git a/spec/unit/sql/postgres_spec.rb b/spec/unit/sql/postgres_spec.rb index <HASH>..<HASH> 100644 --- a/spec/unit/sql/postgres_spec.rb +++ b/spec/unit/sql/postgres_spec.rb @@ -19,7 +19,7 @@ describe "Postgres Extensions" do end it 'should create a table object from the name' do - table = mock('SQLite3 Table') + table = mock('Postgres Table') SQL::Postgres::Table.should_receive(:new).with(@pe, 'users').and_return(table) @pe.table('users').should == table @@ -46,7 +46,7 @@ describe "Postgres Extensions" do SQL::Postgres::Table.new(@adapter, 'users') end - it 'should create SQLite3 Column objects from the returned column structs' do + it 'should create Postgres Column objects from the returned column structs' do SQL::Postgres::Column.should_receive(:new).with(@cs1).and_return(@col1) SQL::Postgres::Column.should_receive(:new).with(@cs2).and_return(@col2) SQL::Postgres::Table.new(@adapter, 'users')
Get rid of SQLite3 mentions int the postgres specs
diff --git a/admin/cli/install.php b/admin/cli/install.php index <HASH>..<HASH> 100644 --- a/admin/cli/install.php +++ b/admin/cli/install.php @@ -164,6 +164,7 @@ require_once($CFG->libdir.'/moodlelib.php'); require_once($CFG->libdir.'/deprecatedlib.php'); require_once($CFG->libdir.'/adminlib.php'); require_once($CFG->libdir.'/componentlib.class.php'); +require_once($CFG->dirroot.'/cache/lib.php'); require($CFG->dirroot.'/version.php'); $CFG->target_release = $release; diff --git a/lib/moodlelib.php b/lib/moodlelib.php index <HASH>..<HASH> 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -7030,9 +7030,6 @@ class core_string_manager implements string_manager { */ public function get_revision() { global $CFG; - if (!$this->usediskcache) { - return -1; - } if (isset($CFG->langrev)) { return (int)$CFG->langrev; } else {
MDL-<I> cache: Added missing include and fixed old lang manager setting
diff --git a/tests/test.attachments.js b/tests/test.attachments.js index <HASH>..<HASH> 100644 --- a/tests/test.attachments.js +++ b/tests/test.attachments.js @@ -119,11 +119,10 @@ adapters.map(function(adapter) { }); asyncTest("Testing with invalid docs", function() { - var invalidDoc = {'_id': '_invalid', foo: "bar"}; + var invalidDoc = {'_id': '_invalid', foo: 'bar'}; initTestDB(this.name, function(err, db) { - db.bulkDocs({docs: [invalidDoc, binAttDoc]}, function (err, info) { - ok(info[0].error, 'first doc is invalid'); - ok(info[1].ok, 'second doc is valid'); + db.bulkDocs({docs: [invalidDoc, binAttDoc]}, function(err, info) { + ok(err, 'bad request'); start(); }); });
(#<I>) - Use Blobs for attachments: update Test Update test saving an attachment together with an invalid doc. Now receives error.
diff --git a/lib/custom/tests/MW/View/Engine/TwigTest.php b/lib/custom/tests/MW/View/Engine/TwigTest.php index <HASH>..<HASH> 100644 --- a/lib/custom/tests/MW/View/Engine/TwigTest.php +++ b/lib/custom/tests/MW/View/Engine/TwigTest.php @@ -21,7 +21,7 @@ class TwigTest extends \PHPUnit\Framework\TestCase } $this->mock = $this->getMockBuilder( '\Twig_Environment' ) - ->setMethods( array( 'getLoader', 'loadTemplate' ) ) + ->setMethods( array( 'getExtensions', 'getLoader', 'loadTemplate' ) ) ->disableOriginalConstructor() ->getMock(); @@ -39,6 +39,10 @@ class TwigTest extends \PHPUnit\Framework\TestCase { $v = new \Aimeos\MW\View\Standard( [] ); + $this->mock->expects( $this->once() )->method( 'getExtensions' ) + ->will( $this->returnValue( array( [] ) ) ); + + $view = $this->getMockBuilder( '\Twig_Template' ) ->setConstructorArgs( array ( $this->mock ) ) ->setMethods( array( 'getBlockNames', 'render', 'renderBlock' ) )
Adapt tests for new Twig versions
diff --git a/src/drivers/webextension/js/inject.js b/src/drivers/webextension/js/inject.js index <HASH>..<HASH> 100644 --- a/src/drivers/webextension/js/inject.js +++ b/src/drivers/webextension/js/inject.js @@ -19,7 +19,7 @@ .split('.') .reduce( (value, method) => - value && value.hasOwnProperty(method) + value && value instanceof Object && value.hasOwnProperty(method) ? value[method] : undefined, window
Fix error in console need to check type before call hasOwnProperty Look at this <URL>
diff --git a/python/ray/tests/py3_test.py b/python/ray/tests/py3_test.py index <HASH>..<HASH> 100644 --- a/python/ray/tests/py3_test.py +++ b/python/ray/tests/py3_test.py @@ -96,6 +96,7 @@ def test_args_intertwined(ray_start_regular): test_function(local_method, actor_method) ray.get(remote_test_function.remote(local_method, actor_method)) + def test_asyncio_actor(ray_start_regular): @ray.remote class AsyncBatcher(object): diff --git a/python/ray/tests/test_actor.py b/python/ray/tests/test_actor.py index <HASH>..<HASH> 100644 --- a/python/ray/tests/test_actor.py +++ b/python/ray/tests/test_actor.py @@ -2853,4 +2853,3 @@ ray.get(actor.ping.remote()) run_string_as_driver(driver_script) detached_actor = ray.experimental.get_actor(actor_name) assert ray.get(detached_actor.ping.remote()) == "pong" -
[hotfix] fix lint (#<I>)
diff --git a/src/runtime.js b/src/runtime.js index <HASH>..<HASH> 100644 --- a/src/runtime.js +++ b/src/runtime.js @@ -207,7 +207,7 @@ function suppressValue(val, autoescape) { val = (val !== undefined && val !== null) ? val : ''; if(autoescape && !(val instanceof SafeString)) { - val = lib.escape(''+val); + val = lib.escape(val.toString()); } return val;
use toString instead of shorthand casting
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/inject/MoreThanOneScopeAnnotationOnClass.java b/core/src/main/java/com/google/errorprone/bugpatterns/inject/MoreThanOneScopeAnnotationOnClass.java index <HASH>..<HASH> 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/inject/MoreThanOneScopeAnnotationOnClass.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/inject/MoreThanOneScopeAnnotationOnClass.java @@ -43,6 +43,7 @@ import java.util.List; */ @BugPattern( name = "InjectMoreThanOneScopeAnnotationOnClass", + altNames = "MoreThanOneScopeAnnotationOnClass", summary = "A class can be annotated with at most one scope annotation.", explanation = "Annotating a class with more than one scope annotation is "
Allow MoreThanOneScopeAnnotationOnClass as an alternate name to address InjectMoreThanOneScopeAnnotationOnClass. MOE_MIGRATED_REVID=<I>
diff --git a/kie-api/src/main/java/org/kie/api/KieServices.java b/kie-api/src/main/java/org/kie/api/KieServices.java index <HASH>..<HASH> 100644 --- a/kie-api/src/main/java/org/kie/api/KieServices.java +++ b/kie-api/src/main/java/org/kie/api/KieServices.java @@ -27,6 +27,7 @@ import org.kie.api.io.KieResources; import org.kie.api.logger.KieLoggers; import org.kie.api.marshalling.KieMarshallers; import org.kie.api.persistence.jpa.KieStoreServices; +import org.kie.api.runtime.Environment; import org.kie.api.runtime.KieContainer; import org.kie.api.runtime.KieSessionConfiguration; @@ -141,6 +142,14 @@ public interface KieServices { KieSessionConfiguration newKieSessionConfiguration(Properties properties); /** + * Instantiate and return an Environment + * + * @return + * The Environment + */ + Environment newEnvironment(); + + /** * A Factory for this KieServices */ public static class Factory {
allow to create a new Environment from KieServices
diff --git a/tooling/vis/cfg-visualization.js b/tooling/vis/cfg-visualization.js index <HASH>..<HASH> 100644 --- a/tooling/vis/cfg-visualization.js +++ b/tooling/vis/cfg-visualization.js @@ -40,10 +40,10 @@ network.destroy(); } - var visGraph = generateNodesAndEdges(controlFlowGraph); - network = new vis.Network(container, visGraph, visualizationOptions); - - return network; + setTimeout(function() { + var visGraph = generateNodesAndEdges(controlFlowGraph); + network = new vis.Network(container, visGraph, visualizationOptions); + }, 0); } function generateNodesAndEdges(cfg) {
Resolves a timing problem with destroying the visjs network graph
diff --git a/test/reader_test.rb b/test/reader_test.rb index <HASH>..<HASH> 100644 --- a/test/reader_test.rb +++ b/test/reader_test.rb @@ -303,7 +303,7 @@ class ReaderTest < Minitest::Test def test_read_after_close reader = Reader.new(fixture("valid/valid_mono_pcm_16_44100.wav")) - buffer = reader.read(1024) + reader.read(1024) reader.close assert_raises(IOError) { reader.read(1024) } end
Avoiding unnecessary variable assignment to avoid warning
diff --git a/python/ray/serve/utils.py b/python/ray/serve/utils.py index <HASH>..<HASH> 100644 --- a/python/ray/serve/utils.py +++ b/python/ray/serve/utils.py @@ -399,7 +399,10 @@ class MockImportedBackend: } for _ in range(len(batch))] async def other_method(self, batch): - return [await request.body() for request in batch] + responses = [] + for request in batch: + responses.append(await request.body()) + return responses def compute_iterable_delta(old: Iterable,
[Hotfix] Lint (#<I>)
diff --git a/fft/fft.go b/fft/fft.go index <HASH>..<HASH> 100644 --- a/fft/fft.go +++ b/fft/fft.go @@ -195,9 +195,11 @@ func radix2FFT(x []complex128) []complex128 { for n := 0; n < blocks; n++ { nb := n * stage for j := 0; j < s_2; j++ { - w_n := r[j+nb+s_2] * factors[blocks*j] - t[j+nb] = r[j+nb] + w_n - t[j+nb+s_2] = r[j+nb] - w_n + idx := j + nb + idx2 := idx + s_2 + w_n := r[idx2] * factors[blocks*j] + t[idx] = r[idx] + w_n + t[idx2] = r[idx] - w_n } } }
Only compute indexes once - small speedup
diff --git a/molgenis-omx-protocolviewer/src/main/webapp/js/protocolviewer.js b/molgenis-omx-protocolviewer/src/main/webapp/js/protocolviewer.js index <HASH>..<HASH> 100644 --- a/molgenis-omx-protocolviewer/src/main/webapp/js/protocolviewer.js +++ b/molgenis-omx-protocolviewer/src/main/webapp/js/protocolviewer.js @@ -161,7 +161,8 @@ function checkExistenceOfAllSubNodes(node) { } function retrieveNodeInfo(node, recursive, options) { - $('#spinner').modal('show'); + if(recursive) + $('#spinner').modal('show'); $ .ajax({ url : 'molgenis.do?__target=ProtocolViewer&__action=download_json_getprotocol', @@ -181,10 +182,12 @@ function retrieveNodeInfo(node, recursive, options) { }); } } - $('#spinner').modal('hide'); + if(recursive) + $('#spinner').modal('hide'); }, error : function() { - $('#spinner').modal('hide'); + if(recursive) + $('#spinner').modal('hide'); } }); }
only show spinner for recursive (=expensive) server calls
diff --git a/src/Serializer/SerializerAbstract.php b/src/Serializer/SerializerAbstract.php index <HASH>..<HASH> 100644 --- a/src/Serializer/SerializerAbstract.php +++ b/src/Serializer/SerializerAbstract.php @@ -15,7 +15,7 @@ use League\Fractal\Pagination\CursorInterface; use League\Fractal\Pagination\PaginatorInterface; use League\Fractal\Resource\ResourceInterface; -abstract class SerializerAbstract +abstract class SerializerAbstract implements Serializer { /** * Serialize a collection.
Added Serializer interface to SerializerAbstract
diff --git a/symphony/content/content.systemextensions.php b/symphony/content/content.systemextensions.php index <HASH>..<HASH> 100755 --- a/symphony/content/content.systemextensions.php +++ b/symphony/content/content.systemextensions.php @@ -41,6 +41,8 @@ $td3 = Widget::TableData($about['version']); if ($about['author'][0] && is_array($about['author'][0])) { + $value = ""; + for($i = 0; $i < count($about['author']); ++$i) { $author = $about['author'][$i]; $link = $author['name']; @@ -51,9 +53,11 @@ elseif(isset($author['email'])) $link = Widget::Anchor($author['name'], 'mailto:' . $author['email']); - $td4->appendChild($link); - if ($i != count($about['author']) - 1)$td4->appendChild(new XMLElement("span", ",&nbsp;")); + $comma = ($i != count($about['author']) - 1) ? ", " : ""; + $value .= $link->generate() . $comma; } + + $td4->setValue($value); } else { $link = $about['author']['name'];
Commas are no longer wrapped in a span element (see previous commit)
diff --git a/arcana/repository/xnat.py b/arcana/repository/xnat.py index <HASH>..<HASH> 100644 --- a/arcana/repository/xnat.py +++ b/arcana/repository/xnat.py @@ -70,6 +70,7 @@ class XnatRepo(Repository): DERIVED_FROM_FIELD = '__derived_from__' PROV_SCAN = '__prov__' PROV_RESOURCE = 'PROV' + depth = 2 def __init__(self, server, project_id, cache_dir, user=None, password=None, check_md5=True, race_cond_delay=30,
added fixed depth of XNAT repository as 2
diff --git a/app/publisher/zip.go b/app/publisher/zip.go index <HASH>..<HASH> 100644 --- a/app/publisher/zip.go +++ b/app/publisher/zip.go @@ -265,11 +265,12 @@ func (zh *zipHandler) ServeHTTP(rw http.ResponseWriter, req *http.Request) { http.Error(rw, "Server error", http.StatusInternalServerError) return } - f, err := zw.CreateHeader( - &zip.FileHeader{ - Name: file.path, - Method: zip.Store, - }) + zh := zip.FileHeader{ + Name: file.path, + Method: zip.Store, + } + zh.SetModTime(fr.ModTime()) + f, err := zw.CreateHeader(&zh) if err != nil { log.Printf("Could not create %q in zip: %v", file.path, err) http.Error(rw, "Server error", http.StatusInternalServerError)
app/publisher: add zip download file times Change-Id: I2a<I>a<I>d2a<I>ca3b<I>fbc<I>b8b<I>
diff --git a/packages/availity-workflow/scripts/start.js b/packages/availity-workflow/scripts/start.js index <HASH>..<HASH> 100644 --- a/packages/availity-workflow/scripts/start.js +++ b/packages/availity-workflow/scripts/start.js @@ -139,15 +139,9 @@ function web() { const percent = Math.round(percentage * 100); - if (previousPercent === percent) { - return; - } - previousPercent = percent; - - if (percent % 10 === 0 && msg !== null && msg !== undefined && msg.trim() !== '') { - + if (previousPercent !== percent && percent % 10 === 0 && msg !== null && msg !== undefined && msg.trim() !== '') { Logger.info(`${chalk.dim('Webpack')} ${percent}% ${msg}`); - + previousPercent = percent; } }));
fix the percentage calculation for webpack progress
diff --git a/test/unit/lookup_test.rb b/test/unit/lookup_test.rb index <HASH>..<HASH> 100644 --- a/test/unit/lookup_test.rb +++ b/test/unit/lookup_test.rb @@ -12,10 +12,10 @@ class LookupTest < GeocoderTestCase end def test_search_returns_empty_array_when_no_results - silence_warnings do - Geocoder::Lookup.all_services_except_test.each do |l| - lookup = Geocoder::Lookup.get(l) - set_api_key!(l) + Geocoder::Lookup.all_services_except_test.each do |l| + lookup = Geocoder::Lookup.get(l) + set_api_key!(l) + silence_warnings do assert_equal [], lookup.send(:results, Geocoder::Query.new("no results")), "Lookup #{l} does not return empty array when no results." end
Be more specific about silencing warnings.
diff --git a/Block/MediaBlockService.php b/Block/MediaBlockService.php index <HASH>..<HASH> 100644 --- a/Block/MediaBlockService.php +++ b/Block/MediaBlockService.php @@ -101,6 +101,11 @@ class MediaBlockService extends BaseBlockService public function buildEditForm(FormMapper $formMapper, BlockInterface $block) { $contextChoices = $this->getContextChoices(); + + if (!$block->getSetting('mediaId') instanceof MediaInterface) { + $this->load($block); + } + $formatChoices = $this->getFormatChoices($block->getSetting('mediaId')); $formMapper->add('settings', 'sonata_type_immutable_array', array(
Load the media in buildform
diff --git a/contrib/distributed_rails_event_store/postgresql_queue/lib/postgresql_queue.rb b/contrib/distributed_rails_event_store/postgresql_queue/lib/postgresql_queue.rb index <HASH>..<HASH> 100644 --- a/contrib/distributed_rails_event_store/postgresql_queue/lib/postgresql_queue.rb +++ b/contrib/distributed_rails_event_store/postgresql_queue/lib/postgresql_queue.rb @@ -18,7 +18,13 @@ module PostgresqlQueue ).where(event_id: [first_event.event_id, last_event.event_id]). order("id ASC").pluck(:id) eisid_first, eisid_last = eisids.first, eisids.last + eisid_first -=1 + eisid_last+=1 + # FIXME! + # We should get all EventInStream between after..eisid_last + # instead of eisid_first..eisid_last because there can be + # another IDs there from other streams and linked events! eis = RailsEventStoreActiveRecord::EventInStream. where("id >= #{eisid_first} AND id <= #{eisid_last}"). order("id ASC").to_a
Handle a failing situation when we were missing 1 record in "eis" because it was in a named stream. I think this whole solution requires some changes to properly handle linked events. We should get all EventInStream between after..eisid_last instead of eisid_first..eisid_last because there can be another IDs there from other streams and linked events!