diff
stringlengths
65
26.7k
message
stringlengths
7
9.92k
diff --git a/lib/handlers.js b/lib/handlers.js index <HASH>..<HASH> 100644 --- a/lib/handlers.js +++ b/lib/handlers.js @@ -38,7 +38,6 @@ export const handlers = { list, listItem, text, - escape: text, // To do: remove next major linkReference: reference, imageReference: reference, table, @@ -56,10 +55,7 @@ const p = macro('P', '\n') * @returns {string} */ function textDecoration(enter, value, exit) { - // Previously, remark sometimes gave empty nodes. - /* c8 ignore next */ - const clean = String(value || '') - return '\\f' + enter + clean + '\\f' + exit + return '\\f' + enter + value + '\\f' + exit } /**
Remove ancient remark fallbacks
diff --git a/insights/specs/sos_archive.py b/insights/specs/sos_archive.py index <HASH>..<HASH> 100644 --- a/insights/specs/sos_archive.py +++ b/insights/specs/sos_archive.py @@ -92,6 +92,8 @@ class SosSpecs(Specs): 'sos_commands/general/subscription-manager_list_--installed'] ) sysctl = simple_file("sos_commands/kernel/sysctl_-a") + systemctl_list_unit_files = simple_file("sos_commands/systemd/systemctl_list-unit-files") + systemctl_list_units = simple_file("sos_commands/systemd/systemctl_list-units") uname = simple_file("sos_commands/kernel/uname_-a") uptime = simple_file("sos_commands/general/uptime") vgdisplay = simple_file("vgdisplay")
Copied simple file specs changes from insights_archive to sos_archive (#<I>)
diff --git a/actionpack/lib/action_dispatch/middleware/params_parser.rb b/actionpack/lib/action_dispatch/middleware/params_parser.rb index <HASH>..<HASH> 100644 --- a/actionpack/lib/action_dispatch/middleware/params_parser.rb +++ b/actionpack/lib/action_dispatch/middleware/params_parser.rb @@ -38,8 +38,6 @@ module ActionDispatch request.params_parsers = @parsers - request.request_parameters - @app.call(env) end end
stop eagerly parsing parameters Parameters will not be parsed until they are specifically requested via the `request_parameters` method.
diff --git a/dynect/client.go b/dynect/client.go index <HASH>..<HASH> 100644 --- a/dynect/client.go +++ b/dynect/client.go @@ -167,7 +167,7 @@ func (c *Client) Do(method, endpoint string, requestData, responseData interface switch resp.StatusCode { case 200: - if resp.ContentLength == 0 || resp.ContentLength == -1 { + if resp.ContentLength == 0 { // Zero-length content body? log.Println("dynect: warning: zero-length response body; skipping decoding of response") return nil
Remove resp.ContentLength == -1 check It looks like -1 this is valid in this situation, from the net.http docs: // ContentLength records the length of the associated content. The // value -1 indicates that the length is unknown. Unless Request.Method // is "HEAD", values >= 0 indicate that the given number of bytes may // be read from Body. ContentLength int<I> and the Dyn API isn't returning a COntent-Length header
diff --git a/src/structures/Guild.js b/src/structures/Guild.js index <HASH>..<HASH> 100644 --- a/src/structures/Guild.js +++ b/src/structures/Guild.js @@ -542,12 +542,12 @@ class Guild { * @example * // see how many members will be pruned * guild.pruneMembers(12, true) - * .then(pruned => console.log(`This will prune ${pruned} people!`); + * .then(pruned => console.log(`This will prune ${pruned} people!`)) * .catch(console.error); * @example * // actually prune the members * guild.pruneMembers(12) - * .then(pruned => console.log(`I just pruned ${pruned} people!`); + * .then(pruned => console.log(`I just pruned ${pruned} people!`)) * .catch(console.error); */ pruneMembers(days, dry = false) {
Fix erroneous docs examples (#<I>)
diff --git a/exemelopy/__version__.py b/exemelopy/__version__.py index <HASH>..<HASH> 100644 --- a/exemelopy/__version__.py +++ b/exemelopy/__version__.py @@ -1,4 +1,4 @@ __author__ = 'Phillip B Oldham' __author_email__ = 'phillip.oldham@gmail.com' -__version__ = '0.0.2' +__version__ = '0.0.3' __licence__ = 'MIT'
small version bump to reflect updates from FWRD
diff --git a/test/specs/modules/Search/Search-test.js b/test/specs/modules/Search/Search-test.js index <HASH>..<HASH> 100644 --- a/test/specs/modules/Search/Search-test.js +++ b/test/specs/modules/Search/Search-test.js @@ -462,7 +462,7 @@ describe('Search', () => { searchResultsIsOpen() // click outside - domEvent.click(document) + domEvent.click(document.body) searchResultsIsClosed() })
test(Search): fix tests on second run (#<I>)
diff --git a/backends/etcdv3/client.go b/backends/etcdv3/client.go index <HASH>..<HASH> 100644 --- a/backends/etcdv3/client.go +++ b/backends/etcdv3/client.go @@ -26,6 +26,11 @@ func NewEtcdClient(machines []string, cert, key, caCert string, basicAuth bool, DialTimeout: 5 * time.Second, } + if basicAuth { + cfg.Username = username + cfg.Password = password + } + tlsEnabled := false tlsConfig := &tls.Config{ InsecureSkipVerify: false,
support etcdv3 basicauth
diff --git a/pysyge/pysyge.py b/pysyge/pysyge.py index <HASH>..<HASH> 100644 --- a/pysyge/pysyge.py +++ b/pysyge/pysyge.py @@ -392,7 +392,7 @@ class GeoLocator: upon `detailed` flag state. """ - if type(ip) is str: + if isinstance(ip, str): seek = self._get_pos(ip) if seek > 0: return self._parse_location(seek, detailed=detailed)
Check type chaged for isinstance
diff --git a/partridge/utilities.py b/partridge/utilities.py index <HASH>..<HASH> 100644 --- a/partridge/utilities.py +++ b/partridge/utilities.py @@ -6,15 +6,6 @@ import pandas as pd from pandas.core.common import flatten -__all__ = [ - "detect_encoding", - "empty_df", - "lru_cache", - "remove_node_attributes", - "setwrap", -] - - def empty_df(columns=None): columns = [] if columns is None else columns empty = {col: [] for col in columns}
Remove __all__ import directive from utilities.py It's not necessary since we've moved functools lru_cache import in the last commit.
diff --git a/www/javascript/swat-calendar.js b/www/javascript/swat-calendar.js index <HASH>..<HASH> 100644 --- a/www/javascript/swat-calendar.js +++ b/www/javascript/swat-calendar.js @@ -532,6 +532,18 @@ SwatCalendar.prototype.draw = function() yyyy = yyyy + 1900; } + // sanity check. make sure the date is in the valid range + var display_date = new Date(yyyy, mm - 1, dd); + if (display_date < this.start_date) { + yyyy = this.start_date.getFullYear(); + mmm = this.start_date.getMonth() + 1; + dd = this.start_date.getDate(); + } else if (display_date >= this.end_date) { + yyyy = this.end_date.getFullYear(); + mm = this.end_date.getMonth() + 1; + dd = this.end_date.getDate(); + } + var new_date = new Date(yyyy, mm - 1, 1); var start_day = new_date.getDay();
Add sanity check to prevent drawing months outside the valid range. svn commit r<I>
diff --git a/src/Event/Event.php b/src/Event/Event.php index <HASH>..<HASH> 100644 --- a/src/Event/Event.php +++ b/src/Event/Event.php @@ -198,6 +198,10 @@ class Event extends EventSourcedAggregateRoot public function deleteTranslation( Language $language ) { + if (!array_key_exists($language->getCode(), $this->translations)) { + return; + } + $this->apply( new TranslationDeleted( new String($this->eventId),
III-<I>: Ensure translation removal of a translation that doesn't exist does not result in additional events
diff --git a/lib/weblib.php b/lib/weblib.php index <HASH>..<HASH> 100644 --- a/lib/weblib.php +++ b/lib/weblib.php @@ -1298,6 +1298,7 @@ function wikify_links($string) { function fix_non_standard_entities($string) { $text = preg_replace('/&#0*([0-9]+);?/', '&#$1;', $string); $text = preg_replace('/&#x0*([0-9a-fA-F]+);?/', '&#x$1;', $text); + $text = preg_replace('/\p{Cc}/u', ' ', $text); return $text; }
MDL-<I> fix invalid XML unicode characters when uses KSES filtering - credit goes to Jenny Gray
diff --git a/indra/tools/reading/util/__init__.py b/indra/tools/reading/util/__init__.py index <HASH>..<HASH> 100644 --- a/indra/tools/reading/util/__init__.py +++ b/indra/tools/reading/util/__init__.py @@ -0,0 +1,17 @@ +def get_s3_root(s3_base, job_queue="run_db_reading_queue"): + return s3_base + 'logs/%s/' % job_queue + + +def get_s3_job_prefix(s3_base, job_name, job_queue="run_db_reading_queue"): + s3_root = get_s3_root(s3_base, job_queue) + return s3_root + '%s/' % job_name + + +def get_s3_and_job_prefixes(base_name, group_name=None): + """Returns the s3 prefix and job prefix.""" + if not group_name: + s3_base = base_name + job_base = base_name + else: + s3_base, job_base = [group_name + d + base_name for d in ['/', '_']] + return 'reading_results/' + s3_base + '/', job_base
Move functions that regularize s3 naming into indra. These functions used to live in indra_db.
diff --git a/lib/faraday.rb b/lib/faraday.rb index <HASH>..<HASH> 100644 --- a/lib/faraday.rb +++ b/lib/faraday.rb @@ -14,7 +14,7 @@ require 'forwardable' # conn.get '/' # module Faraday - VERSION = "0.9.0.rc3" + VERSION = "0.9.0.rc4" class << self # Public: Gets or sets the root path that Faraday is being loaded from.
Release <I>.rc4
diff --git a/cmd/api-response.go b/cmd/api-response.go index <HASH>..<HASH> 100644 --- a/cmd/api-response.go +++ b/cmd/api-response.go @@ -24,10 +24,10 @@ import ( ) const ( - timeFormatAMZ = "2006-01-02T15:04:05.000Z" // Reply date format - maxObjectList = 1000 // Limit number of objects in a listObjectsResponse. - maxUploadsList = 1000 // Limit number of uploads in a listUploadsResponse. - maxPartsList = 1000 // Limit number of parts in a listPartsResponse. + timeFormatAMZ = "2006-01-02T15:04:05Z" // Reply date format + maxObjectList = 1000 // Limit number of objects in a listObjectsResponse. + maxUploadsList = 1000 // Limit number of uploads in a listUploadsResponse. + maxPartsList = 1000 // Limit number of parts in a listPartsResponse. ) // LocationResponse - format for location response.
api: Response timeFormat do not need to have nano-second precision. Fixes an error reported by s3verify.
diff --git a/lib/police_state.rb b/lib/police_state.rb index <HASH>..<HASH> 100644 --- a/lib/police_state.rb +++ b/lib/police_state.rb @@ -6,6 +6,7 @@ module PoliceState extend ActiveSupport::Concern included do + raise ArgumentError, "Including class must implement ActiveModel::Dirty" unless include?(ActiveModel::Dirty) extend HelperMethods end diff --git a/spec/police_state_spec.rb b/spec/police_state_spec.rb index <HASH>..<HASH> 100644 --- a/spec/police_state_spec.rb +++ b/spec/police_state_spec.rb @@ -1,7 +1,15 @@ require "spec_helper" RSpec.describe PoliceState do - it "is a kind of module" do - expect(PoliceState).to be_kind_of(Module) + describe "inclusion" do + context "when class does not include ActiveModel::Dirty" do + it "raises an ArgumentError" do + expect { + Class.new do + include PoliceState + end + }.to raise_error(ArgumentError) + end + end end end
Raises ArgumentError unless including class implements ActiveModel::Dirty
diff --git a/lib/mail/network/retriever_methods/imap.rb b/lib/mail/network/retriever_methods/imap.rb index <HASH>..<HASH> 100644 --- a/lib/mail/network/retriever_methods/imap.rb +++ b/lib/mail/network/retriever_methods/imap.rb @@ -36,7 +36,7 @@ module Mail # #=> Returns the first 10 emails in ascending order # class IMAP < Retriever - require 'net/imap' + require 'net/imap' unless defined?(Net::IMAP) def initialize(values) self.settings = { :address => "localhost", diff --git a/lib/mail/network/retriever_methods/pop3.rb b/lib/mail/network/retriever_methods/pop3.rb index <HASH>..<HASH> 100644 --- a/lib/mail/network/retriever_methods/pop3.rb +++ b/lib/mail/network/retriever_methods/pop3.rb @@ -32,7 +32,7 @@ module Mail # #=> Returns the first 10 emails in ascending order # class POP3 < Retriever - require 'net/pop' + require 'net/pop' unless defined?(Net::POP) def initialize(values) self.settings = { :address => "localhost",
Do not require Net::IMAP or Net::POP if they're already loaded
diff --git a/org/xbill/DNS/Rcode.java b/org/xbill/DNS/Rcode.java index <HASH>..<HASH> 100644 --- a/org/xbill/DNS/Rcode.java +++ b/org/xbill/DNS/Rcode.java @@ -33,6 +33,9 @@ public static final int NXDOMAIN = 3; /** The operation requested is not implemented */ public static final int NOTIMP = 4; +/** Deprecated synonym for NOTIMP. */ +public static final int NOTIMPL = 4; + /** The operation was refused by the server */ public static final int REFUSED = 5; @@ -78,6 +81,7 @@ static { rcodes.add(SERVFAIL, "SERVFAIL"); rcodes.add(NXDOMAIN, "NXDOMAIN"); rcodes.add(NOTIMP, "NOTIMP"); + rcodes.addAlias(NOTIMP, "NOTIMPL"); rcodes.add(REFUSED, "REFUSED"); rcodes.add(YXDOMAIN, "YXDOMAIN"); rcodes.add(YXRRSET, "YXRRSET");
Make NOTIMPL a synonym for NOTIMP, for compatibility. git-svn-id: <URL>
diff --git a/lib/common/constants.js b/lib/common/constants.js index <HASH>..<HASH> 100644 --- a/lib/common/constants.js +++ b/lib/common/constants.js @@ -22,7 +22,7 @@ function constantsFactory (path) { }, Logging: { Colors: { - critcal: 'red', + critical: 'red', error: 'red', warning: 'yellow', info: 'green',
Fix typo for logging.critical coloring constant
diff --git a/jayschema.js b/jayschema.js index <HASH>..<HASH> 100644 --- a/jayschema.js +++ b/jayschema.js @@ -118,14 +118,24 @@ JaySchema.prototype.getSchema = function(resolvedId) { // ****************************************************************** JaySchema._gatherRefs = function(obj) { var result = []; - var keys = Object.keys(obj); - if (obj.$ref) { result.push(obj.$ref); } - for (var index = 0, len = keys.length; index !== len; ++index) { - var key = keys[index]; - if (typeof obj[key] === 'object') { - result = result.concat(JaySchema._gatherRefs(obj[key])); + + var currentObj = obj; + var keys = Object.keys(currentObj); + var subObjects = []; + + do { + + if (currentObj.hasOwnProperty('$ref')) { result.push(currentObj.$ref); } + + for (var index = 0, len = keys.length; index !== len; ++index) { + var prop = currentObj[keys[index]]; + if (typeof prop === 'object') { subObjects.push(prop); } } - } + + currentObj = subObjects.pop(); + + } while(currentObj); + return result; };
make _gatherRefs non-recursive
diff --git a/src/BayesianModel/BayesianModel.py b/src/BayesianModel/BayesianModel.py index <HASH>..<HASH> 100644 --- a/src/BayesianModel/BayesianModel.py +++ b/src/BayesianModel/BayesianModel.py @@ -333,7 +333,7 @@ class BayesianModel(nx.DiGraph): Checks if all the states of node are present in state_list. If present returns True else returns False. """ - if sorted(states_list) == sorted(self.node[node]['_states']): + if sorted(states_list) == sorted([state['name'] for state in self.node[node]['_states']]): return True else: return False
correct _all_states_present_in_list function
diff --git a/src/Database/Traits/CamelCaseModel.php b/src/Database/Traits/CamelCaseModel.php index <HASH>..<HASH> 100644 --- a/src/Database/Traits/CamelCaseModel.php +++ b/src/Database/Traits/CamelCaseModel.php @@ -33,7 +33,7 @@ trait CamelCaseModel public function getAttribute($key) { if (method_exists($this, $key)) { - return $this->getRelationshipFromMethod($key); + return $this->getRelationValue($key); } return parent::getAttribute($this->getSnakeKey($key));
Fixed a bug that was causing problems with relationships
diff --git a/src/NodeCollection.php b/src/NodeCollection.php index <HASH>..<HASH> 100644 --- a/src/NodeCollection.php +++ b/src/NodeCollection.php @@ -499,6 +499,17 @@ class NodeCollection implements \IteratorAggregate, \Countable, \ArrayAccess { return $this; } + /** + * Apply callback on each element in the node collection. + * + * @param callable $callback Callback to apply on each element. + * @return $this + */ + public function each(callable $callback) { + array_walk($this->nodes, $callback); + return $this; + } + public function __clone() { $copy = []; foreach ($this->nodes as $node) {
Added each method to NodeCollection
diff --git a/helpers/copy.go b/helpers/copy.go index <HASH>..<HASH> 100644 --- a/helpers/copy.go +++ b/helpers/copy.go @@ -7,6 +7,8 @@ import ( ) func Copy(sourcePath, destinationPath string) { + Expect(sourcePath).NotTo(BeEmpty()) + Expect(destinationPath).NotTo(BeEmpty()) err := exec.Command("cp", "-a", sourcePath, destinationPath).Run() Expect(err).NotTo(HaveOccurred()) }
Add assertions to ensure source and destination aren't empty
diff --git a/lib/jsonapi/renderer/document.rb b/lib/jsonapi/renderer/document.rb index <HASH>..<HASH> 100644 --- a/lib/jsonapi/renderer/document.rb +++ b/lib/jsonapi/renderer/document.rb @@ -45,7 +45,7 @@ module JSONAPI def errors_hash {}.tap do |hash| - hash[:errors] = @errors.map(&:as_jsonapi) + hash[:errors] = @errors.flat_map(&:as_jsonapi) end end
Allow arrays of arrays of errors. (#<I>)
diff --git a/salt/state.py b/salt/state.py index <HASH>..<HASH> 100644 --- a/salt/state.py +++ b/salt/state.py @@ -583,6 +583,7 @@ class State(object): self.opts['grains'], self.opts['id'], self.opts['environment'], + pillar=self._pillar_override ) ret = pillar.compile_pillar() if self._pillar_override and isinstance(self._pillar_override, dict):
Make CLI pillar data available to HighState class instances
diff --git a/src/zoid/buttons/util.js b/src/zoid/buttons/util.js index <HASH>..<HASH> 100644 --- a/src/zoid/buttons/util.js +++ b/src/zoid/buttons/util.js @@ -88,20 +88,20 @@ export function applePaySession() : ?ApplePaySessionConfigRequest { listeners.validatemerchant({ validationURL: e.validationURL }); }; - session.onpaymentmethodselected = () => { - listeners.paymentmethodselected(); + session.onpaymentmethodselected = (e) => { + listeners.paymentmethodselected({ paymentMethod: e.paymentMethod }); }; - session.onshippingmethodselected = () => { - listeners.shippingmethodselected(); + session.onshippingmethodselected = (e) => { + listeners.shippingmethodselected({ shippingMethod: e.shippingMethod }); }; - session.onshippingcontactselected = () => { - listeners.shippingcontactselected(); + session.onshippingcontactselected = (e) => { + listeners.shippingcontactselected({ shippingContact: e.shippingContact }); }; session.onpaymentauthorized = (e) => { - listeners.paymentauthorized(e.payment); + listeners.paymentauthorized({ payment: e.payment }); }; session.oncancel = () => {
Update Apple Pay Events (#<I>)
diff --git a/src/Module.php b/src/Module.php index <HASH>..<HASH> 100644 --- a/src/Module.php +++ b/src/Module.php @@ -189,10 +189,6 @@ abstract class Module unset(self::$modules[$moduleClassName]); } - if ($module->namespace == "") { - throw new Exceptions\ImplementationException("The module " . get_class($module) . ' does not supply the $namespace property'); - } - self::$modules[$moduleClassName] = $module; }
As composer will be handling autoloading I removed the requirement for a module to define a namespace.
diff --git a/public_html/profiles/social/modules/social_features/social_post/src/Form/PostForm.php b/public_html/profiles/social/modules/social_features/social_post/src/Form/PostForm.php index <HASH>..<HASH> 100644 --- a/public_html/profiles/social/modules/social_features/social_post/src/Form/PostForm.php +++ b/public_html/profiles/social/modules/social_features/social_post/src/Form/PostForm.php @@ -8,6 +8,7 @@ namespace Drupal\social_post\Form; use Drupal\Core\Entity\ContentEntityForm; +use Drupal\Core\Entity\Entity\EntityFormDisplay; use Drupal\Core\Form\FormStateInterface; /** @@ -31,6 +32,14 @@ class PostForm extends ContentEntityForm { if (isset($display)) { $this->setFormDisplay($display, $form_state); } + else { + $visibility_value = $this->entity->get('field_visibility')->value; + $display_id = ($visibility_value === '0') ? 'post.post.profile' : 'post.post.default'; + $display = EntityFormDisplay::load($display_id); + // Set the custom display in the form. + $this->setFormDisplay($display, $form_state); + } + if (isset($display) && ($display_id = $display->get('id'))) { if ($display_id === 'post.post.default') { // Set default value to community.
DS-<I> by jochemvn: Set display id for visibility settings and fetch display from EntityFormDisplay
diff --git a/analyzere/resources.py b/analyzere/resources.py index <HASH>..<HASH> 100644 --- a/analyzere/resources.py +++ b/analyzere/resources.py @@ -66,8 +66,7 @@ class Treaty(EmbeddedResource): # Layers class Fee(EmbeddedResource): - def ref(self): - return {'ref': ['layer', 'fees', self.name]} + pass class FeeReference(EmbeddedResource): @@ -79,10 +78,6 @@ class FeeReference(EmbeddedResource): LOSSES = {'ref': ['layer', 'losses']} @staticmethod - def from_fee_name(fee_name): - return {'ref': ['layer', 'fees', fee_name]} - - @staticmethod def from_fee(fee): return {'ref': ['layer', 'fees', fee.name]}
Remove helper functions other than FeeReference.from_fee
diff --git a/message.go b/message.go index <HASH>..<HASH> 100644 --- a/message.go +++ b/message.go @@ -220,7 +220,7 @@ func (m *Message) LastEdited() time.Time { // IsForwarded says whether message is forwarded copy of another // message or not. func (m *Message) IsForwarded() bool { - return m.OriginalChat != nil + return m.OriginalSender != nil || m.OriginalChat != nil } // IsReply says whether message is a reply to another message.
fixed IsForwarded() reverts a tiny change from dbc2cd7f6, we need to check both fields because: - m.OriginalChat is nil when message is not forwarded from a channel - m.OriginalSender can be nil if the message is forwarded from a channel (doc: <URL>)
diff --git a/werkzeug/debug/shared/debugger.js b/werkzeug/debug/shared/debugger.js index <HASH>..<HASH> 100644 --- a/werkzeug/debug/shared/debugger.js +++ b/werkzeug/debug/shared/debugger.js @@ -185,11 +185,12 @@ function openShell(consoleNode, target, frameID) { var command = $('<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false">') .appendTo(form) .keydown(function(e) { - if (e.charCode == 100 && e.ctrlKey) { + if (e.key == 'l' && e.ctrlKey) { output.text('--- screen cleared ---'); return false; } else if (e.charCode == 0 && (e.keyCode == 38 || e.keyCode == 40)) { + // handle up arrow and down arrow if (e.keyCode == 38 && historyPos > 0) historyPos--; else if (e.keyCode == 40 && historyPos < history.length)
Clear Console with CtrlL
diff --git a/lib/statistrano/deployment/branches.rb b/lib/statistrano/deployment/branches.rb index <HASH>..<HASH> 100644 --- a/lib/statistrano/deployment/branches.rb +++ b/lib/statistrano/deployment/branches.rb @@ -24,13 +24,6 @@ module Statistrano config.post_deploy_task = "#{@name}:generate_index" end - # define certain things that an action - # depends on - # @return [Void] - def prepare_for_action - super - end - # output a list of the releases in manifest # @return [Void] def list_releases
rm redundant method in Deployment::Branches
diff --git a/src/main/java/com/phonedeck/gcm4j/DefaultGcm.java b/src/main/java/com/phonedeck/gcm4j/DefaultGcm.java index <HASH>..<HASH> 100644 --- a/src/main/java/com/phonedeck/gcm4j/DefaultGcm.java +++ b/src/main/java/com/phonedeck/gcm4j/DefaultGcm.java @@ -92,7 +92,6 @@ public class DefaultGcm implements Gcm { private static ObjectMapper createObjectMapper() { ObjectMapper objectMapper = new ObjectMapper(); objectMapper.setSerializationInclusion(Include.NON_DEFAULT); - objectMapper.enable(SerializationFeature.INDENT_OUTPUT); return objectMapper; }
Ensure whitespace is removed when marshalling to send to Gcm.
diff --git a/core/Plugin/Visualization.php b/core/Plugin/Visualization.php index <HASH>..<HASH> 100644 --- a/core/Plugin/Visualization.php +++ b/core/Plugin/Visualization.php @@ -445,12 +445,18 @@ class Visualization extends ViewDataTable continue; } + $valueToConvert = false; + if (property_exists($this->requestConfig, $name)) { - $javascriptVariablesToSet[$name] = $this->convertForJson($this->requestConfig->$name); + $valueToConvert = $this->requestConfig->$name; } else if (property_exists($this->config, $name)) { - $javascriptVariablesToSet[$name] = $this->convertForJson($this->config->$name); + $valueToConvert = $this->config->$name; } else if (property_exists($this, $name)) { - $javascriptVariablesToSet[$name] = $this->convertForJson($this->$name); + $valueToConvert = $this->$name; + } + + if (false !== $valueToConvert) { + $javascriptVariablesToSet[$name] = $this->convertForJson($valueToConvert); } }
do not send variables to client having value false
diff --git a/src/component/entity-form.js b/src/component/entity-form.js index <HASH>..<HASH> 100644 --- a/src/component/entity-form.js +++ b/src/component/entity-form.js @@ -1,5 +1,6 @@ -import {customElement, bindable} from 'aurelia-framework'; +import {customElement, bindable, computedFrom} from 'aurelia-framework'; import {resolvedView} from 'aurelia-view-manager'; +import {Metadata} from '../Metadata'; @resolvedView('spoonx/form', 'entity-form') @customElement('entity-form') @@ -11,18 +12,21 @@ export class EntityForm { @bindable skip = []; - attached() { - let types = this.entity.getMeta().metadata.types; + @computedFrom('entity') + get elements() { + let types = this.entity.getMeta().metadata.types; + let fields = Metadata.forTarget(this.entity).fetch('fields'); - this.elements = Object.keys(types).map(field => { + return Object.keys(types).map(field => { return { element: types[field], - field : field + field : field, + meta : fields[field] } }); } - isVisible (fieldName) { + isVisible(fieldName) { return this.skip.indexOf(fieldName) === -1; } }
refactor(entity-form): use metadata in form generation
diff --git a/lib/node.js b/lib/node.js index <HASH>..<HASH> 100644 --- a/lib/node.js +++ b/lib/node.js @@ -328,6 +328,24 @@ var node = module.exports = { }); }, + removeLabel: function(node, label, callback) { + if (Array.isArray(node)) { + var txn = this._safeBatch(); + async.map(node, naan.ncurry(txn.removeLabel, label, 1), callback); + return this._safeBatchCommit(txn); + } + + var id = this._getId(node); + if (!this._isValidId(id)) return callback(new Error("Invalid ID")); + + var endpoint = util.format('%s/labels/%s', this._nodeRoot(id), label); + var op = this.operation(endpoint, 'DELETE'); + this.call(op, function(err) { + if (err) callback(err); + else callback(); + }); + }, + nodesWithLabel: function(label, callback) { var endpoint = util.format('label/%s/nodes', label); var op = this.operation(endpoint, 'GET');
labels: implemented removing a label from a node
diff --git a/go/vt/vttest/vtprocess.go b/go/vt/vttest/vtprocess.go index <HASH>..<HASH> 100644 --- a/go/vt/vttest/vtprocess.go +++ b/go/vt/vttest/vtprocess.go @@ -221,6 +221,7 @@ func VtcomboProcess(env Environment, args *Config, mysql MySQLManager) *VtProces "-mycnf_server_id", "1", "-mycnf_socket_file", socket, "-normalize_queries", + "-enable_query_plan_field_caching=false", }...) vt.ExtraArgs = append(vt.ExtraArgs, QueryServerArgs...)
disable field caching in vttestserver
diff --git a/inotify_test.go b/inotify_test.go index <HASH>..<HASH> 100644 --- a/inotify_test.go +++ b/inotify_test.go @@ -332,6 +332,8 @@ func TestInotifyInnerMapLength(t *testing.T) { _ = <-w.Events // consume Remove event <-time.After(50 * time.Millisecond) // wait IN_IGNORE propagated + w.mu.Lock() + defer w.mu.Unlock() if len(w.watches) != 0 { t.Fatalf("Expected watches len is 0, but got: %d, %v", len(w.watches), w.watches) }
inotify: fix race in test
diff --git a/paginationlinks/templatetags/pagination_links.py b/paginationlinks/templatetags/pagination_links.py index <HASH>..<HASH> 100644 --- a/paginationlinks/templatetags/pagination_links.py +++ b/paginationlinks/templatetags/pagination_links.py @@ -1,8 +1,15 @@ +import django from django import template register = template.Library() +if django.VERSION >= (1, 9): + assignment_tag = register.simple_tag +else: + assignment_tag = register.assignment_tag + + class PageNumber(object): def __init__(self, number, current): # We're given zero indexed numbers @@ -20,7 +27,7 @@ class PageNumber(object): return self.number is None -@register.assignment_tag +@assignment_tag def get_pagination_links(paginator, page_obj, on_each_side=1, on_ends=1): page_num = page_obj.number - 1
Avoid assignment_tag warning in Django <I>
diff --git a/src/mesh/geometry/Geometry.js b/src/mesh/geometry/Geometry.js index <HASH>..<HASH> 100644 --- a/src/mesh/geometry/Geometry.js +++ b/src/mesh/geometry/Geometry.js @@ -1,4 +1,5 @@ import Attribute from './Attribute'; +import Buffer from './Buffer'; import GeometryStyle from './GeometryStyle'; import GeometryData from './GeometryData'; @@ -16,14 +17,32 @@ class Geometry addAttribute(id, buffer, size = 2, stride = 0, start = 0, normalised = false) { + // check if this is a buffer! + if(!buffer.data) + { + // its an array! + buffer = new Buffer(buffer); + } + this.style.addAttribute(id, new Attribute(buffer.id, size, stride, start, normalised)); this.data.add(buffer.id, buffer); return this; } + getAttribute(id) + { + return this.data[ this.style.attributes[id].buffer ]; + } + addIndex(buffer) { + if(!buffer.data) + { + // its an array! + buffer = new Buffer(buffer); + } + this.data.addIndex(buffer); return this;
create the buffer automatically is an array is passed
diff --git a/src/Result/AllPlayersResult.php b/src/Result/AllPlayersResult.php index <HASH>..<HASH> 100644 --- a/src/Result/AllPlayersResult.php +++ b/src/Result/AllPlayersResult.php @@ -1,6 +1,8 @@ <?php namespace MiniGame\Result; -interface AllPlayersResult +use MiniGame\GameResult; + +interface AllPlayersResult extends GameResult { }
all players result is a game result
diff --git a/settings.py b/settings.py index <HASH>..<HASH> 100644 --- a/settings.py +++ b/settings.py @@ -27,4 +27,4 @@ class git(): repo_prefix = 'git@github.com:' repo_suffix = 'mit-probabilistic-computing-project/tabular-predDB.git' repo = repo_prefix + repo_suffix - branch = 'multinomial-integration' + branch = 'master'
default branch to user on server is master
diff --git a/src/ui.js b/src/ui.js index <HASH>..<HASH> 100644 --- a/src/ui.js +++ b/src/ui.js @@ -105,10 +105,15 @@ base.exportTo('ui', function() { return el; } - // f.name is not directly writable. So make it writable anyway. - Object.defineProperty( - f, 'name', - {value: tagName, writable: false, configurable: false}); + try { + // f.name is not directly writable. So make it writable anyway. + Object.defineProperty( + f, 'name', + {value: tagName, writable: false, configurable: false}); + } catch (e) { + // defineProperty throws a TypeError about name already being defined + // although, it also correctly sets the value to tagName. + } /** * Decorates an element as a UI element class.
Handle type error on Object.defineProperty. Calling the defineProperty for f.name is causing a 'TypeError: Cannot redefine property: name' error to be thrown when running chrome://tracing. This CL catches and ignores the error as it appears that the value is correclty begin set. BUG= R=<EMAIL> Review URL: <URL>
diff --git a/purell.go b/purell.go index <HASH>..<HASH> 100644 --- a/purell.go +++ b/purell.go @@ -43,7 +43,7 @@ const ( FlagSortQuery // http://host/path?c=3&b=2&a=1&b=1 -> http://host/path?a=1&b=1&b=2&c=3 // Normalizations not in the wikipedia article, required to cover tests cases - // submitted by jehiah (not included in any convenience set at the moment) + // submitted by jehiah FlagDecodeDWORDHost // http://1113982867 -> http://66.102.7.147 FlagDecodeOctalHost // http://0102.0146.07.0223 -> http://66.102.7.147 FlagDecodeHexHost // http://0x42660793 -> http://66.102.7.147
fix comment for newer flags, now included in FlagsAll*
diff --git a/test/hobo/env_test.rb b/test/hobo/env_test.rb index <HASH>..<HASH> 100644 --- a/test/hobo/env_test.rb +++ b/test/hobo/env_test.rb @@ -24,16 +24,17 @@ class EnvTest < Test::Unit::TestCase assert_equal file, Hobo::Env::CONFIG.keys.first { :setting => 1 } end - assert_equal Hobo::Config.settings.setting, 1 + assert_equal Hobo::Config.settings.setting, 1 end end - #TODO Expectations will fail if .hobo dir is present def dir_expectations + File.expects(:exists?).times(Hobo::Env::ENSURE[:dirs].length).returns(false) Dir.expects(:mkdir).times(Hobo::Env::ENSURE[:dirs].length).returns nil end def file_expectations + File.expects(:exists?).times(Hobo::Env::ENSURE[:files].length).returns(false) File.expects(:copy).times(Hobo::Env::ENSURE[:files].length) end end
Fixed hobo dir tests to work even if the dir is already present
diff --git a/code/RegistryImportFeed.php b/code/RegistryImportFeed.php index <HASH>..<HASH> 100644 --- a/code/RegistryImportFeed.php +++ b/code/RegistryImportFeed.php @@ -67,6 +67,10 @@ class RegistryImportFeed_Entry extends ViewableData { } class RegistryImportFeed_Controller extends Controller { + private static $allowed_actions = array( + 'latest' + ); + public static $url_handlers = array( '$Action/$ModelClass' => 'handleAction', );
BUGFIX: Add allowed_actions to RegistryImportFeed_Controller (fixes CWPBUG-<I>)
diff --git a/cmd/format/format.go b/cmd/format/format.go index <HASH>..<HASH> 100644 --- a/cmd/format/format.go +++ b/cmd/format/format.go @@ -29,6 +29,9 @@ var directory = new(string) // map holds all of the filenames and a count to account for duplicates var filenameCount = make(map[string]int) +// characters to strip from the output file name (these are mostly non-permitted windows chars) +var stripChars = [9]string{"\\", "\"", "/", ":", "*", "?","<",">","|"} + // Parse arguments from the command line. // To run the script: "go run format.go -f filename -d directory" func parseArgs() int { @@ -81,6 +84,11 @@ func applyNamingConv(file []byte, filename string) error { name += "_" + strconv.Itoa(filenameCount[name]) } + //Strip any invalid chars from the name + for _,char := range stripChars { + name = strings.Replace(name, char, "_", -1) + } + // Finally, rename the file err = os.Rename(*directory+"/"+filename, *directory+"/"+name+".crt") if err != nil {
Strip chars from the filename for certs that are not allowed on windows
diff --git a/impact_functions/core.py b/impact_functions/core.py index <HASH>..<HASH> 100644 --- a/impact_functions/core.py +++ b/impact_functions/core.py @@ -178,7 +178,7 @@ def requirement_check(params, require_str, verbose=False): msg = ('Error in plugin requirements' 'Must not use Python keywords as params: %s' % (key)) #print msg - logger.error(msg) + #logger.error(msg) return False if key in excluded_keywords: @@ -205,7 +205,7 @@ def requirement_check(params, require_str, verbose=False): msg = ('Requirements header could not compiled: %s. ' 'Original message: %s' % (execstr, e)) #print msg - logger.error(msg) + #logger.error(msg) return False
Commented logging out - until we get it to work properly
diff --git a/kernel/classes/eznodeviewfunctions.php b/kernel/classes/eznodeviewfunctions.php index <HASH>..<HASH> 100644 --- a/kernel/classes/eznodeviewfunctions.php +++ b/kernel/classes/eznodeviewfunctions.php @@ -320,7 +320,16 @@ class eZNodeviewfunctions { // $contents = $cacheFile->fetchContents(); $contents = file_get_contents( $file ); - $Result = unserialize( $contents ); + $Result = @unserialize( $contents ); + + // This should only happen when : + // - the node does not exists + // - the object does not exists + // - the node / object are not readable / invisible + if( !$Result ) + { + $cacheExpired = true; + } // Check if cache has expired when cache_ttl is set $cacheTTL = isset( $Result['cache_ttl'] ) ? $Result['cache_ttl'] : -1; @@ -459,4 +468,4 @@ class eZNodeviewfunctions } } -?> \ No newline at end of file +?>
- Fixed a bug with ezfs2 and permission system # When we access a node that is not readable the cache # file generation was lost git-svn-id: file:///home/patrick.allaert/svn-git/ezp-repo/ezpublish/trunk@<I> a<I>eee8c-daba-<I>-acae-fa<I>f<I>
diff --git a/packages/ember-runtime/lib/mixins/promise_proxy.js b/packages/ember-runtime/lib/mixins/promise_proxy.js index <HASH>..<HASH> 100644 --- a/packages/ember-runtime/lib/mixins/promise_proxy.js +++ b/packages/ember-runtime/lib/mixins/promise_proxy.js @@ -34,7 +34,7 @@ function tap(proxy, promise) { } /** - A low level mixin making ObjectProxy, ObjectController or ArrayController's promise aware. + A low level mixin making ObjectProxy, ObjectController or ArrayControllers promise-aware. ```javascript var ObjectPromiseController = Ember.ObjectController.extend(Ember.PromiseProxyMixin);
[DOC release] Fix tiny grammar mistakes in Ember.PromiseProxy docs
diff --git a/heron/statemgrs/src/python/zkstatemanager.py b/heron/statemgrs/src/python/zkstatemanager.py index <HASH>..<HASH> 100644 --- a/heron/statemgrs/src/python/zkstatemanager.py +++ b/heron/statemgrs/src/python/zkstatemanager.py @@ -93,6 +93,11 @@ class ZkStateManager(StateManager): ret["result"] = data try: + # Ensure the topology path exists. If a topology has never been deployed + # then the path will not exist so create it and don't crash. + # (fixme) add a watch instead of creating the path? + self.client.ensure_path(self.get_topologies_path()) + self._get_topologies_with_watch(callback, isWatching) except NoNodeError: self.client.stop()
[ISSUE-<I>] fix tracker crash when zk root topologies path does not … (#<I>) * [ISSUE-<I>] fix tracker crash when zk root topologies path does not exist. * Fix checksytle.
diff --git a/image.go b/image.go index <HASH>..<HASH> 100644 --- a/image.go +++ b/image.go @@ -310,7 +310,7 @@ func (i *Image) drawImage(img *Image, options *DrawImageOptions) { } vs := src.QuadVertices(0, 0, w, h, 0.5, 0, 0, 0.5, 0, 0, 1, 1, 1, 1) is := graphicsutil.QuadIndices() - s.DrawImage(src, vs, is, options.ColorM.impl, opengl.CompositeModeCopy, graphics.FilterLinear) + s.DrawImage(src, vs, is, nil, opengl.CompositeModeCopy, graphics.FilterLinear) img.shareableImages = append(img.shareableImages, s) w = w2 h = h2
graphics: Bug fix: don't apply color matrix when creating mipmap images TODO: Add tests. Fixes #<I>
diff --git a/src/test/java/net/snowflake/client/jdbc/PreparedStatementIT.java b/src/test/java/net/snowflake/client/jdbc/PreparedStatementIT.java index <HASH>..<HASH> 100644 --- a/src/test/java/net/snowflake/client/jdbc/PreparedStatementIT.java +++ b/src/test/java/net/snowflake/client/jdbc/PreparedStatementIT.java @@ -1462,12 +1462,7 @@ public class PreparedStatementIT extends BaseJDBCTest connection.close(); } - /** - * Ensures binding a string type with TIMESTAMP_TZ works. The customer - * has to use the specific timestamp format: - * YYYY-MM-DD HH24:MI:SS.FF9 TZH:TZM - */ - //@Test + @Test public void testTableFuncBindInput() throws SQLException { int[] countResult; @@ -1479,6 +1474,11 @@ public class PreparedStatementIT extends BaseJDBCTest connection.close(); } + /** + * Ensures binding a string type with TIMESTAMP_TZ works. The customer + * has to use the specific timestamp format: + * YYYY-MM-DD HH24:MI:SS.FF9 TZH:TZM + */ @Test @ConditionalIgnore(condition = RunningOnTravisCI.class) public void testBindTimestampTZViaStringBatch() throws SQLException
SNOW-<I>: Test for Support bind variable in row generator table function. The fix is in the server
diff --git a/sdk/monitor/azure-monitor-query/azure/monitor/query/aio/_metrics_query_client_async.py b/sdk/monitor/azure-monitor-query/azure/monitor/query/aio/_metrics_query_client_async.py index <HASH>..<HASH> 100644 --- a/sdk/monitor/azure-monitor-query/azure/monitor/query/aio/_metrics_query_client_async.py +++ b/sdk/monitor/azure-monitor-query/azure/monitor/query/aio/_metrics_query_client_async.py @@ -29,7 +29,7 @@ class MetricsQueryClient(object): """MetricsQueryClient :param credential: The credential to authenticate the client - :type credential: ~azure.core.credentials.TokenCredential + :type credential: ~azure.core.credentials_async.AsyncTokenCredential :keyword endpoint: The endpoint to connect to. Defaults to 'https://management.azure.com'. :paramtype endpoint: str """
Replace TokenCredential reference with AsyncTokenCredential (#<I>)
diff --git a/lib/kaminari/helpers/paginator.rb b/lib/kaminari/helpers/paginator.rb index <HASH>..<HASH> 100644 --- a/lib/kaminari/helpers/paginator.rb +++ b/lib/kaminari/helpers/paginator.rb @@ -80,8 +80,8 @@ module Kaminari # It is threadsafe, but might not repress logging # consistently in a high-load environment if subscriber - class << subscriber - unless defined?(render_partial_with_logging) + unless defined? subscriber.render_partial_with_logging + class << subscriber alias_method :render_partial_with_logging, :render_partial attr_accessor :render_without_logging # ugly hack to make a renderer where @@ -100,7 +100,6 @@ module Kaminari else super @window_options.merge(@options).merge :paginator => self end - end # Wraps a "page number" and provides some utility methods
Ask if defined? against the instance. And don't open it if doing nothing
diff --git a/packages/blueprint/lib/Application.js b/packages/blueprint/lib/Application.js index <HASH>..<HASH> 100644 --- a/packages/blueprint/lib/Application.js +++ b/packages/blueprint/lib/Application.js @@ -248,6 +248,7 @@ Application.prototype.start = function (callback) { * @param callback */ Application.prototype.restart = function (callback) { + this._messaging.emit ('app.restart', this); this._appRestart.signalAndWait (callback); };
Forgot to emit app.restart event
diff --git a/src/Monarkee/Bumble/BumbleServiceProvider.php b/src/Monarkee/Bumble/BumbleServiceProvider.php index <HASH>..<HASH> 100644 --- a/src/Monarkee/Bumble/BumbleServiceProvider.php +++ b/src/Monarkee/Bumble/BumbleServiceProvider.php @@ -20,10 +20,19 @@ class BumbleServiceProvider extends ServiceProvider { */ public function boot() { + // Register the default configuration config(['bumble' => require __DIR__.'/../../config/config.php']); + // Publish the config files and public assets + $this->publishes([ + __DIR__.'/../../config/config.php' => config_path('bumble.php'), + __DIR__.'/../../../public/' => public_path().'/packages/monarkee/bumble', + ]); + + // Register the default views $this->loadViewsFrom('bumble', __DIR__ . '/../../views/'); + // Include custom Bumble configuration include __DIR__ . '/../../filters.php'; include __DIR__ . '/../../validation.php'; include __DIR__ . '/../../helpers.php';
Update service provider to publish config and public assets
diff --git a/sanic/base.py b/sanic/base.py index <HASH>..<HASH> 100644 --- a/sanic/base.py +++ b/sanic/base.py @@ -11,7 +11,7 @@ from sanic.mixins.routes import RouteMixin from sanic.mixins.signals import SignalMixin -VALID_NAME = re.compile(r"^[a-zA-Z][a-zA-Z0-9_\-]*$") +VALID_NAME = re.compile(r"^[a-zA-Z_][a-zA-Z0-9_\-]*$") class BaseSanic(
Allow underscore to start instance names (#<I>)
diff --git a/activesupport/test/ts_isolated.rb b/activesupport/test/ts_isolated.rb index <HASH>..<HASH> 100644 --- a/activesupport/test/ts_isolated.rb +++ b/activesupport/test/ts_isolated.rb @@ -1,6 +1,7 @@ $:.unshift(File.dirname(__FILE__) + '/../../activesupport/lib') require 'test/unit' +require 'active_support/test_case' require 'rbconfig' require 'active_support/core_ext/kernel/reporting'
Require ActiveSupport::TestCase form ActiveSupport isolation tests
diff --git a/lib/terraforming/cli.rb b/lib/terraforming/cli.rb index <HASH>..<HASH> 100644 --- a/lib/terraforming/cli.rb +++ b/lib/terraforming/cli.rb @@ -28,6 +28,11 @@ module Terraforming execute(Terraforming::Resource::ElastiCacheCluster, options) end + desc "ecsn", "ElastiCache Subnet Group" + def ecsn + execute(Terraforming::Resource::ElastiCacheSubnetGroup, options) + end + desc "elb", "ELB" def elb execute(Terraforming::Resource::ELB, options) diff --git a/spec/lib/terraforming/cli_spec.rb b/spec/lib/terraforming/cli_spec.rb index <HASH>..<HASH> 100644 --- a/spec/lib/terraforming/cli_spec.rb +++ b/spec/lib/terraforming/cli_spec.rb @@ -60,6 +60,13 @@ module Terraforming it_behaves_like "CLI examples" end + describe "ecsn" do + let(:klass) { Terraforming::Resource::ElastiCacheSubnetGroup } + let(:command) { :ecsn } + + it_behaves_like "CLI examples" + end + describe "elb" do let(:klass) { Terraforming::Resource::ELB } let(:command) { :elb }
Define CLI command ecsn for ElastiCacheSubnetGroup
diff --git a/wfdb/io/download.py b/wfdb/io/download.py index <HASH>..<HASH> 100644 --- a/wfdb/io/download.py +++ b/wfdb/io/download.py @@ -300,12 +300,13 @@ def get_record_list(db_dir, records='all'): # Check for a RECORDS file if records == 'all': - response = requests.get(posixpath.join(db_url, 'RECORDS')) - if response.status_code == 404: + try: + content = _get_url(posixpath.join(db_url, 'RECORDS')) + except FileNotFoundError: raise ValueError('The database %s has no WFDB files to download' % db_url) # Get each line as a string - record_list = response.content.decode('ascii').splitlines() + record_list = content.decode('ascii').splitlines() # Otherwise the records are input manually else: record_list = records
get_record_list: use _get_url in place of requests.get. Note that this will handle errors (e.g. a file that we are not authorized to access) and raise an exception, rather than trying to parse the error document. Previously, <I> errors were handled, but other types of errors were not.
diff --git a/Command/GenerateRepositoriesDoctrineODMCommand.php b/Command/GenerateRepositoriesDoctrineODMCommand.php index <HASH>..<HASH> 100644 --- a/Command/GenerateRepositoriesDoctrineODMCommand.php +++ b/Command/GenerateRepositoriesDoctrineODMCommand.php @@ -51,7 +51,7 @@ EOT if ($metadatas = $this->getBundleMetadatas($foundBundle)) { $output->writeln(sprintf('Generating document repositories for "<info>%s</info>"', $foundBundle->getName())); $generator = new DocumentRepositoryGenerator(); - + foreach ($metadatas as $metadata) { if ($filterDocument && $filterDocument !== $metadata->reflClass->getShortname()) { continue; diff --git a/DataCollector/DoctrineMongoDBDataCollector.php b/DataCollector/DoctrineMongoDBDataCollector.php index <HASH>..<HASH> 100644 --- a/DataCollector/DoctrineMongoDBDataCollector.php +++ b/DataCollector/DoctrineMongoDBDataCollector.php @@ -18,7 +18,7 @@ use Symfony\Component\HttpFoundation\Response; /** * Data collector for the Doctrine MongoDB ODM. - * + * * @author Kris Wallsmith <kris.wallsmith@symfony.com> */ class DoctrineMongoDBDataCollector extends DataCollector
removed empty lines/trailing spaces
diff --git a/src/main/java/org/camunda/bpm/model/xml/test/AbstractModelElementInstanceTest.java b/src/main/java/org/camunda/bpm/model/xml/test/AbstractModelElementInstanceTest.java index <HASH>..<HASH> 100644 --- a/src/main/java/org/camunda/bpm/model/xml/test/AbstractModelElementInstanceTest.java +++ b/src/main/java/org/camunda/bpm/model/xml/test/AbstractModelElementInstanceTest.java @@ -146,6 +146,9 @@ public abstract class AbstractModelElementInstanceTest { modelInstance = modelElementTypeRule.getModelInstance(); model = modelElementTypeRule.getModel(); modelElementType = modelElementTypeRule.getModelElementType(); + assertThat(modelInstance).isNotNull(); + assertThat(model).isNotNull(); + assertThat(modelElementType).isNotNull(); } public abstract String getDefaultNamespace();
chore(test): ensure model element instance test was correctly setup
diff --git a/src/components/TransactionalBehavior.php b/src/components/TransactionalBehavior.php index <HASH>..<HASH> 100644 --- a/src/components/TransactionalBehavior.php +++ b/src/components/TransactionalBehavior.php @@ -13,7 +13,8 @@ use yii\db\Transaction; /** * Class TransactionalBehavior - * @package vr\core\components + * @package vr\core\components] + * @deprecated */ class TransactionalBehavior extends ActionFilter {
Make TransactionalBehavior deprecated because it was moved to voodoo-rocks/yii2-api
diff --git a/testsuite/manualmode/src/test/java/org/jboss/as/test/manualmode/logging/Log4jAppenderTestCase.java b/testsuite/manualmode/src/test/java/org/jboss/as/test/manualmode/logging/Log4jAppenderTestCase.java index <HASH>..<HASH> 100644 --- a/testsuite/manualmode/src/test/java/org/jboss/as/test/manualmode/logging/Log4jAppenderTestCase.java +++ b/testsuite/manualmode/src/test/java/org/jboss/as/test/manualmode/logging/Log4jAppenderTestCase.java @@ -55,13 +55,15 @@ public class Log4jAppenderTestCase extends AbstractLoggingTestCase { private static final ModelNode CUSTOM_HANDLER_ADDRESS = createAddress("custom-handler", CUSTOM_HANDLER_NAME); private static final ModelNode ROOT_LOGGER_ADDRESS = createAddress("root-logger", "ROOT"); - private final Path logFile = getAbsoluteLogFilePath(FILE_NAME); + private Path logFile; @Before public void startContainer() throws Exception { // Start the server container.start(); + logFile = getAbsoluteLogFilePath(FILE_NAME); + final CompositeOperationBuilder builder = CompositeOperationBuilder.create(); // Create the custom handler
[WFCORE-<I>] Ensure the server has been started before executing operations.
diff --git a/lib/config/babel.js b/lib/config/babel.js index <HASH>..<HASH> 100644 --- a/lib/config/babel.js +++ b/lib/config/babel.js @@ -6,10 +6,10 @@ module.exports = function (webpackConfig) { let babelConfig = { cacheDirectory: tmpDir, presets: [ + // https://segmentfault.com/a/1190000006930013 // http://leonshi.com/2016/03/16/babel6-es6-inherit-issue-in-ie10/ [require.resolve('babel-preset-es2015'), { - loose: true, - modules: false // tree-shaking优化, http://imweb.io/topic/5868e1abb3ce6d8e3f9f99bb + //modules: false // tree-shaking优化, http://imweb.io/topic/5868e1abb3ce6d8e3f9f99bb }], require.resolve('babel-preset-react'), require.resolve('babel-preset-stage-1')
refactor: improve babel config No longer support ie8
diff --git a/raiden/ui/cli.py b/raiden/ui/cli.py index <HASH>..<HASH> 100644 --- a/raiden/ui/cli.py +++ b/raiden/ui/cli.py @@ -290,12 +290,13 @@ def run(ctx, **kwargs): app_ = ctx.invoke(app, **kwargs) - app_.discovery.register( + # spawn address registration to avoid block while waiting for the next block + registry_event = gevent.spawn( + app_.discovery.register, app_.raiden.address, mapped_socket.external_ip, mapped_socket.external_port, ) - app_.raiden.register_registry(app_.raiden.chain.default_registry.address) domain_list = [] @@ -330,6 +331,7 @@ def run(ctx, **kwargs): console = Console(app_) console.start() + registry_event.join() # wait for interrupt event = gevent.event.Event() gevent.signal(signal.SIGQUIT, event.set)
Do not block during startup (#<I>) As address/socket pair registration requires confirmation of the tx, polling until it appears in the next block introduces a delay until other services/cli can be started. This fix spawns a separate gevent for the registration to speed up the startup.
diff --git a/CHANGES.txt b/CHANGES.txt index <HASH>..<HASH> 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,2 +1,7 @@ Change Log ========== + +v0.1 (2014-02-17) +----------------- + +* Initial release. diff --git a/docs/conf.py b/docs/conf.py index <HASH>..<HASH> 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -55,7 +55,7 @@ copyright = '2014, Thomas Roten' # The short X.Y version. version = '0.1' # The full version, including alpha/beta/rc tags. -release = '0.1dev' +release = '0.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ with open('README.rst') as f: setup( name='dragonmapper', - version='0.1dev', + version='0.1', author='Thomas Roten', author_email='thomas@roten.us', url='https://github.com/tsroten/dragonmapper',
Bumps version to <I>.
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setup script from setuptools import setup, find_packages -_VERSION = '0.1.3' +_VERSION = '0.2' setup( name='jut-tools',
bumping to <I> to see if pypi and pip behave correctly
diff --git a/src/Drivers/Baidu/BaiduResponse.php b/src/Drivers/Baidu/BaiduResponse.php index <HASH>..<HASH> 100644 --- a/src/Drivers/Baidu/BaiduResponse.php +++ b/src/Drivers/Baidu/BaiduResponse.php @@ -31,9 +31,16 @@ class BaiduResponse implements ResponseInterface */ public function __get($name) { + + if (array_key_exists($name, $this->data)) { return $this->data[$name]; } + + if (array_key_exists($name, $this->data['result'])) { + return $this->data['result'][$name]; + } + throw new Exception('property not exist'); } @@ -66,6 +73,9 @@ class BaiduResponse implements ResponseInterface */ public function toArray() { + if (isset($this->data['result'])) { + $this->data['result']; + } return $this->data; }
add a knid access to response
diff --git a/app_generators/ahn/ahn_generator.rb b/app_generators/ahn/ahn_generator.rb index <HASH>..<HASH> 100644 --- a/app_generators/ahn/ahn_generator.rb +++ b/app_generators/ahn/ahn_generator.rb @@ -37,6 +37,9 @@ class AhnGenerator < RubiGen::Base m.file *["components/disabled/restful_rpc/example-client.rb"]*2 m.file *["components/disabled/restful_rpc/spec/restful_rpc_spec.rb"]*2 + m.file *["components/disabled/sandbox/config.yml"]*2 + m.file *["components/disabled/sandbox/sandbox.rb"]*2 + m.file *["config/startup.rb"]*2 m.file *["dialplan.rb"]*2 m.file *["events.rb"]*2 @@ -80,6 +83,7 @@ EOS BASEDIRS = %w( components/simon_game components/disabled/stomp_gateway + components/disabled/sandbox components/ami_remote components/disabled/restful_rpc/spec config
Adding the sandbox component to all new Adhearsion apps (initially disabled)
diff --git a/image.go b/image.go index <HASH>..<HASH> 100644 --- a/image.go +++ b/image.go @@ -494,6 +494,9 @@ func (i *Image) DrawTriangles(vertices []Vertex, indices []uint16, img *Image, o } // TODO: Implement this. + if img.isSubImage() { + panic("using a subimage at DrawTriangles is not implemented") + } if i.isSubimage() { panic("render to a subimage is not implemented") }
graphics: Forbid using a subimage at DrawTriangles (#<I>)
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -23,6 +23,7 @@ setup( "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3 :: Only", ], python_requires='>=3.7',
Add official support for Python <I>
diff --git a/lib/hyrax/transactions/transaction.rb b/lib/hyrax/transactions/transaction.rb index <HASH>..<HASH> 100644 --- a/lib/hyrax/transactions/transaction.rb +++ b/lib/hyrax/transactions/transaction.rb @@ -42,6 +42,9 @@ module Hyrax # @example unwapping values safely with handling for failures # tx.call(change_set).value_or { |failure| "uh oh: #{failure} } # + # @example when there is no need to unwrap the value, handle errors with `#or` + # tx.call(change_set).or { |failure| "uh oh: #{failure} } + # # @example a pattern for subclassing to create new transactions # class CustomTransaction < Transaction # DEFAULT_STEPS = ['step.1', 'step.2', 'step.3'].freeze
Add documentation for `Result#or` to transaction This use of `#or` is likely to be a common pattern in controllers, where we often won't care to unwrap a newly saved value (instead redirecting to an index-driven page), but want to handle errors carefully.
diff --git a/server_status/__init__.py b/server_status/__init__.py index <HASH>..<HASH> 100644 --- a/server_status/__init__.py +++ b/server_status/__init__.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- # pylint: disable=missing-docstring -__version__ = '0.3.0' # pragma: no cover +__version__ = '0.3.1' # pragma: no cover diff --git a/server_status/views.py b/server_status/views.py index <HASH>..<HASH> 100644 --- a/server_status/views.py +++ b/server_status/views.py @@ -138,7 +138,7 @@ def get_celery_info(): if not celery_stats: log.error("No running Celery workers were found.") return {"status": DOWN, "message": "No running Celery workers"} - except IOError as exp: + except Exception as exp: # pylint: disable=broad-except log.error("Error connecting to the backend: %s", exp) return {"status": DOWN, "message": "Error connecting to the backend"} return {"status": UP, "response_microseconds": (datetime.now() - start).microseconds}
Catch all exceptions during celery requests.
diff --git a/visidata/sheets.py b/visidata/sheets.py index <HASH>..<HASH> 100644 --- a/visidata/sheets.py +++ b/visidata/sheets.py @@ -236,7 +236,7 @@ class TableSheet(BaseSheet): return type(self)._rowtype() def openRow(self, row): - k = self.rowkey(row) or [self.cursorRowIndex] + k = self.keystr(row) or [self.cursorRowIndex] name = f'{self.name}[{k}]' return vd.load_pyobj(name, tuple(c.getTypedValue(row) for c in self.visibleCols))
[openrow-] fix missed parm
diff --git a/structr-ui/src/main/resources/structr/js/command.js b/structr-ui/src/main/resources/structr/js/command.js index <HASH>..<HASH> 100644 --- a/structr-ui/src/main/resources/structr/js/command.js +++ b/structr-ui/src/main/resources/structr/js/command.js @@ -474,7 +474,7 @@ var Command = { var data = {}; data.localStorageString = JSON.stringify(localStorage); obj.data = data; - log('saveLocalStorage()', obj); + //log('saveLocalStorage()', obj); return sendObj(obj, callback); }, /**
Don't log localStorage for performance reasons.
diff --git a/cloudvolume/storage/storage.py b/cloudvolume/storage/storage.py index <HASH>..<HASH> 100644 --- a/cloudvolume/storage/storage.py +++ b/cloudvolume/storage/storage.py @@ -13,7 +13,7 @@ from tqdm import tqdm from cloudvolume import compression from cloudvolume.exceptions import UnsupportedProtocolError -from cloudvolume.lib import mkdir, scatter, jsonify, duplicates, yellow +from cloudvolume.lib import mkdir, scatter, jsonify, duplicates, yellow, red from cloudvolume.threaded_queue import ThreadedQueue, DEFAULT_THREADS from cloudvolume.scheduler import schedule_green_jobs @@ -56,8 +56,10 @@ class StorageBase(object): self._interface_cls = get_interface_class(self._path.protocol) if not WARNING_PRINTED: - print(yellow( - "Storage is deprecated. Please use CloudFiles instead. See https://github.com/seung-lab/cloud-files" + print(red( + "Storage is obsolete and will be removed soon! " + "Update your code to use CloudFiles instead. " + "See https://github.com/seung-lab/cloud-files" )) WARNING_PRINTED = True
deprecate: mark storage as obsolete
diff --git a/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/parser/XmlParserR4Test.java b/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/parser/XmlParserR4Test.java index <HASH>..<HASH> 100644 --- a/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/parser/XmlParserR4Test.java +++ b/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/parser/XmlParserR4Test.java @@ -195,13 +195,6 @@ public class XmlParserR4Test { String encoded = ourCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(o); ourLog.info(encoded); - FhirContext - .forR4() - .newRestfulGenericClient("http://hapi.fhir.org/baseR4") - .create() - .resource(o) - .execute(); - assertThat(encoded, containsString("<comment value=\"123&#xa;456\"/>")); o = ourCtx.newXmlParser().parseResource(Observation.class, encoded);
Remove dependency on public test server in unit test
diff --git a/woocommerce/api.py b/woocommerce/api.py index <HASH>..<HASH> 100644 --- a/woocommerce/api.py +++ b/woocommerce/api.py @@ -56,7 +56,7 @@ class API(object): url = self.__get_url(endpoint) auth = None headers = { - "user-agent": "WooCommerce API Client-Node.js/%s" % __version__, + "user-agent": "WooCommerce API Client-Python/%s" % __version__, "content-type": "application/json;charset=utf-8", "accept": "application/json" }
Changed user-agent from Node.js to Python
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/SessionClusterEntrypoint.java b/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/SessionClusterEntrypoint.java index <HASH>..<HASH> 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/SessionClusterEntrypoint.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/SessionClusterEntrypoint.java @@ -60,6 +60,7 @@ public abstract class SessionClusterEntrypoint extends ClusterEntrypoint { this); dispatcher = createDispatcher( + configuration, rpcService, highAvailabilityServices, blobServer, @@ -106,6 +107,7 @@ public abstract class SessionClusterEntrypoint extends ClusterEntrypoint { } protected Dispatcher createDispatcher( + Configuration configuration, RpcService rpcService, HighAvailabilityServices highAvailabilityServices, BlobServer blobServer, @@ -117,6 +119,7 @@ public abstract class SessionClusterEntrypoint extends ClusterEntrypoint { return new StandaloneDispatcher( rpcService, Dispatcher.DISPATCHER_NAME, + configuration, highAvailabilityServices, blobServer, heartbeatServices,
[FLINK-<I>] [flip-6] Pass in proper configuration to Dispatcher component This closes #<I>.
diff --git a/tests/src/Phossa2/Storage/StorageTest.php b/tests/src/Phossa2/Storage/StorageTest.php index <HASH>..<HASH> 100644 --- a/tests/src/Phossa2/Storage/StorageTest.php +++ b/tests/src/Phossa2/Storage/StorageTest.php @@ -551,11 +551,10 @@ class StorageTest extends \PHPUnit_Framework_TestCase // put $this->assertTrue($this->object->put('/b1/bingo1', 'wow1')); $this->assertTrue($this->object->put('/b1/b2/bingo2', 'wow2')); - $this->assertTrue($this->object->put('/b3', 'wow3')); + //$this->assertTrue($this->object->put('/b3', 'wow3')); // move, directory overwrite file is ok $this->assertTrue($this->object->move('/b1', '/b3')); - usleep(20000); $this->assertFalse($this->object->has('/b1/bingo1')); $this->assertFalse($this->object->has('/b1/b2/bingo2'));
rename a dir to a file is not OK
diff --git a/lib/ghtorrent/command.rb b/lib/ghtorrent/command.rb index <HASH>..<HASH> 100644 --- a/lib/ghtorrent/command.rb +++ b/lib/ghtorrent/command.rb @@ -52,7 +52,11 @@ class Command command.go rescue => e STDERR.puts e.message - STDERR.puts e.backtrace.join("\n") if command.options.verbose + if command.options.verbose + STDERR.puts e.backtrace.join("\n") + else + STDERR.puts e.backtrace[0] + end exit 1 end end
Print error location when not in verbose mode
diff --git a/lang/en/moodle.php b/lang/en/moodle.php index <HASH>..<HASH> 100644 --- a/lang/en/moodle.php +++ b/lang/en/moodle.php @@ -1398,6 +1398,7 @@ $string['rss'] = 'RSS'; $string['rssarticles'] = 'Number of RSS recent articles'; $string['rsserror'] = 'Error reading RSS data'; $string['rsserrorauth'] = 'Your RSS link does not contain a valid authentication token.'; +$string['rsserrorguest'] = 'This feed uses guest access to access the data, but guest does not have permission to read the data. Visit the original location that this feed comes from (URL) as a valid user and get a new RSS link from there.'; $string['rsstype'] = 'RSS feed for this activity'; $string['saveandnext'] = 'Save and show next'; $string['savedat'] = 'Saved at:';
rss MDL-<I> added some support for <I> rss feed requests
diff --git a/test/suite.js b/test/suite.js index <HASH>..<HASH> 100644 --- a/test/suite.js +++ b/test/suite.js @@ -21,13 +21,25 @@ describe('new Client()', function() { }); describe('#_uploadGeneratePath()', function() { - it('should return an avaiable path', function(done) { + it('should return avaiable path', function(done) { + client._uploadPathIsAvailable = function(path, cb) { return cb(null, true); }; client._uploadGeneratePath(function(err, path) { assert.ifError(err); assert(/^[A-Za-z0-9]{2}\/[A-Za-z0-9]{2}\/[A-Za-z0-9]{2}$/.test(path)); done(); }); }); + + it('should retry if selected path is not avaiable', function(done) { + var i = 0; + client._uploadPathIsAvailable = function(path, cb) { return cb(null, (++i === 5)); }; + client._uploadGeneratePath(function(err, path) { + assert.ifError(err); + assert.equal(i, 5); + assert(/^[A-Za-z0-9]{2}\/[A-Za-z0-9]{2}\/[A-Za-z0-9]{2}$/.test(path)); + done(); + }); + }); }); });
Add test spies and test retry functionality
diff --git a/arctic/generics.py b/arctic/generics.py index <HASH>..<HASH> 100755 --- a/arctic/generics.py +++ b/arctic/generics.py @@ -273,10 +273,16 @@ class ListView(View, base.ListView): else: name = field_name try: - item['label'] = find_field_meta( + field_meta = find_field_meta( model, field_name - ).verbose_name + ) + if field_meta._verbose_name: # noqa + # explicitly set on the model, so don't change + item['label'] = field_meta._verbose_name # noqa + else: + # title-case the field name (issue #80) + item['label'] = field_meta.verbose_name.title() # item['label'] = model._meta.get_field(field_name).\ # verbose_name
Title-case field names in headers, unless a verbose name is set explicitly.
diff --git a/i3pystatus/core/modules.py b/i3pystatus/core/modules.py index <HASH>..<HASH> 100644 --- a/i3pystatus/core/modules.py +++ b/i3pystatus/core/modules.py @@ -107,7 +107,7 @@ class Module(SettingsBase): if cb is not "run": getattr(self, cb)(*args) else: - execute(cb, *args) + execute(cb, detach=True) return True def move(self, position):
Module: External programs are launched in detached mode.
diff --git a/mungers/submit-queue.go b/mungers/submit-queue.go index <HASH>..<HASH> 100644 --- a/mungers/submit-queue.go +++ b/mungers/submit-queue.go @@ -394,6 +394,7 @@ func (sq *SubmitQueue) AddFlags(cmd *cobra.Command, config *github.Config) { "kubernetes-e2e-gce", "kubernetes-e2e-gce-slow", "kubernetes-e2e-gce-serial", + "kubernetes-e2e-gke-serial", "kubernetes-e2e-gke", "kubernetes-e2e-gke-slow", "kubernetes-e2e-gce-scalability",
add gke-serial into the list
diff --git a/lib/command/CommandClient.js b/lib/command/CommandClient.js index <HASH>..<HASH> 100644 --- a/lib/command/CommandClient.js +++ b/lib/command/CommandClient.js @@ -230,6 +230,7 @@ class CommandClient extends Client { throw new Error("You have already registered a command for " + label); } options = options || {}; + label = options.caseInsensitive === true ? label.toLowerCase() : label; for(var key in this.commandOptions.defaultCommandOptions) { if(options[key] === undefined) { options[key] = this.commandOptions.defaultCommandOptions[key];
Fix insensitive command label option (#<I>)
diff --git a/src/components/TabbedCard/TabbedCard.react.js b/src/components/TabbedCard/TabbedCard.react.js index <HASH>..<HASH> 100644 --- a/src/components/TabbedCard/TabbedCard.react.js +++ b/src/components/TabbedCard/TabbedCard.react.js @@ -1 +1,17 @@ // @flow + +import * as React from "react"; + +import Card from "../Card/Card.react"; + +type Props = {||}; + +type State = {||}; + +class TabbedCard extends React.PureComponent<Props, State> { + render(): React.Node { + return <Card />; + } +} + +export default TabbedCard;
Added default TabbedCard as basic card.
diff --git a/hagelslag/processing/TrackModeler.py b/hagelslag/processing/TrackModeler.py index <HASH>..<HASH> 100644 --- a/hagelslag/processing/TrackModeler.py +++ b/hagelslag/processing/TrackModeler.py @@ -86,8 +86,8 @@ class TrackModeler(object): self.data[mode]["step"] = self.data[mode]["step"].fillna(value=0) self.data[mode]["step"] = self.data[mode]["step"].replace([np.inf, -np.inf], 0) - if mode == "forecast": - self.data[mode]["step"] = self.data[mode]["step"].drop_duplicates("Step_ID") + if mode == "forecast": + self.data[mode]["step"] = self.data[mode]["step"].drop_duplicates("Step_ID") self.data[mode]["member"] = pd.read_csv(self.member_files[mode]) self.data[mode]["combo"] = pd.merge(self.data[mode]["step"], self.data[mode]["total"],
Changed "train" mode to create "member"
diff --git a/client.go b/client.go index <HASH>..<HASH> 100644 --- a/client.go +++ b/client.go @@ -35,7 +35,6 @@ var ErrAlreadyConnecting = errors.New("already connecting") var ErrNotConnected = errors.New("not connected") var ErrMissingClientID = errors.New("missing client id") var ErrConnectionDenied = errors.New("connection denied") -var ErrInvalidPacketType = errors.New("invalid packet type") var ErrMissingPong = errors.New("missing pong") var ErrUnexpectedClose = errors.New("unexpected close") @@ -427,8 +426,7 @@ func (c *Client) processor() error { case packet.PUBREL: err = c.processPubrel(pkt.(*packet.PubrelPacket).PacketID) default: - // die on an invalid packet type - return c.die(ErrInvalidPacketType, true) + // ignore unsupported packet types } // return eventual error
do not raise error if there was an unsupported packet type
diff --git a/src/de/triplet/simpleprovider/AbstractProvider.java b/src/de/triplet/simpleprovider/AbstractProvider.java index <HASH>..<HASH> 100644 --- a/src/de/triplet/simpleprovider/AbstractProvider.java +++ b/src/de/triplet/simpleprovider/AbstractProvider.java @@ -73,7 +73,11 @@ public abstract class AbstractProvider extends ContentProvider { public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) { final SelectionBuilder builder = buildBaseQuery(uri); - return builder.where(selection, selectionArgs).query(mDatabase, projection, sortOrder); + final Cursor cursor = builder.where(selection, selectionArgs).query(mDatabase, projection, sortOrder); + if (cursor != null) { + cursor.setNotificationUri(getContext().getContentResolver(), uri); + } + return cursor; } private final SelectionBuilder buildBaseQuery(Uri uri) {
Set notification uri before returning the cursor to get notified about changes
diff --git a/devassistant/command_helpers.py b/devassistant/command_helpers.py index <HASH>..<HASH> 100644 --- a/devassistant/command_helpers.py +++ b/devassistant/command_helpers.py @@ -179,7 +179,7 @@ class ZenityHelper(object): c_zenity = 'zenity' @classmethod - def ask_for_password(cls, title, text='Enter password:', input_type='entry', options=[]): + def ask_for_password(cls, title, text='\"Enter password:\"', input_type='entry', options=["--hide-text"]): return cls.ask_for_custom_input(title, text, input_type, options) @classmethod
Text in case of password has not to be visible
diff --git a/script/prerelease.js b/script/prerelease.js index <HASH>..<HASH> 100755 --- a/script/prerelease.js +++ b/script/prerelease.js @@ -24,7 +24,6 @@ github.repos.getReleases({owner: 'electron', repo: 'electron'}) const draft = drafts[0] check(draft.tag_name === `v${pkg.version}`, `draft release version matches local package.json (v${pkg.version})`) - check(draft.prerelease, 'draft is a prerelease') check(draft.body.length > 50 && !draft.body.includes('(placeholder)'), 'draft has release notes') const requiredAssets = assetsForVersion(draft.tag_name).sort()
remove the condition where release draft has to have a `prerelease` flag
diff --git a/chef/lib/chef/provider/deploy.rb b/chef/lib/chef/provider/deploy.rb index <HASH>..<HASH> 100644 --- a/chef/lib/chef/provider/deploy.rb +++ b/chef/lib/chef/provider/deploy.rb @@ -273,7 +273,6 @@ class Chef links_info = @new_resource.symlinks.map { |src, dst| "#{src} => #{dst}" }.join(", ") @new_resource.symlinks.each do |src, dest| - create_dir_unless_exists(::File.join(@new_resource.shared_path, src)) begin FileUtils.ln_sf(::File.join(@new_resource.shared_path, src), ::File.join(release_path, dest)) rescue => e
CHEF-<I>: do not create directories for links
diff --git a/classes/meta_box.class.php b/classes/meta_box.class.php index <HASH>..<HASH> 100644 --- a/classes/meta_box.class.php +++ b/classes/meta_box.class.php @@ -153,7 +153,7 @@ class Cuztom_Meta_Box extends Cuztom_Meta if( $field->show_column ) $columns[$id_name] = $field->label; } - $columns['date'] = __( 'Date', 'cuztom' ); + $columns['date'] = __( 'Date' ); return $columns; }
Removes cuztom text domain from 'Date' WordPress already 'Date' already.
diff --git a/motor/core.py b/motor/core.py index <HASH>..<HASH> 100644 --- a/motor/core.py +++ b/motor/core.py @@ -129,8 +129,7 @@ class AgnosticClient(AgnosticBaseProperties): else: io_loop = self._framework.get_event_loop() - # For Synchro's sake, add undocumented "_connect" option, default False. - kwargs['connect'] = kwargs.pop('_connect', False) + kwargs.setdefault('connect', False) delegate = self.__delegate_class__(*args, **kwargs) super(AgnosticBaseProperties, self).__init__(delegate) diff --git a/synchro/__init__.py b/synchro/__init__.py index <HASH>..<HASH> 100644 --- a/synchro/__init__.py +++ b/synchro/__init__.py @@ -291,7 +291,7 @@ class MongoClient(Synchro): self.delegate = kwargs.pop('delegate', None) # Motor passes connect=False by default. - kwargs.setdefault('_connect', True) + kwargs.setdefault('connect', True) if not self.delegate: self.delegate = self.__delegate_class__(host, port, *args, **kwargs)
PyMongo 3 renamed _connect to connect.