diff
stringlengths
65
26.7k
message
stringlengths
7
9.92k
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ setup( license='BSD License', description='A simple python wrapper around National Rail Enquires LDBS SOAP Webservice', long_description=README, - #url='https://github.com/robert-b-clarke/django-laconicurls', + url='https://github.com/robert-b-clarke/nre-darwin-py', author='Robert Clarke', author_email='rob@redanorak.co.uk', test_suite='test_nredarwin', @@ -30,6 +30,6 @@ setup( 'Programming Language :: Python', 'Topic :: Internet :: WWW/HTTP', 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', - 'Development Status :: 4 - Beta', + 'Development Status :: 4 - Beta' ], )
add link from setup to github
diff --git a/src/main/java/org/springframework/hateoas/PagedResources.java b/src/main/java/org/springframework/hateoas/PagedResources.java index <HASH>..<HASH> 100644 --- a/src/main/java/org/springframework/hateoas/PagedResources.java +++ b/src/main/java/org/springframework/hateoas/PagedResources.java @@ -168,10 +168,6 @@ public class PagedResources<T> extends Resources<T> { * * @author Oliver Gierke */ - @org.codehaus.jackson.annotate.JsonAutoDetect( - fieldVisibility = org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.ANY) - @com.fasterxml.jackson.annotation.JsonAutoDetect( - fieldVisibility = com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.ANY) public static class PageMetadata { @XmlAttribute//
#<I> - Removed obsolete annotations from PagedResources. Removed JsonAutoDetect annotations from PagedResources as the reference to Visibility was causing compile errors in case one of the 2 Jackson variants was not on the classpath (which by design will usually be the case). Generally, the annotations weren't required anymore so that we could remove them.
diff --git a/spec/unit/active_attr/typecasting_spec.rb b/spec/unit/active_attr/typecasting_spec.rb index <HASH>..<HASH> 100644 --- a/spec/unit/active_attr/typecasting_spec.rb +++ b/spec/unit/active_attr/typecasting_spec.rb @@ -123,12 +123,12 @@ module ActiveAttr end context "from Float::INFINITY" do - let(:value) { Float::INFINITY } + let(:value) { 1.0 / 0.0 } it { should be_nil } end context "from Float::NAN" do - let(:value) { Float::NAN } + let(:value) { 0.0 / 0.0 } it { should be_nil } end end
No Float::INFINITY or FLOAT::NAN in <I>x, use computations resulting in those values for #5
diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb index <HASH>..<HASH> 100644 --- a/actionpack/lib/action_dispatch/http/url.rb +++ b/actionpack/lib/action_dispatch/http/url.rb @@ -64,7 +64,7 @@ module ActionDispatch end def host_or_subdomain_and_domain(options) - return options[:host] unless options[:subdomain] || options[:subdomain] == false || options[:domain] + return options[:host] if options[:subdomain].nil? && options[:domain].nil? tld_length = options[:tld_length] || @@tld_length @@ -73,7 +73,7 @@ module ActionDispatch host << (options[:subdomain] || extract_subdomain(options[:host], tld_length)) host << "." end - host << (options[:domain] || extract_domain(options[:host], tld_length)) + host << (options[:domain] || extract_domain(options[:host], tld_length)) host end end
Clean up subdomain code a bit.
diff --git a/src/PhpFileFinder.php b/src/PhpFileFinder.php index <HASH>..<HASH> 100644 --- a/src/PhpFileFinder.php +++ b/src/PhpFileFinder.php @@ -22,7 +22,7 @@ class PhpFileFinder ), '/^.+\.php$/i', \RecursiveRegexIterator::GET_MATCH ); foreach ($regexIterator as $fileName) { - $collection->add(new PhpFile(new \SplFileInfo($fileName[0]))); + $collection = $collection->add(new PhpFile(new \SplFileInfo($fileName[0]))); } return $collection;
Fix bug where immutable collection was treated like mutable
diff --git a/Grido/Components/Filters/Filter.php b/Grido/Components/Filters/Filter.php index <HASH>..<HASH> 100755 --- a/Grido/Components/Filters/Filter.php +++ b/Grido/Components/Filters/Filter.php @@ -153,7 +153,12 @@ abstract class Filter extends \Grido\Components\Base public function getColumns() { if (!$this->columns) { - $this->setColumn($this->name); + $column = $this->name; + if ($column = $this->grid->getColumn($this->name, FALSE)) { + $column = $column->column; //use db column from column compoment + } + + $this->setColumn($column); } return $this->columns;
Filters: Use db's column from column component when not set and column component with the same name exists
diff --git a/ddmrp_adjustment/models/stock_warehouse_orderpoint.py b/ddmrp_adjustment/models/stock_warehouse_orderpoint.py index <HASH>..<HASH> 100644 --- a/ddmrp_adjustment/models/stock_warehouse_orderpoint.py +++ b/ddmrp_adjustment/models/stock_warehouse_orderpoint.py @@ -38,7 +38,7 @@ class StockWarehouseOrderpoint(models.Model): for val in values: daf *= val prev = self.adu - self.with_context(__no_adu_calc=True).adu *= daf + self.adu *= daf _logger.debug( "DAF=%s applied to %s. ADU: %s -> %s" % (daf, self.name, prev, self.adu))
[<I>][FIX] ADU *must* only be computed by the cron job (we do *not* want real-time ADU).
diff --git a/tests/Generator/GeneratorTest.php b/tests/Generator/GeneratorTest.php index <HASH>..<HASH> 100755 --- a/tests/Generator/GeneratorTest.php +++ b/tests/Generator/GeneratorTest.php @@ -650,7 +650,7 @@ class GeneratorTest extends TestCase { $instance = self::getBingGeneratorInstance(); - if (PHP_VERSION_ID < 70013) { + if (PHP_VERSION_ID < 70015) { $this->assertSame(array(), $instance->getSoapClient()->getSoapClientStreamContextOptions()); } else { $this->assertSame(array(
issue #<I> - fix unit test based on php version
diff --git a/app/controllers/storytime/posts_controller.rb b/app/controllers/storytime/posts_controller.rb index <HASH>..<HASH> 100644 --- a/app/controllers/storytime/posts_controller.rb +++ b/app/controllers/storytime/posts_controller.rb @@ -41,8 +41,8 @@ module Storytime @comments = @post.comments.order("created_at DESC") #allow overriding in the host app - if lookup_context.template_exists?("storytime/posts/#{@post.slug}") - render @post.slug + if lookup_context.template_exists?("storytime/#{@post.type_name.pluralize}/#{@post.slug}") + render "storytime/#{@post.type_name.pluralize}/#{@post.slug}" elsif lookup_context.template_exists?("storytime/#{@post.type_name.pluralize}/show") render "storytime/#{@post.type_name.pluralize}/show" end
custom post type show by slug
diff --git a/exp/sdb/integration_test/tests.go b/exp/sdb/integration_test/tests.go index <HASH>..<HASH> 100644 --- a/exp/sdb/integration_test/tests.go +++ b/exp/sdb/integration_test/tests.go @@ -338,10 +338,6 @@ func (t *ItemsTest) BatchPutThenGet() { ) } -func (t *ItemsTest) BatchPutThenBatchGet() { - ExpectEq("TODO", "") -} - func (t *ItemsTest) GetForNonExistentItem() { ExpectEq("TODO", "") } @@ -350,22 +346,10 @@ func (t *ItemsTest) GetParticularAttributes() { ExpectEq("TODO", "") } -func (t *ItemsTest) BatchGetParticularAttributes() { - ExpectEq("TODO", "") -} - -func (t *ItemsTest) BatchGetForNonExistentItems() { - ExpectEq("TODO", "") -} - func (t *ItemsTest) GetNonExistentAttributeName() { ExpectEq("TODO", "") } -func (t *ItemsTest) BatchGetNonExistentAttributeName() { - ExpectEq("TODO", "") -} - func (t *ItemsTest) FailedValuePrecondition() { ExpectEq("TODO", "") }
There's no such thing as batch get.
diff --git a/structr-core/src/main/java/org/structr/module/JarConfigurationProvider.java b/structr-core/src/main/java/org/structr/module/JarConfigurationProvider.java index <HASH>..<HASH> 100644 --- a/structr-core/src/main/java/org/structr/module/JarConfigurationProvider.java +++ b/structr-core/src/main/java/org/structr/module/JarConfigurationProvider.java @@ -1084,7 +1084,8 @@ public class JarConfigurationProvider implements ConfigurationProvider { } } - } catch (Throwable ignore) { + } catch (Throwable t) { + logger.log(Level.FINEST, "Error trying to load class " + className, t); } } }
Adds logging with level FINEST to get information about classes with unmet dependencies in modules.
diff --git a/lib/Boris/ReadlineClient.php b/lib/Boris/ReadlineClient.php index <HASH>..<HASH> 100644 --- a/lib/Boris/ReadlineClient.php +++ b/lib/Boris/ReadlineClient.php @@ -7,6 +7,9 @@ */ class Boris_ReadlineClient { private $_socket; + private $_prompt; + private $_historyFile; + private $_clear = false; /** * Create a new ReadlineClient using $socket for communication. @@ -30,13 +33,20 @@ class Boris_ReadlineClient { declare(ticks = 1); pcntl_signal(SIGCHLD, SIG_IGN); + pcntl_signal(SIGINT, array($this, 'clear')); $parser = new Boris_ShallowParser(); $buf = ''; for (;;) { + $this->_clear = false; $line = readline($buf == '' ? $prompt : str_pad('*> ', strlen($prompt), ' ', STR_PAD_LEFT)); + if ($this->_clear) { + $buf = ''; + continue; + } + if (false === $line) { $buf = 'exit(0);'; // ctrl-d acts like exit } @@ -65,4 +75,8 @@ class Boris_ReadlineClient { } } } + + public function clear() { + $this->_clear = true; + } }
Clear buffer on ctrl-c... this seems to have a nasty side-effect on the ctrl-d handling though
diff --git a/ring.go b/ring.go index <HASH>..<HASH> 100644 --- a/ring.go +++ b/ring.go @@ -203,7 +203,7 @@ func (ring *Ring) heartbeat() { for _, shard := range ring.shards { err := shard.Client.Ping().Err() - if shard.Vote(err == nil) { + if shard.Vote(err == nil || err == errPoolTimeout) { log.Printf("redis: ring shard state changed: %s", shard) rebalance = true }
ring: ignore pool timeout when pinging shards.
diff --git a/category/selectors/index.js b/category/selectors/index.js index <HASH>..<HASH> 100644 --- a/category/selectors/index.js +++ b/category/selectors/index.js @@ -124,3 +124,8 @@ export const getCurrentCategories = createSelector( return null; } ); + +export const getCategoryProductCount = createSelector( + getCurrentCategory, + category => category.productCount || null +);
Added getCategoryProductCount selector
diff --git a/player_js.go b/player_js.go index <HASH>..<HASH> 100644 --- a/player_js.go +++ b/player_js.go @@ -123,8 +123,16 @@ func (p *player) Write(data []byte) (int, error) { buf := p.context.Call("createBuffer", p.channelNum, sizeInSamples, p.sampleRate) l, r := toLR(p.tmp[:p.bufferSize]) - buf.Call("copyToChannel", l, 0, 0) - buf.Call("copyToChannel", r, 1, 0) + if buf.Get("copyToChannel") != js.Undefined { + buf.Call("copyToChannel", l, 0, 0) + buf.Call("copyToChannel", r, 1, 0) + } else { + // copyToChannel is not defined on Safari 11 + outL := buf.Call("getChannelData", 0).Interface().([]float32) + outR := buf.Call("getChannelData", 1).Interface().([]float32) + copy(outL, l) + copy(outR, r) + } s := p.context.Call("createBufferSource") s.Set("buffer", buf)
js: Bug fix: copyToChannel is not defined on Safari
diff --git a/plenum/__init__.py b/plenum/__init__.py index <HASH>..<HASH> 100644 --- a/plenum/__init__.py +++ b/plenum/__init__.py @@ -5,6 +5,11 @@ plenum package from __future__ import absolute_import, division, print_function import sys +import plenum if sys.version_info < (3, 5, 0): raise ImportError("Python 3.5.0 or later required.") + +import importlib +from .__metadata__ import * +
Hotfix: Deps (#<I>)
diff --git a/tests/fixtures/issues/issue-470.php b/tests/fixtures/issues/issue-470.php index <HASH>..<HASH> 100644 --- a/tests/fixtures/issues/issue-470.php +++ b/tests/fixtures/issues/issue-470.php @@ -133,7 +133,7 @@ return [ 'Device_Name' => '2320 classic', 'Device_Maker' => 'Nokia', 'Device_Type' => 'Mobile Phone', - 'Device_Pointing_Method' => 'touchscreen', + 'Device_Pointing_Method' => 'unknown', 'Device_Code_Name' => '2323c', 'Device_Brand_Name' => 'Nokia', 'RenderingEngine_Name' => 'unknown',
#<I>: change pointing method inside test
diff --git a/spec/controllers/static_controller_spec.rb b/spec/controllers/static_controller_spec.rb index <HASH>..<HASH> 100644 --- a/spec/controllers/static_controller_spec.rb +++ b/spec/controllers/static_controller_spec.rb @@ -9,7 +9,7 @@ describe StaticController do response.should render_template "layouts/homepage" end it "renders no layout with javascript" do - get "mendeley" ,{format:"js"} + xhr :get, :mendeley response.should be_success response.should_not render_template "layouts/homepage" end @@ -22,7 +22,7 @@ describe StaticController do response.should render_template "layouts/homepage" end it "renders no layout with javascript" do - get "zotero" ,{format:"js"} + xhr :get, :zotero response.should be_success response.should_not render_template "layouts/homepage" end
Test for an XHR request, not for a javascript format
diff --git a/lib/textbringer/controller.rb b/lib/textbringer/controller.rb index <HASH>..<HASH> 100644 --- a/lib/textbringer/controller.rb +++ b/lib/textbringer/controller.rb @@ -59,7 +59,8 @@ module Textbringer end end rescue => e - Window.echo_area.show(e.to_s.chomp) + message(e.to_s.chomp) + STDERR.puts(e.backtrace) Window.beep end Window.redisplay @@ -101,7 +102,7 @@ module Textbringer def key_binding(key_sequence) @overriding_map&.lookup(key_sequence) || - Buffer.current.keymap&.lookup(key_sequence) || + Buffer.current&.keymap&.lookup(key_sequence) || GLOBAL_MAP.lookup(key_sequence) end end diff --git a/lib/textbringer/minibuffer.rb b/lib/textbringer/minibuffer.rb index <HASH>..<HASH> 100644 --- a/lib/textbringer/minibuffer.rb +++ b/lib/textbringer/minibuffer.rb @@ -3,6 +3,9 @@ module Textbringer module Minibuffer def message(msg) + buffer = Buffer.find_or_new("*Messages*") + buffer.end_of_buffer + buffer.insert(msg + "\n") Window.echo_area.show(msg) end
Log messages are saved in *Messsages*.
diff --git a/src/jquery.sidebar.js b/src/jquery.sidebar.js index <HASH>..<HASH> 100644 --- a/src/jquery.sidebar.js +++ b/src/jquery.sidebar.js @@ -22,6 +22,7 @@ * $(".my-sidebar").trigger("sidebar:open"); * $(".my-sidebar").trigger("sidebar:close"); * $(".my-sidebar").trigger("sidebar:toggle"); + * $(".my-sidebar").trigger("sidebar:close", [{ speed: 0 }]); * ``` * * After the sidebar is opened/closed, `sidebar:opened`/`sidebar:closed` event is emitted.
Improved a documentation comment according to a manual change in README.md
diff --git a/mbdata/replication.py b/mbdata/replication.py index <HASH>..<HASH> 100644 --- a/mbdata/replication.py +++ b/mbdata/replication.py @@ -249,7 +249,7 @@ def load_tar(filename, db, config, ignored_schemas, ignored_tables): continue print(" - Loading {} to {}".format(name, fulltable)) cursor.copy_from(tar.extractfile(member), fulltable) - db.commit + db.commit() def mbslave_import_main(config, args):
Fix commit in mbslave import
diff --git a/bugzoo/bug.py b/bugzoo/bug.py index <HASH>..<HASH> 100644 --- a/bugzoo/bug.py +++ b/bugzoo/bug.py @@ -218,6 +218,7 @@ class Bug(object): if self.__program: return "{}:{}:{}".format(self.__dataset.name, self.__program, self.__name) return "{}:{}".format(self.__dataset.name, self.__name) + uid = identifier def validate(self, verbose: bool = True) -> bool: """
added 'uid' property to Bug
diff --git a/lib/linters/attribute_quotes.js b/lib/linters/attribute_quotes.js index <HASH>..<HASH> 100644 --- a/lib/linters/attribute_quotes.js +++ b/lib/linters/attribute_quotes.js @@ -22,7 +22,7 @@ module.exports = { results.push({ column: column, - line: selector.source.start.line, + line: node.source.start.line + selector.source.start.line - 1, message: this.message }); } diff --git a/test/specs/linters/attribute_quotes.js b/test/specs/linters/attribute_quotes.js index <HASH>..<HASH> 100644 --- a/test/specs/linters/attribute_quotes.js +++ b/test/specs/linters/attribute_quotes.js @@ -79,7 +79,11 @@ describe('lesshint', function () { }); it('should check all selectors in a selector group', function () { - const source = 'input[type=text], input[type=text] {}'; + const source = [ + 'input[type=text],', + 'input[type=text] {}' + ].join('\n'); + const expected = [ { column: 12, @@ -87,8 +91,8 @@ describe('lesshint', function () { message: 'Attribute selectors should use quotes.' }, { - column: 30, - line: 1, + column: 12, + line: 2, message: 'Attribute selectors should use quotes.' } ];
Fix line reporting in attributeQuotes. Closes #<I>
diff --git a/test/karma.config.js b/test/karma.config.js index <HASH>..<HASH> 100644 --- a/test/karma.config.js +++ b/test/karma.config.js @@ -5,8 +5,7 @@ delete webpackConfig.entry module.exports = function (config) { config.set({ browsers: ['PhantomJS'], - singleRun: false, - autoWatch: process.env.TRAVIS ? false : true, + singleRun: true, frameworks: ['mocha', 'chai'], reporters: ['mocha'], files: [
chore(unit test) edit single run property
diff --git a/js/bigone.js b/js/bigone.js index <HASH>..<HASH> 100644 --- a/js/bigone.js +++ b/js/bigone.js @@ -44,7 +44,7 @@ module.exports = class bigone extends Exchange { '1w': 'week1', '1M': 'month1', }, - 'hostname': 'big.one', // set to 'b1.run' for China mainland + 'hostname': 'big.one', // or 'bigone.com' 'urls': { 'logo': 'https://user-images.githubusercontent.com/1294454/69354403-1d532180-0c91-11ea-88ed-44c06cefdf87.jpg', 'api': {
bigone minor edits / comments
diff --git a/lib/specinfra/version.rb b/lib/specinfra/version.rb index <HASH>..<HASH> 100644 --- a/lib/specinfra/version.rb +++ b/lib/specinfra/version.rb @@ -1,3 +1,3 @@ module Specinfra - VERSION = "2.34.3" + VERSION = "2.34.4" end
Bump up version [skip ci]
diff --git a/newrelic_api/servers.py b/newrelic_api/servers.py index <HASH>..<HASH> 100644 --- a/newrelic_api/servers.py +++ b/newrelic_api/servers.py @@ -54,7 +54,9 @@ class Servers(Resource): } """ - label_param = ';'.join(['{}:{}'.format(label, value) for label, value in filter_labels.items()]) + if filter_labels: + label_param = ';'.join(['{}:{}'.format(label, value) for label, value in filter_labels.items()]) + filters = [ 'filter[name]={0}'.format(filter_name) if filter_name else None, 'filter[ids]={0}'.format(','.join([str(app_id) for app_id in filter_ids])) if filter_ids else None,
Fix code if `filter_labels` is `None`
diff --git a/javascript/firefox-driver/js/modals.js b/javascript/firefox-driver/js/modals.js index <HASH>..<HASH> 100644 --- a/javascript/firefox-driver/js/modals.js +++ b/javascript/firefox-driver/js/modals.js @@ -159,12 +159,12 @@ fxdriver.modals.signalOpenModal = function(parent, text) { if (driver && driver.response_) { fxdriver.modals.setFlag(driver, text); var res = driver.response_; - if (driver.response_.name == 'executeAsyncScript') { + if (driver.response_.name == 'executeAsyncScript' && !driver.response_.responseSent_) { // Special case handling. If a modal is open when executeAsyncScript // tries to respond with a result, it doesn't do anything, so that this // codepath can be followed. fxdriver.modals.isModalPresent(function(present) { - var errorMessage = 'Unexpected modal dialog (text: ' + text + ')'; + var errorMessage = 'Unexpected modal dialog (text: ' + text + ')'; if (present) { try { fxdriver.modals.dismissAlert(driver);
DanielWagnerHall: Only dismiss alert if the current command is still pending. Yeah, there's still a bit of a race condition here, because of the timer that the response is actually sent in, but it's much *less* of a race condition :) r<I>
diff --git a/globus_cli/parsing/shared_options.py b/globus_cli/parsing/shared_options.py index <HASH>..<HASH> 100644 --- a/globus_cli/parsing/shared_options.py +++ b/globus_cli/parsing/shared_options.py @@ -175,12 +175,14 @@ def endpoint_create_and_update_params(*args, **kwargs): # Managed Endpoint options f = click.option( "--managed", "managed", is_flag=True, flag_value=True, + default=None, help=("Set the endpoint as a managed endpoint. Requires the " "user to be a subscription manager. If the user has " "multiple subscription IDs, --subscription-id must be used " "instead"))(f) f = click.option( "--no-managed", "managed", is_flag=True, flag_value=False, + default=None, help=("Unset the endpoint as a managed endpoint. " "Does not require the user to be a subscription manager. " "Mutually exclusive with --subscription-id"))(f)
Make default for --managed "None", not "False" With `--managed/--no-managed` split into two separate flag arguments, the default becomes `False` (this is a click behavior, makes sense for typical is_flag=True options). Explicitly tune the default back to "None" so that all of the behaviors based on this option remain the same.
diff --git a/src/input.js b/src/input.js index <HASH>..<HASH> 100644 --- a/src/input.js +++ b/src/input.js @@ -60,9 +60,6 @@ const createInputCaret = (element, ctx) => { const format = (val) => { let value = val.replace(/<|>|`|"|&/g, '?') .replace(/\r\n|\r|\n/g,'<br/>'); - if (/firefox/i.test(navigator.userAgent)) { - value = value.replace(/\s/g, '&nbsp;'); - } return value; };
fix(firefox): do not convert space characters to nbsp
diff --git a/lib/tml_rails/version.rb b/lib/tml_rails/version.rb index <HASH>..<HASH> 100644 --- a/lib/tml_rails/version.rb +++ b/lib/tml_rails/version.rb @@ -30,5 +30,5 @@ #++ module TmlRails - VERSION = '5.7.2' + VERSION = '5.7.3' end
Updated version to <I>
diff --git a/packages/graphql-language-service-server/src/startServer.js b/packages/graphql-language-service-server/src/startServer.js index <HASH>..<HASH> 100644 --- a/packages/graphql-language-service-server/src/startServer.js +++ b/packages/graphql-language-service-server/src/startServer.js @@ -37,6 +37,8 @@ export default (async function startServer( const messageReader = new SocketMessageReader(socket); const messageWriter = new SocketMessageWriter(socket); + socket.on('close', () => process.exit(0)); + messageReader.listen(message => { try { if (message.id != null) {
prevent socket from hanging when the connection ends
diff --git a/app/components/validated-input-component.js b/app/components/validated-input-component.js index <HASH>..<HASH> 100644 --- a/app/components/validated-input-component.js +++ b/app/components/validated-input-component.js @@ -12,8 +12,14 @@ App.ValidatedInputComponent = Ember.TextField.extend({ this.set('showError', this.get('isInvalid')); }, - keyUp: function () { + keyUp: function (e) { if (this.get('isValid')) this.set('showError', false); + + // format card number with spaces + var $target = $(e.target); + if ( $target.attr('name') === 'number' ) { + $target.payment('formatCardNumber'); + } }, keyDown: function (e) {
Issue #<I> - credit card cvv and number validations and formatting Conflicts: app/components/validated-input-component.js
diff --git a/gothic/gothic.go b/gothic/gothic.go index <HASH>..<HASH> 100644 --- a/gothic/gothic.go +++ b/gothic/gothic.go @@ -247,8 +247,8 @@ func getProviderName(req *http.Request) (string, error) { } // try to get it from the go-context's value of "provider" key - if p := req.Context().Value("provider"); p != nil { - return p.(string), nil + if p, ok := req.Context().Value("provider").(string); ok { + return p, nil } // if not found then return an empty string with the corresponding error
string conversion in p,ok style to prevent panic if value of returned provder is not string
diff --git a/framework/core/js/lib/component.js b/framework/core/js/lib/component.js index <HASH>..<HASH> 100644 --- a/framework/core/js/lib/component.js +++ b/framework/core/js/lib/component.js @@ -18,6 +18,14 @@ export default class Component { return selector ? $(this.element()).find(selector) : $(this.element()); } + onload(element) { + this.element(element); + } + + config() { + + } + /** */ @@ -28,7 +36,18 @@ export default class Component { } var view = function(component) { component.props = props; - return component.view(); + var vdom = component.view(); + vdom.attrs = vdom.attrs || {}; + if (!vdom.attrs.config) { + vdom.attrs.config = function() { + var args = [].slice.apply(arguments); + if (!args[1]) { + component.onload.apply(component, args); + } + component.config.apply(component, args); + } + } + return vdom; }; view.$original = this.prototype.view; var output = {
Automatically hook up onload/config functions So that every component's DOM can be config'd by extensions
diff --git a/documentation/src/state/routing.js b/documentation/src/state/routing.js index <HASH>..<HASH> 100644 --- a/documentation/src/state/routing.js +++ b/documentation/src/state/routing.js @@ -1,5 +1,12 @@ export const LOCATION_CHANGE = 'LOCATION_CHANGE'; +/** + * This is a simple plug-in replacement for react-router-redux until it supports + * react-router v4. + * + * @param {Object} location - the next location object on route change. + * @return {Object} the action + */ export function updateLocation(location) { return { type: LOCATION_CHANGE, payload: { location } }; }
Updated documentaiton for the routing reducer
diff --git a/version.php b/version.php index <HASH>..<HASH> 100644 --- a/version.php +++ b/version.php @@ -30,10 +30,10 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2011110200.02; // YYYYMMDD = weekly release date of this DEV branch +$version = 2011111500.00; // YYYYMMDD = weekly release date of this DEV branch // RR = release increments - 00 in DEV branches // .XX = incremental changes -$release = '2.2dev (Build: 20111102)'; // Human-friendly version name +$release = '2.2beta (Build: 20111115)';// Human-friendly version name -$maturity = MATURITY_ALPHA; // this version's maturity level +$maturity = MATURITY_BETA; // this version's maturity level
Moodle release <I>beta
diff --git a/dwave/cloud/utils.py b/dwave/cloud/utils.py index <HASH>..<HASH> 100644 --- a/dwave/cloud/utils.py +++ b/dwave/cloud/utils.py @@ -475,7 +475,9 @@ class cached: """@cached backed by an on-disk sqlite3-based cache.""" from dwave.cloud.config import get_cache_dir directory = kwargs.pop('directory', get_cache_dir()) - cache = diskcache.Cache(directory=directory) + # NOTE: use pickle v4 to support <py38 + # TODO: consider using `diskcache.JSONDisk` if we can serialize `api.models` + cache = diskcache.Cache(directory=directory, disk_pickle_protocol=4) return cls(cache=cache, **kwargs)
Use pickle v4 for @cached.ondisk serialization, for compatibility (#<I>)
diff --git a/Job/XingMessage.php b/Job/XingMessage.php index <HASH>..<HASH> 100755 --- a/Job/XingMessage.php +++ b/Job/XingMessage.php @@ -32,6 +32,11 @@ class XingMessage implements JobActionInterface throw new \Exception('No message found for an operation with ID: '.$operationId); } + $ctaService = $this->container->get('campaignchain.core.cta'); + $message->setMessage( + $ctaService->processCTAs($message->getMessage(), $message->getOperation(), CTAService::FORMAT_TXT)->getContent() + ); + $oauthToken = $this->container->get('campaignchain.security.authentication.client.oauth.token'); $activity = $message->getOperation()->getActivity(); $identifier = $activity->getLocation()->getIdentifier();
CE-<I> Added CTA processing
diff --git a/lib/ecm/cms/version.rb b/lib/ecm/cms/version.rb index <HASH>..<HASH> 100644 --- a/lib/ecm/cms/version.rb +++ b/lib/ecm/cms/version.rb @@ -1,5 +1,5 @@ module Ecm module Cms - VERSION = "1.0.0" + VERSION = "1.0.1" end end
Bumped version to <I>
diff --git a/services/hh/service.go b/services/hh/service.go index <HASH>..<HASH> 100644 --- a/services/hh/service.go +++ b/services/hh/service.go @@ -70,7 +70,6 @@ func (s *Service) Close() error { if s.closing != nil { close(s.closing) - s.closing = nil } return nil }
Fix data race when close hinted handoff service
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/AbstractMemoryHttpData.java b/codec-http/src/main/java/io/netty/handler/codec/http/AbstractMemoryHttpData.java index <HASH>..<HASH> 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/AbstractMemoryHttpData.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/AbstractMemoryHttpData.java @@ -212,8 +212,8 @@ public abstract class AbstractMemoryHttpData extends AbstractHttpData { int written = 0; while (written < length) { written += fileChannel.write(byteBuffer); - fileChannel.force(false); } + fileChannel.force(false); fileChannel.close(); isRenamed = true; return written == length;
Move force() after multiple writes, not at every steps
diff --git a/jax/numpy/lax_numpy.py b/jax/numpy/lax_numpy.py index <HASH>..<HASH> 100644 --- a/jax/numpy/lax_numpy.py +++ b/jax/numpy/lax_numpy.py @@ -1761,8 +1761,7 @@ isneginf = _wraps(np.isneginf)(lambda x: _isposneginf(-inf, x)) @_wraps(np.isnan) def isnan(x): _check_arraylike("isnan", x) - return lax.bitwise_and(lax.bitwise_not(isfinite(x)), - lax.bitwise_not(isinf(x))) + return lax.ne(x, x) @_wraps(np.nan_to_num) def nan_to_num(x, copy=True, nan=0.0, posinf=None, neginf=None):
Switch implementation of jnp.isnan(x) to x != x.
diff --git a/lib/jsdom/level2/style.js b/lib/jsdom/level2/style.js index <HASH>..<HASH> 100644 --- a/lib/jsdom/level2/style.js +++ b/lib/jsdom/level2/style.js @@ -62,7 +62,7 @@ module.exports = core => { StyleSheetList.prototype.__proto__ = Array.prototype; StyleSheetList.prototype.item = function item(i) { - return this[i]; + return Object.prototype.hasOwnProperty.call(this, i) ? this[i] : null; }; core.StyleSheetList = StyleSheetList; diff --git a/test/level2/style.js b/test/level2/style.js index <HASH>..<HASH> 100644 --- a/test/level2/style.js +++ b/test/level2/style.js @@ -475,6 +475,13 @@ exports.tests = { t.done(); }, + "StyleSheetList.prototype.item returns null on index out of bounds": t => { + const document = jsdom.jsdom(); + t.strictEqual(document.styleSheets[0], undefined); + t.strictEqual(document.styleSheets.item(0), null); + t.done(); + }, + "setting background to null works correctly (GH-1499)": t => { const document = jsdom.jsdom(); document.body.innerHTML = `<div id="ctrl" style="background:#111;border:1px"></div>`;
Make StyleSheetList.prototype.item correctly return null when appropriate Per spec, "If there is no indexth object in the collection, then the method must return null."
diff --git a/Classes/Flowpack/SimpleSearch/Domain/Service/SqLiteIndex.php b/Classes/Flowpack/SimpleSearch/Domain/Service/SqLiteIndex.php index <HASH>..<HASH> 100644 --- a/Classes/Flowpack/SimpleSearch/Domain/Service/SqLiteIndex.php +++ b/Classes/Flowpack/SimpleSearch/Domain/Service/SqLiteIndex.php @@ -39,6 +39,7 @@ class SqLiteIndex implements IndexInterface { */ public function __construct($indexName, $storageFolder) { $this->indexName = $indexName; + $this->storageFolder = $storageFolder; } /**
BUGFIX: storageFolder is set again The storage folder was not set since the las commit. This is fixed now.
diff --git a/tests/HTMLPurifier/AttrTransform/NameSyncTest.php b/tests/HTMLPurifier/AttrTransform/NameSyncTest.php index <HASH>..<HASH> 100644 --- a/tests/HTMLPurifier/AttrTransform/NameSyncTest.php +++ b/tests/HTMLPurifier/AttrTransform/NameSyncTest.php @@ -8,7 +8,7 @@ class HTMLPurifier_AttrTransform_NameSyncTest extends HTMLPurifier_AttrTransform $this->obj = new HTMLPurifier_AttrTransform_NameSync(); $this->accumulator = new HTMLPurifier_IDAccumulator(); $this->context->register('IDAccumulator', $this->accumulator); - $this->config->set('Attr', 'EnableID', true); + $this->config->set('Attr.EnableID', true); } function testEmpty() {
Fix bad configuration call in NameSyncTest.php.
diff --git a/pandas/tests/io/test_html.py b/pandas/tests/io/test_html.py index <HASH>..<HASH> 100644 --- a/pandas/tests/io/test_html.py +++ b/pandas/tests/io/test_html.py @@ -123,7 +123,7 @@ class TestReadHtml: @tm.network def test_banklist_url_positional_match(self): - url = "http://www.fdic.gov/bank/individual/failed/banklist.html" + url = "https://www.fdic.gov/bank/individual/failed/banklist.html" # Passing match argument as positional should cause a FutureWarning. with tm.assert_produces_warning(FutureWarning): df1 = self.read_html( @@ -136,7 +136,7 @@ class TestReadHtml: @tm.network def test_banklist_url(self): - url = "http://www.fdic.gov/bank/individual/failed/banklist.html" + url = "https://www.fdic.gov/bank/individual/failed/banklist.html" df1 = self.read_html( url, match="First Federal Bank of Florida", attrs={"id": "table"} )
CI/TST: use https to avoid ResourceWarning in html tests (#<I>)
diff --git a/spec/stream.spec.js b/spec/stream.spec.js index <HASH>..<HASH> 100644 --- a/spec/stream.spec.js +++ b/spec/stream.spec.js @@ -97,7 +97,7 @@ describe("Streaming Queries", function() { }); - it.skip("should return the initial result", function() { + it("should return the initial result", function() { var received = []; var promise = new Promise(function(success, error) { stream = db[bucket].find().stream();
skipping streaming tests on ie9
diff --git a/javascript/firefox-driver/js/syntheticMouse.js b/javascript/firefox-driver/js/syntheticMouse.js index <HASH>..<HASH> 100644 --- a/javascript/firefox-driver/js/syntheticMouse.js +++ b/javascript/firefox-driver/js/syntheticMouse.js @@ -312,7 +312,7 @@ SyntheticMouse.prototype.click = function(target) { } if (parent && parent.tagName.toLowerCase() == 'select' && !parent.multiple) { - goog.log.info(SyntheticMouse.LOG_, 'About to do a bot.action.click on ' + element); + goog.log.info(SyntheticMouse.LOG_, 'About to do a bot.action.click on ' + parent); bot.action.click(parent, undefined /* coords */); }
firefox: fix log message to say we click on parent element first
diff --git a/src/edeposit/amqp/calibre/calibre.py b/src/edeposit/amqp/calibre/calibre.py index <HASH>..<HASH> 100755 --- a/src/edeposit/amqp/calibre/calibre.py +++ b/src/edeposit/amqp/calibre/calibre.py @@ -51,7 +51,7 @@ def convert(input_format, output_format, b64_data): Returns: ConversionResponse: namedtuple structure with information about output - ` `format``, data (``b64_data``) and protocol from + ``format``, data (``b64_data``) and protocol from conversion (``protocol``). Structured is defined in :class:`__init__.ConversionResponse`. @@ -67,13 +67,12 @@ def convert(input_format, output_format, b64_data): with NTFile(mode="wb", suffix="." + input_format, dir="/tmp") as ifile: ofilename = ifile.name + "." + output_format - print ifile.name - # save received data to the temporary file ifile.write( b64decode(b64_data) ) + # convert file output = sh.ebook_convert(ifile.name, ofilename) if "EPUB output written to" not in output:
Removed test output, added comment.
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/config/RapidoidInitializer.java b/rapidoid-commons/src/main/java/org/rapidoid/config/RapidoidInitializer.java index <HASH>..<HASH> 100644 --- a/rapidoid-commons/src/main/java/org/rapidoid/config/RapidoidInitializer.java +++ b/rapidoid-commons/src/main/java/org/rapidoid/config/RapidoidInitializer.java @@ -26,17 +26,15 @@ import org.rapidoid.log.Log; public class RapidoidInitializer { - private static boolean initialized; + private static volatile boolean initialized; public static synchronized void initialize() { if (!initialized) { - Log.info("Starting Rapidoid...", "version", RapidoidInfo.version()); + initialized = true; - Log.info("Working directory is: " + System.getProperty("user.dir")); + Log.info("Starting Rapidoid...", "version", RapidoidInfo.version(), "working dir", System.getProperty("user.dir")); Cls.getClassIfExists("org.rapidoid.web.RapidoidWebModule"); - - initialized = true; } }
Fixed synchronization bug in the initializer.
diff --git a/cloud_blobstore/gs.py b/cloud_blobstore/gs.py index <HASH>..<HASH> 100644 --- a/cloud_blobstore/gs.py +++ b/cloud_blobstore/gs.py @@ -3,6 +3,7 @@ import binascii import datetime import typing +from google.api_core.exceptions import NotFound from google.cloud.exceptions import NotFound from google.cloud.storage import Client from google.cloud.storage.bucket import Bucket @@ -169,11 +170,12 @@ class GSBlobStore(BlobStore): :return: the data """ bucket_obj = self._ensure_bucket_loaded(bucket) - blob_obj = bucket_obj.get_blob(key) - if blob_obj is None: - raise BlobNotFoundError(f"Could not find gs://{bucket}/{key}") + blob_obj = bucket_obj.blob(key) - return blob_obj.download_as_string() + try: + return blob_obj.download_as_string() + except NotFound: + raise BlobNotFoundError(f"Could not find gs://{bucket}/{key}") @CatchTimeouts def get_cloud_checksum(
Bypass get_blob convenience wrapper See <URL>) race conditions and 2) unnecessary API calls. This just attempts to download the blob directly without two requests, and returns BlobNotFoundError if the download fails.
diff --git a/src/react/get-children.js b/src/react/get-children.js index <HASH>..<HASH> 100644 --- a/src/react/get-children.js +++ b/src/react/get-children.js @@ -1,9 +1,13 @@ import React from 'react'; +function isChildSwiperSlide(child) { + return child.type && child.type.displayName.includes('SwiperSlide'); +} + function processChildren(c) { const slides = []; React.Children.toArray(c).forEach((child) => { - if (child.type && child.type.displayName === 'SwiperSlide') { + if (isChildSwiperSlide(child)) { slides.push(child); } else if (child.props && child.props.children) { processChildren(child.props.children).forEach((slide) => slides.push(slide)); @@ -23,7 +27,7 @@ function getChildren(c) { }; React.Children.toArray(c).forEach((child) => { - if (child.type && child.type.displayName === 'SwiperSlide') { + if (isChildSwiperSlide(child)) { slides.push(child); } else if (child.props && child.props.slot && slots[child.props.slot]) { slots[child.props.slot].push(child);
feat(react): Allow SwiperSlide children as long as displayName includes SwiperSlide (#<I>) Refactor getChildren to return all child components whose names contains SwiperSlide to allow for custom components in Swiper that do not have a displayName of SwiperSlide. Adds helper function isChildSwiperSlide(child) to check if react child is a child which contains SwiperSlide in its displayName.
diff --git a/tests/MarkupAssertionsTraitTest.php b/tests/MarkupAssertionsTraitTest.php index <HASH>..<HASH> 100644 --- a/tests/MarkupAssertionsTraitTest.php +++ b/tests/MarkupAssertionsTraitTest.php @@ -105,6 +105,15 @@ class MarkupAssertionsTraitTest extends TestCase ); } + public function testAssertElementContainsMultipleSelectors() + { + $this->testcase->assertElementContains( + 'ipsum', + '#main .foo', + '<div id="main"><span class="foo">Lorem ipsum</span></div>' + ); + } + public function testAssertElementContainsScopesToSelector() { $this->expectException(AssertionFailedError::class);
Add another selector test to see if #<I> impacts that as well (it doesn't)
diff --git a/mobly/test_runner.py b/mobly/test_runner.py index <HASH>..<HASH> 100644 --- a/mobly/test_runner.py +++ b/mobly/test_runner.py @@ -35,7 +35,7 @@ from mobly import signals from mobly import utils -def main(): +def main(argv=None): """Execute the test class in a test module. This is the default entry point for running a test script file directly. @@ -50,6 +50,10 @@ def main(): If you want to implement your own cli entry point, you could use function execute_one_test_class(test_class, test_config, test_identifier) + + Args: + argv: A list that is then parsed as cli args. If None, defaults to cli + input. """ # Parse cli args. parser = argparse.ArgumentParser(description="Mobly Test Executable.") @@ -74,7 +78,9 @@ def main(): type=str, metavar="[<TEST BED NAME1> <TEST BED NAME2> ...]", help="Specify which test beds to run tests on.") - args = parser.parse_args(sys.argv[1:]) + if not argv: + argv = sys.argv[1:] + args = parser.parse_args(argv) # Load test config file. test_configs = config_parser.load_test_config_file(args.config[0], args.test_bed)
Allow passing argv to main directly. (#<I>) * Allow passing argv to main directly.
diff --git a/src/main/java/org/junit/runners/model/InitializationError.java b/src/main/java/org/junit/runners/model/InitializationError.java index <HASH>..<HASH> 100644 --- a/src/main/java/org/junit/runners/model/InitializationError.java +++ b/src/main/java/org/junit/runners/model/InitializationError.java @@ -36,4 +36,14 @@ public class InitializationError extends Exception { public List<Throwable> getCauses() { return fErrors; } + + @Override + public String getMessage() { + StringBuilder sb = new StringBuilder( + String.format("There were %d errors:", fErrors.size())); + for (Throwable e : fErrors) { + sb.append(String.format("\n %s(%s)", e.getClass().getName(), e.getMessage())); + } + return sb.toString(); + } }
Give InitializationError a useful message. JUnit itself does not use the message, but having a useful message makes debugging runners easier.
diff --git a/console/commands/migrate.php b/console/commands/migrate.php index <HASH>..<HASH> 100644 --- a/console/commands/migrate.php +++ b/console/commands/migrate.php @@ -277,11 +277,10 @@ $console $file = $input->getArgument('file'); $console->loadFramework(); $db = \KService::get('koowa:database.adapter.mysqli'); - //$dump = new MySQLDump($db->getConnection(); - print class_exists('MySQLDump'); -// if ( !is_readable($file) ) { -// throw new \Exception('Invalid SQL data file'); -// } + $dump = new \MySQLDump($db->getConnection()); + $file = fopen($file, 'w'); + $dump->write($file); + fclose($file); }); ?> \ No newline at end of file
added db:dump task
diff --git a/src/Canvas.js b/src/Canvas.js index <HASH>..<HASH> 100644 --- a/src/Canvas.js +++ b/src/Canvas.js @@ -549,8 +549,8 @@ Canvas.prototype.drawImage = function( aSource, destX, destY, destWidth, destHei destWidth = Math.min( this._canvasContext.canvas.width, destWidth ); destHeight = Math.min( this._canvasContext.canvas.height, destHeight ); - var xScale = destWidth / aOptSourceWidth; - var yScale = destHeight / aOptSourceHeight; + const xScale = destWidth / aOptSourceWidth; + const yScale = destHeight / aOptSourceHeight; // when clipping the source region should remain within the image dimensions
replaced var declaration with const declaration
diff --git a/src/RendererPlugin.js b/src/RendererPlugin.js index <HASH>..<HASH> 100644 --- a/src/RendererPlugin.js +++ b/src/RendererPlugin.js @@ -7,6 +7,12 @@ class RendererPlugin { constructor() { this._objects = []; + + /** + * Используется для обозначения типа плагина + * @type {Number} + */ + this.type = 0; } /**
Add type field to RendererPlugin for better understanding
diff --git a/pwnypack/shellcode/translate.py b/pwnypack/shellcode/translate.py index <HASH>..<HASH> 100644 --- a/pwnypack/shellcode/translate.py +++ b/pwnypack/shellcode/translate.py @@ -128,6 +128,22 @@ def translate(env, func, *args, **kwargs): else: value[index] = new_value + elif op.name == 'INPLACE_ADD': + value = stack.pop() + reg = stack.pop() + if not isinstance(reg, Register): + raise TypeError('In-place addition is only supported on registers') + program.extend(env.reg_add(reg, value)) + stack.append(reg) + + elif op.name == 'INPLACE_SUBTRACT': + value = stack.pop() + reg = stack.pop() + if not isinstance(reg, Register): + raise TypeError('In-place subtraction is only supported on registers') + program.extend(env.reg_sub(reg, value)) + stack.append(reg) + else: raise RuntimeError('Unsupported opcode: %s' % op.name)
Support in-place add/subtract on registers.
diff --git a/libs/options.js b/libs/options.js index <HASH>..<HASH> 100644 --- a/libs/options.js +++ b/libs/options.js @@ -24,8 +24,6 @@ function parseOptions(opts) { opts = extend(defaults, opts); - if (opts.verbose) console.log(opts); - if (os.platform() === 'win32') { opts.pipeFileToMaster = path.join( @@ -69,6 +67,8 @@ function parseOptions(opts) { delete opts.pipeFileFromMaster; } + if (opts.verbose) console.log(opts); + return opts; }
we don't care of what we don't need
diff --git a/elasticsearch-transport/spec/spec_helper.rb b/elasticsearch-transport/spec/spec_helper.rb index <HASH>..<HASH> 100644 --- a/elasticsearch-transport/spec/spec_helper.rb +++ b/elasticsearch-transport/spec/spec_helper.rb @@ -18,16 +18,22 @@ def jruby? RUBY_PLATFORM =~ /\bjava\b/ end +# The names of the connected nodes. +# +# @return [ Array<String> ] The node names. +# +# @since 7.0.0 def node_names $node_names ||= default_client.nodes.stats['nodes'].collect do |name, stats| stats['name'] end end -def total_nodes - ELASTICSEARCH_HOSTS.size -end - +# The default client. +# +# @return [ Elasticsearch::Client ] The default client. +# +# @since 7.0.0 def default_client $client ||= Elasticsearch::Client.new(hosts: ELASTICSEARCH_HOSTS) end
[CLIENT] Add documentation to spec_helper methods
diff --git a/test/data/test_field.py b/test/data/test_field.py index <HASH>..<HASH> 100644 --- a/test/data/test_field.py +++ b/test/data/test_field.py @@ -1,4 +1,6 @@ from unittest import TestCase + +import six import torchtext.data as data @@ -94,7 +96,7 @@ class TestField(TestCase): assert data.get_tokenizer(str.split)(test_str) == str.split(test_str) # Test SpaCy option, and verify it properly handles punctuation. - assert data.get_tokenizer("spacy")(test_str) == [ + assert data.get_tokenizer("spacy")(six.text_type(test_str)) == [ "A", "string", ",", "particularly", "one", "with", "slightly", "complex", "punctuation", "."]
SpaCy tok only takes unicode, so convert with six
diff --git a/src/DbalDataProvider.php b/src/DbalDataProvider.php index <HASH>..<HASH> 100644 --- a/src/DbalDataProvider.php +++ b/src/DbalDataProvider.php @@ -158,6 +158,29 @@ class DbalDataProvider extends DataProvider public function filter($fieldName, $operator, $value) { + switch ($operator) { + case "eq": + $operator = '='; + break; + case "n_eq": + $operator = '<>'; + break; + case "gt": + $operator = '>'; + break; + case "lt": + $operator = '<'; + break; + case "ls_e": + $operator = '<='; + break; + case "gt_e": + $operator = '>='; + break; + default: + $operator = 'like'; + break; + } $this->src->andWhere("$fieldName $operator :$fieldName"); $this->src->setParameter($fieldName, $value); return $this;
Update DbalDataProvider.php Convert operator strings to SQL
diff --git a/tests/test_tasker.py b/tests/test_tasker.py index <HASH>..<HASH> 100644 --- a/tests/test_tasker.py +++ b/tests/test_tasker.py @@ -486,11 +486,11 @@ def test_retry_generator(exc, in_init, retry_times): error_message = 'cmd_error' if retry_times >= 0: - with pytest.raises(RetryGeneratorException) as exc: + with pytest.raises(RetryGeneratorException) as ex: t.retry_generator(lambda *args, **kwargs: simplegen(), *my_args, **my_kwargs) - assert repr(error_message) in repr(exc.value) + assert repr(error_message) in repr(ex.value) else: t.retry_generator(lambda *args, **kwargs: simplegen(), *my_args, **my_kwargs)
Rename conflicting var in test context manager
diff --git a/bin/test-browser.js b/bin/test-browser.js index <HASH>..<HASH> 100755 --- a/bin/test-browser.js +++ b/bin/test-browser.js @@ -166,7 +166,7 @@ function startTest() { if (err) { clearInterval(interval); testError(err); - } else if (results.completed) { + } else if (results.completed || results.failures.length) { clearInterval(interval); testComplete(results); } else {
(#<I>) - Fail early when running browser tests on saucelabs
diff --git a/netdiff/parsers/olsr.py b/netdiff/parsers/olsr.py index <HASH>..<HASH> 100644 --- a/netdiff/parsers/olsr.py +++ b/netdiff/parsers/olsr.py @@ -25,6 +25,8 @@ class OlsrParser(BaseParser): cost = link["tcEdgeCost"] except KeyError as e: raise NetParserException('Parse error, "%s" key not found' % e) + # original olsrd cost (jsoninfo multiplies by 1024) + cost = float(cost / 1024) # add link to Graph graph.add_edge(source, dest, weight=cost) self.graph = graph diff --git a/tests/olsr/tests.py b/tests/olsr/tests.py index <HASH>..<HASH> 100644 --- a/tests/olsr/tests.py +++ b/tests/olsr/tests.py @@ -125,3 +125,9 @@ class TestOlsrParser(TestCase): links=result['removed'], expected_links=[('10.150.0.5', '10.150.0.4')] ) + + def test_weight(self): + parser = OlsrParser(links2) + graph = parser.json(dict=True) + self.assertEqual(str(graph['links'][0]['weight'])[0:3], '27.') + self.assertEqual(graph['links'][1]['weight'], 1.0)
Corrected weight in OlsrParser
diff --git a/src/Decorator/JaegerConnectionDecorator.php b/src/Decorator/JaegerConnectionDecorator.php index <HASH>..<HASH> 100644 --- a/src/Decorator/JaegerConnectionDecorator.php +++ b/src/Decorator/JaegerConnectionDecorator.php @@ -26,10 +26,10 @@ class JaegerConnectionDecorator extends AbstractConnectionDecorator parent::__construct($connection); } - public function connect() + public function connect(): bool { if ($this->isConnected()) { - return; + return false; } $span = $this->tracer ->start('dbal.connect') @@ -38,7 +38,7 @@ class JaegerConnectionDecorator extends AbstractConnectionDecorator ->addTag(new DbalAutoCommitTag($this->isAutoCommit())) ->addTag(new DbalNestingLevelTag($this->getTransactionNestingLevel())); try { - parent::connect(); + return parent::connect(); } catch (\Exception $e) { $span->addTag(new DbalErrorCodeTag($e->getCode())) ->addTag(new ErrorTag());
Fix return type for Connection::connect() Method must return `bool` according to phpdoc in `Doctrine\DBAL\Connection::connect()` > @return bool TRUE if the connection was successfully established, FALSE if the connection is already open. Missed return bool leads to type error while this package used with `doctrine/migrations:^2`
diff --git a/fructose/index.js b/fructose/index.js index <HASH>..<HASH> 100644 --- a/fructose/index.js +++ b/fructose/index.js @@ -7,4 +7,4 @@ AppRegistry.registerComponent("storybooknative", () => Fructose(getStories, { platform: "native" }) ); -export default Fructose(getStories); +export default Fructose(getStories, { platform: "native" });
fix: adding the relevant config to allow expo to work with fructose app (#<I>) * fix: adding the relevant config to allow expo to work with fructose app
diff --git a/lib/discordrb/data.rb b/lib/discordrb/data.rb index <HASH>..<HASH> 100644 --- a/lib/discordrb/data.rb +++ b/lib/discordrb/data.rb @@ -222,6 +222,17 @@ module Discordrb @server.role(role_id.to_i) end end + + # Update this member's voice state + # @note For internal use only. + # @!visibility private + def update_voice_state(channel, mute, deaf, self_mute, self_deaf) + @voice_channel = channel + @mute = mute + @deaf = deaf + @self_mute = self_mute + @self_deaf = self_deaf + end end # This class is a special variant of User that represents the bot's user profile (things like email addresses and the avatar).
Create a caching method to update a user's voice state
diff --git a/lang/en/resource.php b/lang/en/resource.php index <HASH>..<HASH> 100644 --- a/lang/en/resource.php +++ b/lang/en/resource.php @@ -85,6 +85,7 @@ $string['resourcetypedirectory'] = 'Display a directory'; $string['resourcetypefile'] = 'Link to a file or web site'; $string['resourcetypehtml'] = 'Compose a web page'; $string['resourcetypelabel'] = 'Insert a label'; +$string['resourcetyperepository'] = 'Link to a repository object'; $string['resourcetypetext'] = 'Compose a text page'; $string['searchweb'] = 'Search for web page'; $string['serverurl'] = 'Server URL ($a->wwwroot)';
Added string for adding links to repositories
diff --git a/bus/rabbitmq/correlator.js b/bus/rabbitmq/correlator.js index <HASH>..<HASH> 100644 --- a/bus/rabbitmq/correlator.js +++ b/bus/rabbitmq/correlator.js @@ -5,12 +5,15 @@ var events = require('events'), path = require('path'), Promise = require('bluebird'), util = require('util'); +var warn = require('debug')('servicebus:warn'); var queues = {}; function Correlator (options) { var self = this; // note: if you want to cluster servicebus, provide a 'queuesfile' option param when calling .bus(options). you'll likely do a mod of the cluster.worker.id in your cluster.js file when you call fork(); + if (cluster.isWorker && options.queuesFile === undefined) warn('Warning, to use subscriptions in a clustered app, you should specify a queuesFile option when calling .bus(options). You may want to provide something like util.format(\'.queues.worker.%s\', (cluster.worker.id % cluster.workers.length)).'); + this.filename = (options && options.queuesFile) ? path.join(process.cwd(), options.queuesFile) : (cluster.isWorker) ? path.join(process.cwd(), util.format('.queues.worker.%s', cluster.worker.id))
added warning to clarify how to use with cluster
diff --git a/api/src/main/java/org/cache2k/EntryRefreshController.java b/api/src/main/java/org/cache2k/EntryRefreshController.java index <HASH>..<HASH> 100644 --- a/api/src/main/java/org/cache2k/EntryRefreshController.java +++ b/api/src/main/java/org/cache2k/EntryRefreshController.java @@ -27,7 +27,7 @@ package org.cache2k; * * @deprecated */ -public class EntryRefreshController<T> { +public class EntryRefreshController<T> implements RefreshController<T> { public static final EntryRefreshController INSTANCE = new EntryRefreshController();
fix for API compatibility to <I>
diff --git a/pymatgen/analysis/phase_diagram.py b/pymatgen/analysis/phase_diagram.py index <HASH>..<HASH> 100644 --- a/pymatgen/analysis/phase_diagram.py +++ b/pymatgen/analysis/phase_diagram.py @@ -443,12 +443,10 @@ class BasePhaseDiagram(MSONable): Returns: The actual ndarray used to construct the convex hull. """ - data = [] - for entry in self.all_entries: - comp = entry.composition - row = [comp.get_atomic_fraction(el) for el in self.elements] - row.append(entry.energy_per_atom) - data.append(row) + data = [ + [e.composition.get_atomic_fraction(el) for el in self.elements] + [e.energy_per_atom] + for e in self.all_entries + ] return np.array(data)[:, 1:] @property
clean: remove for-loop for list comp
diff --git a/cmd/bucket-policy-parser.go b/cmd/bucket-policy-parser.go index <HASH>..<HASH> 100644 --- a/cmd/bucket-policy-parser.go +++ b/cmd/bucket-policy-parser.go @@ -23,7 +23,6 @@ import ( "errors" "fmt" "io" - "path" "sort" "strings" @@ -224,7 +223,7 @@ func resourcePrefix(resource string) string { if strings.HasSuffix(resource, "*") { resource = strings.TrimSuffix(resource, "*") } - return path.Clean(resource) + return resource } // checkBucketPolicyResources validates Resources in unmarshalled bucket policy structure.
Avoid path-cleaning policy resources for a better compliance with S3 (#<I>)
diff --git a/cast_test.go b/cast_test.go index <HASH>..<HASH> 100644 --- a/cast_test.go +++ b/cast_test.go @@ -1006,9 +1006,12 @@ func TestToDurationSliceE(t *testing.T) { {[]string{"1s", "1m"}, []time.Duration{time.Second, time.Minute}, false}, {[]int{1, 2}, []time.Duration{1, 2}, false}, {[]interface{}{1, 3}, []time.Duration{1, 3}, false}, + {[]time.Duration{1, 3}, []time.Duration{1, 3}, false}, + // errors {nil, nil, true}, {testing.T{}, nil, true}, + {[]string{"invalid"}, nil, true}, } for i, test := range tests {
Add TestToDurationSliceE cases to reach <I>% coverage
diff --git a/geomdl/_exchange.py b/geomdl/_exchange.py index <HASH>..<HASH> 100644 --- a/geomdl/_exchange.py +++ b/geomdl/_exchange.py @@ -373,7 +373,7 @@ def export_dict_surf(obj): # Trim curves if obj.trims: trim_data = dict(count=len(obj.trims)) - trim_curve_typemap = dict(spline=export_dict_crv, freeform=export_dict_ff) + trim_curve_typemap = dict(spline=export_dict_crv, freeform=export_dict_ff, analytic=export_dict_ff) trim_curves = [] for trim in obj.trims: if trim.type in trim_curve_typemap:
Add support for analytic geometry types
diff --git a/sos/plugins/npm.py b/sos/plugins/npm.py index <HASH>..<HASH> 100644 --- a/sos/plugins/npm.py +++ b/sos/plugins/npm.py @@ -19,7 +19,6 @@ class Npm(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin, SuSEPlugin): Get info about available npm modules """ - requires_root = False plugin_name = 'npm' profiles = ('system',) option_list = [("project_path",
[npm] plugin to requires_root Until our utils support commands execution for unpriviledged users, we should disable requires_root = False. Resolves: #<I>
diff --git a/examples/asitvd.js b/examples/asitvd.js index <HASH>..<HASH> 100644 --- a/examples/asitvd.js +++ b/examples/asitvd.js @@ -5,6 +5,7 @@ const exports = {}; import './asitvd.css'; import ngeoSourceAsitVD from 'ngeo/source/AsitVD.js'; +import EPSG21781 from 'ngeo/proj/EPSG21781.js'; import olMap from 'ol/Map.js'; import olView from 'ol/View.js'; @@ -37,6 +38,7 @@ exports.MainController = function() { }) ], view: new olView({ + projection: EPSG21781, resolutions: [250, 100, 50, 20, 10, 5, 2.5, 2, 1.5, 1, 0.5], center: [535000, 154000], zoom: 0
Set projection to view in asitvd example
diff --git a/swiftwind/core/templatetags/banking.py b/swiftwind/core/templatetags/banking.py index <HASH>..<HASH> 100644 --- a/swiftwind/core/templatetags/banking.py +++ b/swiftwind/core/templatetags/banking.py @@ -22,7 +22,7 @@ def currency(value): locale_values = [] for money in value.monies(): locale_value = locale.currency(abs(money.amount), grouping=True, symbol=money.currency.code) - locale_value = locale_value if value >= 0 else "({})".format(locale_value) + locale_value = locale_value if money.amount >= 0 else "({})".format(locale_value) locale_values.append(locale_value) else: locale_value = locale.currency(abs(value), grouping=True)
Fixes for currency rendering (needs reworking down the line)
diff --git a/dbussy.py b/dbussy.py index <HASH>..<HASH> 100644 --- a/dbussy.py +++ b/dbussy.py @@ -1361,6 +1361,7 @@ def _loop_attach(self, loop, dispatch) : toggled_function = handle_timeout_toggled, data = None ) + self = None # avoid circularity #end _loop_attach class Connection :
avoid memory leaks due to circular refs
diff --git a/lib/ProMotion/table/extensions/longpressable.rb b/lib/ProMotion/table/extensions/longpressable.rb index <HASH>..<HASH> 100644 --- a/lib/ProMotion/table/extensions/longpressable.rb +++ b/lib/ProMotion/table/extensions/longpressable.rb @@ -18,7 +18,7 @@ module ProMotion gesture_point = gesture.locationInView(pressed_table_view) index_path = pressed_table_view.indexPathForRowAtPoint(gesture_point) return unless index_path - data_cell = cell_at(index_path) + data_cell = cell_at(index_path: index_path) return unless data_cell trigger_action(data_cell[:long_press_action], data_cell[:arguments], index_path) if data_cell[:long_press_action] end
Forgot this one cell_at index_path.
diff --git a/velbus/controller.py b/velbus/controller.py index <HASH>..<HASH> 100644 --- a/velbus/controller.py +++ b/velbus/controller.py @@ -102,8 +102,13 @@ class Controller(object): """ time.sleep(3) logging.info('Scan finished') - callback() - + self._nb_of_modules_loaded = 0 + def module_loaded(): + self._nb_of_modules_loaded += 1 + if self._nb_of_modules_loaded >= len(self._modules): + callback() + for module in self._modules: + self._modules[module].load(module_loaded) for address in range(0, 256): message = velbus.ModuleTypeRequestMessage(address) if address == 255: @@ -145,7 +150,6 @@ class Controller(object): if name in velbus.ModuleRegistry: module = velbus.ModuleRegistry[name](m_type, name, address, self) self._modules[address] = module - #module.load() else: self.logger.warning("Module " + name + " is not yet supported.") for subscriber in self.__subscribers:
try to load all modules as part of scan
diff --git a/lib/ronin/ui/command_line/engine_command.rb b/lib/ronin/ui/command_line/engine_command.rb index <HASH>..<HASH> 100644 --- a/lib/ronin/ui/command_line/engine_command.rb +++ b/lib/ronin/ui/command_line/engine_command.rb @@ -43,30 +43,6 @@ module Ronin :method => :licensed_under # - # Initializes the engine command. - # - # @param [Array] arguments - # Command-line arguments. - # - # @param [Array] opts - # Additional command-line options. - # - # @param [Hash] config - # Additional configuration. - # - # @see Command#initialize - # - def initialize(arguments=[],opts={},config={}) - super(arguments,opts,config) - - unless self.class.engine_class - raise(StandardError,"#{self.class} does not have a defined engine_class") - end - - @engine_class = self.class.engine_class - end - - # # The class to load engines from. # # @return [Engine]
Removed an unneeded initialize.
diff --git a/python/kmeans.py b/python/kmeans.py index <HASH>..<HASH> 100644 --- a/python/kmeans.py +++ b/python/kmeans.py @@ -46,11 +46,12 @@ kPoints = array(X.take(k)) for i in range(len(kPoints)): kPoints[i] = kPoints[i] - mean(kPoints[i]) -convergeDist = 0.001 +convergeDist = 0.01 tempDist = 1.0 iteration = 0 +mxIteration = 100 -while tempDist > convergeDist: +while (tempDist > convergeDist) & (iteration < mxIteration): logging.info("(kmeans) starting iteration " + str(iteration)) closest = X.map( lambda p : (closestPoint(p, kPoints)[0], (p, 1)))
Added stop based on mxIterations
diff --git a/providers/nodebb/category.js b/providers/nodebb/category.js index <HASH>..<HASH> 100644 --- a/providers/nodebb/category.js +++ b/providers/nodebb/category.js @@ -230,7 +230,7 @@ exports.bindCategory = function bindCategory(forum) { * Add a topic to this category * * @public - * + * * @param {string} title The title of the topic * @param {string} body The body of the first post of the topic *
chore: Fix trailing space in jsdoc because eslint hates my jsdoc template
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100755 --- a/setup.py +++ b/setup.py @@ -16,6 +16,7 @@ setup( name="paperwork-backend", # if you change the version, don't forget to # * update the ChangeLog file + # * update the download_url in this file version="1.1.2", description=( "Paperwork's backend" @@ -35,7 +36,7 @@ There is no GUI here. The GUI is https://github.com/jflesch/paperwork . keywords="documents", url="https://github.com/jflesch/paperwork-backend", download_url=("https://github.com/jflesch/paperwork-backend" - "/archive/unstable.tar.gz"), + "/archive/1.1.2.tar.gz"), classifiers=[ "Development Status :: 5 - Production/Stable", "Intended Audience :: End Users/Desktop",
setup.py: Update download url
diff --git a/bin/publish.js b/bin/publish.js index <HASH>..<HASH> 100644 --- a/bin/publish.js +++ b/bin/publish.js @@ -98,9 +98,13 @@ function getNextBetaVersion(packageJson) { process.exit(1); } const tag = 'beta'; - // const stableVersion = packageJson.version.split('.'); - // const nextStableVersion = `${stableVersion[0]}.${parseInt(stableVersion[1]) + 1}.0`; - const nextStableVersion = `5.0.0`; + let nextStableVersion; + if (packageJson.name === 'xterm') { + nextStableVersion = `5.0.0`; + } else { + const stableVersion = packageJson.version.split('.'); + nextStableVersion = `${stableVersion[0]}.${parseInt(stableVersion[1]) + 1}.0`; + } const publishedVersions = getPublishedVersions(packageJson, nextStableVersion, tag); if (publishedVersions.length === 0) { return `${nextStableVersion}-${tag}.1`;
Fix publishing addons as xterm
diff --git a/test/app/models/thing.rb b/test/app/models/thing.rb index <HASH>..<HASH> 100644 --- a/test/app/models/thing.rb +++ b/test/app/models/thing.rb @@ -1,2 +1,3 @@ class Thing < ActiveRecord::Base + belongs_to :person end diff --git a/test/test/functional/things_controller_test.rb b/test/test/functional/things_controller_test.rb index <HASH>..<HASH> 100644 --- a/test/test/functional/things_controller_test.rb +++ b/test/test/functional/things_controller_test.rb @@ -41,11 +41,11 @@ class ThingsControllerTest < Test::Unit::TestCase :awesome => true } - assert assigns(:thing) - assert assigns(:person) + assert_not_nil assigns(:thing) + assert_not_nil assigns(:person) assert_not_nil (thing = Thing.find_by_name("nillawafer")) - assert thing.person_id == 2 assert_redirect_to thing_path(thing.person, thing) + assert_equal 2, thing.person_id end end
Nicer, but still not passing, tests. git-svn-id: <URL>
diff --git a/it/it-tests/src/test/java/it/ui/UiTest.java b/it/it-tests/src/test/java/it/ui/UiTest.java index <HASH>..<HASH> 100644 --- a/it/it-tests/src/test/java/it/ui/UiTest.java +++ b/it/it-tests/src/test/java/it/ui/UiTest.java @@ -23,6 +23,7 @@ import com.sonar.orchestrator.Orchestrator; import com.sonar.orchestrator.selenium.Selenese; import it.Category4Suite; import org.junit.ClassRule; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; import util.QaOnly; @@ -35,6 +36,7 @@ public class UiTest { public static Orchestrator orchestrator = Category4Suite.ORCHESTRATOR; @Test + @Ignore("Temporary disable to allow 5.6-RC1 to be released") public void test_footer() { new SeleneseTest( Selenese.builder().setHtmlTestsInClasspath("ui-footer",
Temporary disable IT to allow <I>-RC1 to be released
diff --git a/test/integration/022_bigquery_test/test_simple_bigquery_view.py b/test/integration/022_bigquery_test/test_simple_bigquery_view.py index <HASH>..<HASH> 100644 --- a/test/integration/022_bigquery_test/test_simple_bigquery_view.py +++ b/test/integration/022_bigquery_test/test_simple_bigquery_view.py @@ -52,7 +52,8 @@ class TestSimpleBigQueryRun(TestBaseBigQueryRun): self.run_dbt(['seed']) self.run_dbt(['seed', '--full-refresh']) results = self.run_dbt() - self.assertEqual(len(results), 6) + # Bump expected number of results when adding new model + self.assertEqual(len(results), 7) self.assert_nondupes_pass() @@ -63,7 +64,7 @@ class TestUnderscoreBigQueryRun(TestBaseBigQueryRun): def test_bigquery_run_twice(self): self.run_dbt(['seed']) results = self.run_dbt() - self.assertEqual(len(results), 6) + self.assertEqual(len(results), 7) results = self.run_dbt() - self.assertEqual(len(results), 6) + self.assertEqual(len(results), 7) self.assert_nondupes_pass()
Update bq integration test's expected number of models
diff --git a/test/index.js b/test/index.js index <HASH>..<HASH> 100644 --- a/test/index.js +++ b/test/index.js @@ -24,6 +24,7 @@ describe('Hapi-Sequelized', function () { pass: 'dbPass', // db password dialect: 'sqlite', // database type port: 8889, // database port # + storage: 'test.sqlite', // db filename for sqlite dialect models: 'test/models', // path to models directory from project root defaults: { timestamps: false @@ -81,6 +82,7 @@ describe('Hapi-Sequelized', function () { expect(config.database).to.equal(options.database); expect(config.username).to.equal(options.user); expect(config.password).to.equal(options.pass); + expect(opt.storage).to.equal(options.storage); done(); });
Updating test case for storage option Updating the test case for storage option for sqlite dialect.
diff --git a/lib/ronin/wordlist.rb b/lib/ronin/wordlist.rb index <HASH>..<HASH> 100644 --- a/lib/ronin/wordlist.rb +++ b/lib/ronin/wordlist.rb @@ -23,6 +23,8 @@ module Ronin # # An Enumerable class for iterating over wordlist files or lists of words. # + # @since 0.4.0 + # class Wordlist include Enumerable
Added a @since tag to Wordlist.
diff --git a/okio/src/main/java/okio/Segment.java b/okio/src/main/java/okio/Segment.java index <HASH>..<HASH> 100644 --- a/okio/src/main/java/okio/Segment.java +++ b/okio/src/main/java/okio/Segment.java @@ -32,7 +32,7 @@ package okio; */ final class Segment { /** The size of all segments in bytes. */ - static final int SIZE = 2048; + static final int SIZE = 8192; final byte[] data;
Try 8 KiB segments. We've heard reports that this dramatically increases throughput for some applications.
diff --git a/wily/cache.py b/wily/cache.py index <HASH>..<HASH> 100644 --- a/wily/cache.py +++ b/wily/cache.py @@ -106,6 +106,8 @@ def store(config, archiver, revision, stats): logger.debug(f"Creating {revision.key} output") filename = root / (revision.key + ".json") + if filename.exists(): + raise RuntimeError(f"File {filename} already exists, index may be corrupt.") with open(filename, "w") as out: out.write(json.dumps(stats, indent=2)) return filename
put a guard against overwritting the cache files
diff --git a/src/Listener/EntityChangedListener.php b/src/Listener/EntityChangedListener.php index <HASH>..<HASH> 100644 --- a/src/Listener/EntityChangedListener.php +++ b/src/Listener/EntityChangedListener.php @@ -97,7 +97,7 @@ class EntityChangedListener $mutated_fields = $this->meta_mutation_provider->getMutatedFields($em, $entity, $original); if (!empty($mutated_fields)) { - $this->logger->info( + $this->logger->debug( 'Going to notify a change (preFlush) to {entity_class}, which has {mutated_fields}', [ 'entity_class' => get_class($entity), @@ -133,7 +133,7 @@ class EntityChangedListener $mutated_fields = $this->meta_mutation_provider->getMutatedFields($em, $entity, null); - $this->logger->info( + $this->logger->debug( 'Going to notify a change (prePersist) to {entity_class}, which has {mutated_fields}', [ 'entity_class' => get_class($entity),
Changed info() logging to debug()
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100755 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ requires = [] setup( name='skosprovider', - version='0.2.1a1', + version='0.2.1', description='Abstraction layer for SKOS vocabularies.', long_description=open('README.rst').read() + '\n\n' + open('HISTORY.rst').read(),
Bumpt to version <I>.
diff --git a/tests/integration/deploy/test_deploy_command.py b/tests/integration/deploy/test_deploy_command.py index <HASH>..<HASH> 100644 --- a/tests/integration/deploy/test_deploy_command.py +++ b/tests/integration/deploy/test_deploy_command.py @@ -639,7 +639,7 @@ to create a managed default bucket, or run sam deploy --guided", else: self.fail("Companion stack was created. This should not happen with specifying image repos.") - self.stacks.append(SAM_CLI_STACK_NAME) + self.stacks.append({"name": SAM_CLI_STACK_NAME}) # Remove samconfig.toml os.remove(self.test_data_path.joinpath(DEFAULT_CONFIG_FILE_NAME))
Fixed Stack Name (#<I>)
diff --git a/src/widgets/ForceVerificationBlock.php b/src/widgets/ForceVerificationBlock.php index <HASH>..<HASH> 100644 --- a/src/widgets/ForceVerificationBlock.php +++ b/src/widgets/ForceVerificationBlock.php @@ -69,6 +69,10 @@ class ForceVerificationBlock extends Widget return null; } + if (Yii::$app->user->id === (int) $this->contact->client_id) { + return null; + } + return $this->render((new \ReflectionClass($this))->getShortName(), [ 'widgets' => $this->widgets, 'title' => $this->title,
hide verification block if client is owner of object
diff --git a/gpiozero/input_devices.py b/gpiozero/input_devices.py index <HASH>..<HASH> 100644 --- a/gpiozero/input_devices.py +++ b/gpiozero/input_devices.py @@ -149,8 +149,8 @@ class WaitableInputDevice(InputDevice): This can be set to a function which accepts no (mandatory) parameters, or a Python function which accepts a single mandatory parameter (with as many optional parameters as you like). If the function accepts a - single mandatory parameter, the device that activates will be passed as - that parameter. + single mandatory parameter, the device that activated will be passed + as that parameter. Set this property to `None` (the default) to disable the event. @@ -169,10 +169,10 @@ class WaitableInputDevice(InputDevice): inactive. This can be set to a function which accepts no (mandatory) parameters, - or a Python function which accepts a single mandatory parameter (which + or a Python function which accepts a single mandatory parameter (with as many optional parameters as you like). If the function accepts a - single mandatory parameter, the device the deactives will be passed as - that parameter. + single mandatory parameter, the device that deactivated will be + passed as that parameter. Set this property to `None` (the default) to disable the event.
Fix speling and grandma mistakes Several in WaitableInputDevice's attribute docstrings.