diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/test/commands_test.rb b/test/commands_test.rb
index <HASH>..<HASH> 100644
--- a/test/commands_test.rb
+++ b/test/commands_test.rb
@@ -51,4 +51,28 @@ class CommandsTest < TestCase
assert cmds[:default].verbose?
end
+ test "on/global and default all return newly created slop instances" do
+ assert_kind_of Slop, @commands.on('foo')
+ assert_kind_of Slop, @commands.default
+ assert_kind_of Slop, @commands.global
+ end
+
+ test "parse does nothing when there's nothing to parse" do
+ assert @commands.parse []
+ end
+
+ test "parse returns the original array of items" do
+ items = %w( foo bar baz )
+ assert_equal items, @commands.parse(items)
+
+ items = %w( new --force )
+ assert_equal items, @commands.parse(items)
+ end
+
+ test "parse! removes options/arguments" do
+ items = %w( new --outdir foo )
+ @commands.parse!(items)
+ assert_equal [], items
+ end
+
end
\ No newline at end of file
|
more tests for Slop::Commands
|
diff --git a/src/component/table.js b/src/component/table.js
index <HASH>..<HASH> 100644
--- a/src/component/table.js
+++ b/src/component/table.js
@@ -37,6 +37,7 @@ angular.module('ngTasty.component.table', [
templateUrl: 'template/table/pagination.html',
listItemsPerPage: [5, 25, 50, 100],
itemsPerPage: 5,
+ listFilters: ['filter'],
watchResource: 'reference'
})
.controller('TableController', function($scope, $attrs, $filter, tableConfig, tastyUtil) {
@@ -88,6 +89,7 @@ angular.module('ngTasty.component.table', [
this.config[key] = tableConfig[key];
}
}, this);
+ tableConfig = this.config;
} else {
this.config = tableConfig;
}
@@ -299,7 +301,9 @@ angular.module('ngTasty.component.table', [
}
}
if ($attrs.bindFilters) {
- $scope.rows = $filter('filter')($scope.rows, $scope.filters, $scope.filtersComparator);
+ tableConfig.listFilters.forEach(function (filter) {
+ $scope.rows = $filter(filter)($scope.rows, $scope.filters, $scope.filtersComparator);
+ });
}
if ($scope.paginationDirective) {
$scope.pagination.count = $scope.params.count;
|
Adding listFilters as config params #<I>
|
diff --git a/client/manager_sql.go b/client/manager_sql.go
index <HASH>..<HASH> 100644
--- a/client/manager_sql.go
+++ b/client/manager_sql.go
@@ -58,7 +58,7 @@ type SQLManager struct {
}
type sqlData struct {
- PK int `db:"pk"`
+ PK int64 `db:"pk"`
ID string `db:"id"`
Name string `db:"client_name"`
Secret string `db:"client_secret"`
|
client: Change pk field to int<I> (#<I>)
Changed PK from int to int<I>, ran make test with no issues.
Closes #<I>
|
diff --git a/changes.go b/changes.go
index <HASH>..<HASH> 100644
--- a/changes.go
+++ b/changes.go
@@ -153,11 +153,14 @@ func (c *pollChangeManager) getChanges(changesUri *url.URL) error {
scopes := findScopesForId(apidInfo.ClusterID)
v := url.Values{}
+ blockValue := block
/* Sequence added to the query if available */
if lastSequence != "" {
v.Add("since", lastSequence)
+ } else {
+ blockValue = "0"
}
- v.Add("block", block)
+ v.Add("block", blockValue)
/*
* Include all the scopes associated with the config Id
@@ -258,6 +261,12 @@ func (c *pollChangeManager) getChanges(changesUri *url.URL) error {
log.Panic("Timeout. Plugins failed to respond to changes.")
case <-events.Emit(ApigeeSyncEventSelector, &resp):
}
+ } else if lastSequence == "" {
+ select {
+ case <-time.After(httpTimeout):
+ log.Panic("Timeout. Plugins failed to respond to changes.")
+ case <-events.Emit(ApigeeSyncEventSelector, &resp):
+ }
} else {
log.Debugf("No Changes detected for Scopes: %s", scopes)
}
|
[ISSUE-<I>] after receiving a new snapshot, send the 1st changelist request with "block=0" (#<I>)
|
diff --git a/terraform/terraform_test.go b/terraform/terraform_test.go
index <HASH>..<HASH> 100644
--- a/terraform/terraform_test.go
+++ b/terraform/terraform_test.go
@@ -1067,7 +1067,7 @@ STATE:
const testTerraformPlanComputedMultiIndexStr = `
DIFF:
-CREATE: aws_instance.bar
+CREATE: aws_instance.bar.0
foo: "" => "<computed>"
type: "" => "aws_instance"
CREATE: aws_instance.foo.0
@@ -1146,7 +1146,7 @@ DIFF:
CREATE: aws_instance.bar
foo: "" => "foo"
type: "" => "aws_instance"
-CREATE: aws_instance.foo
+CREATE: aws_instance.foo.0
foo: "" => "foo"
type: "" => "aws_instance"
|
core: Context plan tests update for "count" behavior change
The behavior of the "count" meta-argument has changed so that its presence
(rather than its value) chooses whether the associated resource has
indexes. As a consequence, these tests which set count = 1 now produce
a single indexed instance with index 0.
|
diff --git a/course/lib.php b/course/lib.php
index <HASH>..<HASH> 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -2067,7 +2067,12 @@ function print_category_info($category, $depth, $showcourses = false) {
$catlinkcss = $category->visible ? '' : ' class="dimmed" ';
- $coursecount = $DB->count_records('course') <= FRONTPAGECOURSELIMIT;
+ static $coursecount = null;
+ if (null === $coursecount) {
+ // only need to check this once
+ $coursecount = $DB->count_records('course') <= FRONTPAGECOURSELIMIT;
+ }
+
if ($showcourses and $coursecount) {
$catimage = '<img src="'.$CFG->pixpath.'/i/course.gif" alt="" />';
} else {
|
MDL-<I> cache superfluous queries when listing categories on front page
|
diff --git a/tests/test_data.py b/tests/test_data.py
index <HASH>..<HASH> 100755
--- a/tests/test_data.py
+++ b/tests/test_data.py
@@ -44,12 +44,12 @@ class DeloreanTests(TestCase):
def test_initialize_with_tzinfo_generic(self):
self.aware_dt_generic = datetime(2013, 1, 3, 4, 31, 14, 148546, tzinfo=generic_utc)
do = delorean.Delorean(datetime=self.aware_dt_generic)
- self.assertIsInstance(do, delorean.Delorean)
+ self.assertTrue(type(do) is delorean.Delorean)
def test_initialize_with_tzinfo_pytz(self):
self.aware_dt_pytz = datetime(2013, 1, 3, 4, 31, 14, 148546, tzinfo=utc)
do = delorean.Delorean(datetime=self.aware_dt_pytz)
- self.assertIsInstance(do, delorean.Delorean)
+ self.assertTrue(type(do) is delorean.Delorean)
def test_truncation_hour(self):
self.do.truncate('hour')
|
Changed assertIsInstance to assertTrue for backwards compatability.
|
diff --git a/github/tests/Issue131.py b/github/tests/Issue131.py
index <HASH>..<HASH> 100644
--- a/github/tests/Issue131.py
+++ b/github/tests/Issue131.py
@@ -32,7 +32,7 @@ class Issue131(Framework.TestCase): # https://github.com/jacquev6/PyGithub/pull
for pull in self.repo.get_pulls('closed'):
if pull.number == 204:
user = pull.head.user
- self.assertIsNone(user)
+ self.assertEqual(user, None)
# Should be:
# self.assertEqual(user.login, 'imcf')
# self.assertEqual(user.type, 'Organization')
|
Fix unit tests on Python <= <I>
|
diff --git a/examples/webapp/.bitbundler.js b/examples/webapp/.bitbundler.js
index <HASH>..<HASH> 100644
--- a/examples/webapp/.bitbundler.js
+++ b/examples/webapp/.bitbundler.js
@@ -3,6 +3,7 @@ module.exports = {
dest: "dist/index.js",
loader: [
+ envReplace("production"),
"bit-loader-cache",
"bit-loader-sourcemaps",
"bit-loader-babel",
@@ -19,3 +20,11 @@ module.exports = {
// "bit-bundler-extractsm"
]
};
+
+function envReplace(value) {
+ return {
+ transform: (meta) => ({
+ source: meta.source.replace(/process\.env\.NODE_ENV/g, JSON.stringify(value))
+ })
+ };
+}
|
added a small inline loader plugin to handle production builds
|
diff --git a/test/intervaltree_test.py b/test/intervaltree_test.py
index <HASH>..<HASH> 100644
--- a/test/intervaltree_test.py
+++ b/test/intervaltree_test.py
@@ -94,7 +94,7 @@ def test_duplicate_insert():
assert len(tree) == 2
assert tree.items() == contents
- tree.extend([Interval(-10, 20)])
+ tree.extend([Interval(-10, 20), Interval(-10, 20, "arbitrary data")])
assert len(tree) == 2
assert tree.items() == contents
|
made last duplicate insert test be extend() for multiple dups
|
diff --git a/packages/ember-metal/lib/watching.js b/packages/ember-metal/lib/watching.js
index <HASH>..<HASH> 100644
--- a/packages/ember-metal/lib/watching.js
+++ b/packages/ember-metal/lib/watching.js
@@ -430,6 +430,9 @@ Ember.watch = function(obj, keyName) {
if (!watching[keyName]) {
watching[keyName] = 1;
if (isKeyName(keyName)) {
+ desc = m.descs[keyName];
+ if (desc && desc.willWatch) { desc.willWatch(obj, keyName); }
+
if ('function' === typeof obj.willWatchProperty) {
obj.willWatchProperty(keyName);
}
@@ -454,12 +457,15 @@ Ember.unwatch = function(obj, keyName) {
// can't watch length on Array - it is special...
if (keyName === 'length' && Ember.typeOf(obj) === 'array') { return this; }
- var watching = metaFor(obj).watching;
+ var m = metaFor(obj), watching = m.watching, desc;
if (watching[keyName] === 1) {
watching[keyName] = 0;
if (isKeyName(keyName)) {
+ desc = m.descs[keyName];
+ if (desc && desc.didUnwatch) { desc.didUnwatch(obj, keyName); }
+
if ('function' === typeof obj.didUnwatchProperty) {
obj.didUnwatchProperty(keyName);
}
|
add hook for desc for willWatch and didUnwatch
|
diff --git a/molo/core/api/importers.py b/molo/core/api/importers.py
index <HASH>..<HASH> 100644
--- a/molo/core/api/importers.py
+++ b/molo/core/api/importers.py
@@ -342,16 +342,6 @@ class SiteImporter(object):
nested_fields["time"]):
page.time = json.dumps(nested_fields["time"])
- # section_tags/nav_tags
- # list -> ["tag"]["id"]
- # -> Need to fetch and create the nav tags
- # THEN create the link between page and nav_tag
- if (("section_tags" in nested_fields) and
- nested_fields["section_tags"]):
- self.section_tags[page.id] = []
- for section_tag in nested_fields["section_tags"]:
- self.section_tags[page.id].append(
- section_tag["tag"]["id"])
# nav_tags
# list -> ["tag"]["id"]
|
Fail tests by removing adding section tag functionality
|
diff --git a/dialogue.js b/dialogue.js
index <HASH>..<HASH> 100644
--- a/dialogue.js
+++ b/dialogue.js
@@ -227,7 +227,7 @@ Dialogue.prototype.applyCss = function(event) {
// bring it back in plus 50px padding
if ((cssSettings.left + event.data.$dialogue.width()) > frame.width) {
cssSettings.left = frame.width - 50;
- cssSettings.left = cssSettings.left - event.data.$dialogue.width();
+ cssSettings.left = cssSettings.left - cssSettings['max-width'];
};
// no positional element so center to window
|
bug with left positioning when outside of viewport
|
diff --git a/boards.js b/boards.js
index <HASH>..<HASH> 100644
--- a/boards.js
+++ b/boards.js
@@ -44,7 +44,7 @@ module.exports = {
pageSize: 128,
numPages: 256,
timeout: 400,
- productId: ['0x6001'],
+ productId: ['0x6001', '0x7523'],
protocol: 'stk500v1'
},
'duemilanove168': {
|
Updated nano with Pid as well
|
diff --git a/lib/bmc-daemon-lib/logger_helper.rb b/lib/bmc-daemon-lib/logger_helper.rb
index <HASH>..<HASH> 100644
--- a/lib/bmc-daemon-lib/logger_helper.rb
+++ b/lib/bmc-daemon-lib/logger_helper.rb
@@ -32,11 +32,11 @@ module BmcDaemonLib
def log severity, message, details
return puts "LoggerHelper.log: missing logger (#{get_class_name})" unless logger
# puts "LoggerHelper.log > #{message}"
- # puts "LoggerHelper.log > #{get_full_context.inspect}"
- logger.add severity, message, get_full_context, details
+ # puts "LoggerHelper.log > #{full_context.inspect}"
+ logger.add severity, message, full_context, details
end
- def get_full_context
+ def full_context
# Grab the classe's context
context = log_context()
|
logger helper: rename method
|
diff --git a/spec/unit/active_admin_spec.rb b/spec/unit/active_admin_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/unit/active_admin_spec.rb
+++ b/spec/unit/active_admin_spec.rb
@@ -36,9 +36,5 @@ describe ActiveAdmin do
it "should have a default current_user_method" do
ActiveAdmin.current_user_method.should == :current_admin_user
end
-
- it "should have a default authentication method" do
- ActiveAdmin.authentication_method.should == :authenticate_admin_user!
- end
end
diff --git a/spec/unit/admin_notes_controller_spec.rb b/spec/unit/admin_notes_controller_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/unit/admin_notes_controller_spec.rb
+++ b/spec/unit/admin_notes_controller_spec.rb
@@ -18,11 +18,13 @@ describe ActiveAdmin::AdminNotes::NotesController do
end
end
+ # TODO: Update to work with new authentication scheme
context "when admin user set" do
it "should add the current Admin User to a new Admin Note" do
- ActiveAdmin.current_user_method = :current_admin_user
- controller.should_receive(:assign_admin_note_to_current_admin_user)
- do_create
+ pending
+ #ActiveAdmin.current_user_method = :current_admin_user
+ #controller.should_receive(:assign_admin_note_to_current_admin_user)
+ #do_create
end
end
end
|
Marked a couple specs as pending until authentication is finished
|
diff --git a/src/read/nodejs.js b/src/read/nodejs.js
index <HASH>..<HASH> 100644
--- a/src/read/nodejs.js
+++ b/src/read/nodejs.js
@@ -1,5 +1,6 @@
/**
* @file NodeJS read implementation
+ * @since 0.2.6
*/
/*#ifndef(UMD)*/
"use strict";
|
Documentation (#<I>)
|
diff --git a/src/net/sf/mpxj/primavera/PrimaveraReader.java b/src/net/sf/mpxj/primavera/PrimaveraReader.java
index <HASH>..<HASH> 100644
--- a/src/net/sf/mpxj/primavera/PrimaveraReader.java
+++ b/src/net/sf/mpxj/primavera/PrimaveraReader.java
@@ -620,7 +620,8 @@ final class PrimaveraReader
Date endDate = row.getDate("act_end_date") == null ? row.getDate("reend_date") : row.getDate("act_end_date");
task.setFinish(endDate);
- populateField(task, TaskField.WORK, TaskField.BASELINE_WORK, TaskField.ACTUAL_WORK);
+ Duration work = Duration.add(task.getActualWork(), task.getRemainingWork(), m_project.getProjectProperties());
+ task.setWork(work);
// Add User Defined Fields
List<Row> taskUDF = getTaskUDF(uniqueID, udfVals);
|
Fix calculation of Primavera task work field.
|
diff --git a/flask_apscheduler/auth.py b/flask_apscheduler/auth.py
index <HASH>..<HASH> 100644
--- a/flask_apscheduler/auth.py
+++ b/flask_apscheduler/auth.py
@@ -17,7 +17,21 @@
import base64
from flask import request
-from werkzeug.http import bytes_to_wsgi, wsgi_to_bytes
+
+
+def wsgi_to_bytes(data):
+ """coerce wsgi unicode represented bytes to real ones"""
+ if isinstance(data, bytes):
+ return data
+ return data.encode("latin1") # XXX: utf8 fallback?
+
+
+def bytes_to_wsgi(data):
+ assert isinstance(data, bytes), "data must be bytes"
+ if isinstance(data, str):
+ return data
+ else:
+ return data.decode("latin1")
def get_authorization_header():
|
add functions that were removed in werkszeug.
for #<I>
|
diff --git a/config.php b/config.php
index <HASH>..<HASH> 100644
--- a/config.php
+++ b/config.php
@@ -2,8 +2,5 @@
return [
'showCpSection' => false,
-
- 'enableConsole' => false,
-
'providerInfos' => [],
];
\ No newline at end of file
|
Removed `enableConsole` from config.php
|
diff --git a/docs/extensions/attributetable.py b/docs/extensions/attributetable.py
index <HASH>..<HASH> 100644
--- a/docs/extensions/attributetable.py
+++ b/docs/extensions/attributetable.py
@@ -165,7 +165,7 @@ def process_attributetable(app, doctree, fromdocname):
def get_class_results(lookup, modulename, name, fullname):
module = importlib.import_module(modulename)
- cls_dict = getattr(module, name).__dict__
+ cls = getattr(module, name)
groups = OrderedDict([
(_('Attributes'), []),
@@ -183,7 +183,7 @@ def get_class_results(lookup, modulename, name, fullname):
badge = None
label = attr
- value = cls_dict.get(attr)
+ value = getattr(cls, attr, None)
if value is not None:
doc = value.__doc__ or ''
if inspect.iscoroutinefunction(value) or doc.startswith('|coro|'):
|
Fix methods from superclass showing under "Attributes" table
|
diff --git a/mongoctl/repository.py b/mongoctl/repository.py
index <HASH>..<HASH> 100644
--- a/mongoctl/repository.py
+++ b/mongoctl/repository.py
@@ -110,7 +110,7 @@ def validate_repositories():
global __repos_validated__
if not __repos_validated__:
if not(has_file_repository() or has_db_repository() or has_commandline_servers_or_clusters()):
- log_warning("******* WARNING!\nNo fileRepository or databaseRepository configured."
+ log_verbose("******* WARNING!\nNo fileRepository or databaseRepository configured."
"\n*******")
__repos_validated__ = True
|
logging: Change repo warning into verbose
|
diff --git a/js/dx.aspnet.data.js b/js/dx.aspnet.data.js
index <HASH>..<HASH> 100644
--- a/js/dx.aspnet.data.js
+++ b/js/dx.aspnet.data.js
@@ -108,7 +108,7 @@
if(options) {
["skip", "take", "requireTotalCount", "requireGroupCount"].forEach(function(i) {
- if(i in options)
+ if(options[i] !== undefined)
result[i] = options[i];
});
|
Pick useful change from <I>b6f2cba<I>
|
diff --git a/src/test/com/twitter/elephantbird/pig/load/TestMultiFormatLoader.java b/src/test/com/twitter/elephantbird/pig/load/TestMultiFormatLoader.java
index <HASH>..<HASH> 100644
--- a/src/test/com/twitter/elephantbird/pig/load/TestMultiFormatLoader.java
+++ b/src/test/com/twitter/elephantbird/pig/load/TestMultiFormatLoader.java
@@ -45,7 +45,7 @@ public class TestMultiFormatLoader {
public void setUp() throws Exception {
if (!GPLNativeCodeLoader.isNativeCodeLoaded()) {
- // should have an option to force running these tests.
+ // TODO: Consider using @RunWith / @SuiteClasses
return;
}
|
add comment about RunWith/SuiteClasses for lzo tests.
|
diff --git a/autoload.php b/autoload.php
index <HASH>..<HASH> 100644
--- a/autoload.php
+++ b/autoload.php
@@ -16,10 +16,10 @@
/*
* Some helper functions are outside classes and need to be loaded
*/
-require_once './src/functions.php';
-require_once './src/Http/Psr7/functions.php';
+require_once __DIR__.'/src/functions.php';
+require_once __DIR__.'/src/Http/Psr7/functions.php';
-/**
+/*
* Based on https://www.php-fig.org/psr/psr-4/examples/.
*/
spl_autoload_register(function ($class) {
@@ -50,7 +50,6 @@ spl_autoload_register(function ($class) {
}
});
-
spl_autoload_register(function ($class) {
$prefixes = array(
'Psr\\Http\\Message\\' => 'psr/http-message/src/',
|
fix autoloader when not using composer
|
diff --git a/salt/client/ssh/wrapper/state.py b/salt/client/ssh/wrapper/state.py
index <HASH>..<HASH> 100644
--- a/salt/client/ssh/wrapper/state.py
+++ b/salt/client/ssh/wrapper/state.py
@@ -48,6 +48,7 @@ def _thin_dir():
Get the thin_dir from the master_opts if not in __opts__
'''
thin_dir = __opts__.get('thin_dir', __opts__['__master_opts__']['thin_dir'])
+ return thin_dir
def sls(mods, saltenv='base', test=None, exclude=None, **kwargs):
|
When building up the remote file location nothing was being returned via _thin_dir so the remote path was starting with None. This change updates _thin_dir to return a value for format to use.
|
diff --git a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
index <HASH>..<HASH> 100644
--- a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
+++ b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
@@ -476,8 +476,10 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
// First shutdown the writer, this will result in a closing stream element getting send to
// the server
if (packetWriter != null) {
+ LOGGER.finer("PacketWriter shutdown()");
packetWriter.shutdown(instant);
}
+ LOGGER.finer("PacketWriter has been shut down");
try {
// After we send the closing stream element, check if there was already a
@@ -490,8 +492,10 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
}
if (packetReader != null) {
+ LOGGER.finer("PacketReader shutdown()");
packetReader.shutdown();
}
+ LOGGER.finer("PacketReader has been shut down");
try {
socket.close();
|
Finer logs in XMPPTCPConnection.shutdown()
|
diff --git a/superset/connectors/druid/models.py b/superset/connectors/druid/models.py
index <HASH>..<HASH> 100644
--- a/superset/connectors/druid/models.py
+++ b/superset/connectors/druid/models.py
@@ -69,11 +69,11 @@ class DruidCluster(Model, AuditMixinNullable):
# short unique name, used in permissions
cluster_name = Column(String(250), unique=True)
coordinator_host = Column(String(255))
- coordinator_port = Column(Integer)
+ coordinator_port = Column(Integer, default=8081)
coordinator_endpoint = Column(
String(255), default='druid/coordinator/v1/metadata')
broker_host = Column(String(255))
- broker_port = Column(Integer)
+ broker_port = Column(Integer, default=8082)
broker_endpoint = Column(String(255), default='druid/v2')
metadata_last_refreshed = Column(DateTime)
cache_timeout = Column(Integer)
|
Set default ports Druid (#<I>)
For Druid set the default port for the broker and coordinator.
|
diff --git a/structr-core/src/main/java/org/structr/core/graph/DeleteNodeCommand.java b/structr-core/src/main/java/org/structr/core/graph/DeleteNodeCommand.java
index <HASH>..<HASH> 100644
--- a/structr-core/src/main/java/org/structr/core/graph/DeleteNodeCommand.java
+++ b/structr-core/src/main/java/org/structr/core/graph/DeleteNodeCommand.java
@@ -166,7 +166,7 @@ public class DeleteNodeCommand extends NodeServiceCommand {
} catch (Throwable t) {
- logger.log(Level.WARNING, t, LogMessageSupplier.create("Exception while deleting node: {0}", node));
+ logger.log(Level.FINE, t, LogMessageSupplier.create("Exception while deleting node: {0}", node));
}
|
Reduces log level so that deleting an already deleted node are not logged as a WARNING.
|
diff --git a/lib/spatial_features/has_spatial_features.rb b/lib/spatial_features/has_spatial_features.rb
index <HASH>..<HASH> 100644
--- a/lib/spatial_features/has_spatial_features.rb
+++ b/lib/spatial_features/has_spatial_features.rb
@@ -113,8 +113,6 @@ module SpatialFeatures
def cached_spatial_join(other)
other_class = Utils.class_of(other)
- raise "Cannot use cached spatial join for the same class" if self == other_class
-
other_column = other_class.name < self.name ? :model_a : :model_b
self_column = other_column == :model_a ? :model_b : :model_a
|
Allow spatial caching on own class
We used to raise an exception when intersecting on the same class. There doesn’t see to be any technical limitation that necessitated this, but rather it was implemented as a sanity check because we didn’t initially intend it to be used in this way.
|
diff --git a/pstats_print2list/pstats_print2list.py b/pstats_print2list/pstats_print2list.py
index <HASH>..<HASH> 100755
--- a/pstats_print2list/pstats_print2list.py
+++ b/pstats_print2list/pstats_print2list.py
@@ -95,7 +95,7 @@ def get_pstats_print2list(fnames, filter_fnames=None, exclude_fnames=None,
stream.seek(0)
field_list = get_field_list()
line_stats_re = re.compile(
- r'(?P<%s>\d+/?\d+)\s+(?P<%s>\d+\.?\d+)\s+(?P<%s>\d+\.?\d+)\s+'
+ r'(?P<%s>\d+/?\d+|\d+)\s+(?P<%s>\d+\.?\d+)\s+(?P<%s>\d+\.?\d+)\s+'
r'(?P<%s>\d+\.?\d+)\s+(?P<%s>\d+\.?\d+)\s+(?P<%s>.*):(?P<%s>\d+)'
r'\((?P<%s>.*)\)' % tuple(field_list))
stats_list = []
|
[FIX] pstats_print2list: Fix regex to support ncalls without '/'
|
diff --git a/peewee.py b/peewee.py
index <HASH>..<HASH> 100644
--- a/peewee.py
+++ b/peewee.py
@@ -1686,7 +1686,7 @@ class MySQLDatabase(Database):
'primary_key': 'INTEGER AUTO_INCREMENT',
'text': 'LONGTEXT',
}
- for_update_support = True
+ for_update = True
interpolation = '%s'
op_overrides = {OP_LIKE: 'LIKE BINARY', OP_ILIKE: 'LIKE'}
quote_char = '`'
|
Fix for_update support for MySQL
|
diff --git a/src/org/dita/dost/reader/MergeMapParser.java b/src/org/dita/dost/reader/MergeMapParser.java
index <HASH>..<HASH> 100644
--- a/src/org/dita/dost/reader/MergeMapParser.java
+++ b/src/org/dita/dost/reader/MergeMapParser.java
@@ -122,6 +122,7 @@ public class MergeMapParser extends AbstractXMLReader {
int attsLen = atts.getLength();
mapInfo.append(Constants.LESS_THAN).append(qName);
+ classValue = atts.getValue(Constants.ATTRIBUTE_NAME_CLASS);
for (int i = 0; i < attsLen; i++) {
String attQName = atts.getQName(i);
|
fix bug # <I> Image referenced in map is not found, topicmerge breaks
|
diff --git a/fluent_contents/models/fields.py b/fluent_contents/models/fields.py
index <HASH>..<HASH> 100644
--- a/fluent_contents/models/fields.py
+++ b/fluent_contents/models/fields.py
@@ -178,6 +178,12 @@ class PlaceholderField(PlaceholderRelation):
slot=self.slot
)
+ # Remove attribute must exist for the delete page. Currently it's not actively used.
+ # The regular ForeignKey assigns a ForeignRelatedObjectsDescriptor to it for example.
+ # In this case, the PlaceholderRelation is already the reverse relation.
+ # Being able to move forward from the Placeholder to the derived models does not have that much value.
+ setattr(self.rel.to, self.rel.related_name, None)
+
def value_from_object(self, obj):
"""
|
Fix <I> error at delete page with PlaceholderField in use.
The forward-relation of the reverse-relation needs to exist,
however it is not that important right now. Leave it as None for the
moment.
|
diff --git a/contactform/controllers/ContactFormController.php b/contactform/controllers/ContactFormController.php
index <HASH>..<HASH> 100644
--- a/contactform/controllers/ContactFormController.php
+++ b/contactform/controllers/ContactFormController.php
@@ -30,7 +30,11 @@ class ContactFormController extends BaseController
$message->fromEmail = craft()->request->getPost('fromEmail');
$message->fromName = craft()->request->getPost('fromName');
$message->subject = craft()->request->getPost('subject');
- $message->attachment = \CUploadedFile::getInstanceByName('attachment');
+
+ if ($settings->allowAttachments)
+ {
+ $message->attachment = \CUploadedFile::getInstanceByName('attachment');
+ }
// Set the message body
$postedMessage = craft()->request->getPost('message');
|
Fix a bug where the "allowAttachments" setting wasn't being enforced.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@ CLASS_VERSION = '2.5.0'
MAJOR = 0
MINOR = 1
MICRO = 15
-ISRELEASED = False
+ISRELEASED = True
VERSION = '%d.%d.%d' % (MAJOR, MINOR, MICRO)
DISTNAME = 'classylss'
|
remove dev from <I>
|
diff --git a/lib/config.js b/lib/config.js
index <HASH>..<HASH> 100644
--- a/lib/config.js
+++ b/lib/config.js
@@ -384,7 +384,7 @@ exports.extend = function extend(newConf) {
};
var isLocalUIUrl = function(url) {
var host = getHostname(url);
- return isWebUIHost() || !!config.pluginHostMap[host];
+ return isWebUIHost(host) || !!config.pluginHostMap[host];
};
config.isLocalUIUrl = isLocalUIUrl;
|
feat: Support custom the hostname of plugin by cli
|
diff --git a/main.py b/main.py
index <HASH>..<HASH> 100644
--- a/main.py
+++ b/main.py
@@ -10,9 +10,9 @@ def main(filename=""):
return renderer.render(markdown)
if __name__ == "__main__":
- try:
+ if len(sys.argv) > 1:
print(main(sys.argv[1]))
- except IndexError:
+ else:
try:
print(main())
except KeyboardInterrupt:
|
🐛 removed try-except as control structure
|
diff --git a/src/auth/log-out.js b/src/auth/log-out.js
index <HASH>..<HASH> 100644
--- a/src/auth/log-out.js
+++ b/src/auth/log-out.js
@@ -13,7 +13,7 @@ export default function logOut () {
log.debug('API: Log out successful.')
return getSession()
}, function onError (error) {
- log.debug('Log out error.', error)
- return Promise.reject(error.message)
+ log.error('Log out error.', error)
+ return Promise.reject(error.message ? error.message : error)
})
}
\ No newline at end of file
|
Makes logout method always return stringifiable error
|
diff --git a/detox/android/detox/src/main/java/com/wix/detox/instruments/reflected/InstrumentsReflected.java b/detox/android/detox/src/main/java/com/wix/detox/instruments/reflected/InstrumentsReflected.java
index <HASH>..<HASH> 100644
--- a/detox/android/detox/src/main/java/com/wix/detox/instruments/reflected/InstrumentsReflected.java
+++ b/detox/android/detox/src/main/java/com/wix/detox/instruments/reflected/InstrumentsReflected.java
@@ -1,7 +1,6 @@
package com.wix.detox.instruments.reflected;
import android.content.Context;
-import android.util.Log;
import com.wix.detox.instruments.DetoxInstrumentsException;
import com.wix.detox.instruments.Instruments;
@@ -34,8 +33,6 @@ public class InstrumentsReflected implements Instruments {
methodGetInstanceOfProfiler = profilerClass.getDeclaredMethod("getInstance", Context.class);
methodStartRecording = profilerClass.getDeclaredMethod("startProfiling", Context.class, configurationClass);
} catch (Exception e) {
- Log.i("DetoxInstrumentsManager", "InstrumentsRecording not found", e);
-
constructorDtxProfilingConfiguration = null;
methodGetInstanceOfProfiler = null;
methodStartRecording = null;
|
Removed unnecessary logs while trying to check instruments for android
|
diff --git a/cronofy.php b/cronofy.php
index <HASH>..<HASH> 100644
--- a/cronofy.php
+++ b/cronofy.php
@@ -339,6 +339,7 @@ class Cronofy
String location.long : The String describing the event's longitude. OPTIONAL
Array reminders : An array of arrays detailing a length of time and a quantity. OPTIONAL
for example: array(array("minutes" => 30), array("minutes" => 1440))
+ String transparency : The transparency of the event. Accepted values are "transparent" and "opaque". OPTIONAL
returns true on success, associative array of errors on failure
*/
@@ -359,6 +360,9 @@ class Cronofy
if(!empty($params['reminders'])) {
$postfields['reminders'] = $params['reminders'];
}
+ if(!empty($params['transparency'])) {
+ $postfields['transparency'] = $params['transparency'];
+ }
return $this->http_post("/" . self::API_VERSION . "/calendars/" . $params['calendar_id'] . "/events", $postfields);
}
|
Add transparency to upsert_event
|
diff --git a/pandas/core/generic.py b/pandas/core/generic.py
index <HASH>..<HASH> 100644
--- a/pandas/core/generic.py
+++ b/pandas/core/generic.py
@@ -10587,8 +10587,10 @@ class NDFrame(PandasObject, SelectionMixin, indexing.IndexingMixin):
# [assignment]
cls.all = all # type: ignore[assignment]
+ # error: Argument 1 to "doc" has incompatible type "Optional[str]"; expected
+ # "Union[str, Callable[..., Any]]"
@doc(
- NDFrame.mad,
+ NDFrame.mad.__doc__, # type: ignore[arg-type]
desc="Return the mean absolute deviation of the values "
"over the requested axis.",
name1=name1,
|
BUG: Placeholders not being filled on docstrings (#<I>)
|
diff --git a/etcdmain/config_test.go b/etcdmain/config_test.go
index <HASH>..<HASH> 100644
--- a/etcdmain/config_test.go
+++ b/etcdmain/config_test.go
@@ -460,8 +460,19 @@ func TestConfigFileElectionTimeout(t *testing.T) {
},
{
ElectionMs: 60000,
+ TickMs: 10000,
errStr: "is too long, and should be set less than",
},
+ {
+ ElectionMs: 100,
+ TickMs: 0,
+ errStr: "--heartbeat-interval must be >0 (set to 0ms)",
+ },
+ {
+ ElectionMs: 0,
+ TickMs: 100,
+ errStr: "--election-timeout must be >0 (set to 0ms)",
+ },
}
for i, tt := range tests {
|
etcdmain: test wrong heartbeat-interval, election-timeout in TestConfigFileElectionTimeout
|
diff --git a/src/Search/Services/SearchableService.php b/src/Search/Services/SearchableService.php
index <HASH>..<HASH> 100644
--- a/src/Search/Services/SearchableService.php
+++ b/src/Search/Services/SearchableService.php
@@ -151,12 +151,12 @@ class SearchableService
// Anonymous member canView() for indexing
if (!$this->classSkipsCanViewCheck($objClass)) {
$value = Member::actAs(null, function () use ($obj) {
- return $obj->canView();
+ return (bool) $obj->canView();
});
}
} else {
// Current member canView() check for retrieving search results
- $value = $obj->canView();
+ $value = (bool) $obj->canView();
}
}
$this->extend('updateIsSearchable', $obj, $indexing, $value);
|
FIX Don't assume DataObject::canView always returns bool (#<I>)
Because there is no return value typehinting in DataObject::canView, the value returned from that method can be of any type. We must cast to boolean before returning the value to avoid possible errors with non-boolean return types.
|
diff --git a/src/BoomCMS/Database/Models/Chunk/Linkset.php b/src/BoomCMS/Database/Models/Chunk/Linkset.php
index <HASH>..<HASH> 100644
--- a/src/BoomCMS/Database/Models/Chunk/Linkset.php
+++ b/src/BoomCMS/Database/Models/Chunk/Linkset.php
@@ -6,7 +6,7 @@ class Linkset extends BaseChunk
{
protected $table = 'chunk_linksets';
- public static function create(array $attributes)
+ public static function create(array $attributes = [])
{
if (isset($attributes['links'])) {
$links = $attributes['links'];
diff --git a/src/BoomCMS/Database/Models/Chunk/Slideshow.php b/src/BoomCMS/Database/Models/Chunk/Slideshow.php
index <HASH>..<HASH> 100644
--- a/src/BoomCMS/Database/Models/Chunk/Slideshow.php
+++ b/src/BoomCMS/Database/Models/Chunk/Slideshow.php
@@ -6,7 +6,7 @@ class Slideshow extends BaseChunk
{
protected $table = 'chunk_slideshows';
- public static function create(array $attributes)
+ public static function create(array $attributes = [])
{
if (isset($attributes['slides'])) {
$slides = $attributes['slides'];
|
Fixed declaration of model create methods not compatible with Illuminate\Database\Eloquent\Model
|
diff --git a/test/integration/test-property-types.js b/test/integration/test-property-types.js
index <HASH>..<HASH> 100644
--- a/test/integration/test-property-types.js
+++ b/test/integration/test-property-types.js
@@ -6,11 +6,16 @@ assert.equal(Property.check(String).type, "text");
assert.equal(Property.check(Number).type, "number");
assert.equal(Property.check(Boolean).type, "boolean");
assert.equal(Property.check(Date).type, "date");
+assert.equal(Property.check(Object).type, "object");
+assert.equal(Property.check([ 'a', 'b' ]).type, "enum");
+assert.deepEqual(Property.check([ 'a', 'b' ]).values, [ 'a', 'b' ]);
assert.equal({ type: "text" }.type, "text");
assert.equal({ type: "number" }.type, "number");
assert.equal({ type: "boolean" }.type, "boolean");
assert.equal({ type: "date" }.type, "date");
+assert.equal({ type: "enum" }.type, "enum");
+assert.equal({ type: "object" }.type, "object");
assert.throws(function () {
Property.check({ type: "unknown" });
|
Updates tests for property types to include enum and object
|
diff --git a/lints/lint_dnsname_bad_character_in_label.go b/lints/lint_dnsname_bad_character_in_label.go
index <HASH>..<HASH> 100644
--- a/lints/lint_dnsname_bad_character_in_label.go
+++ b/lints/lint_dnsname_bad_character_in_label.go
@@ -12,7 +12,7 @@ type DNSNameProperCharacters struct {
}
func (l *DNSNameProperCharacters) Initialize() error {
- const dnsNameRegexp = `^(\*\.)?(\?\.)*(A-Za-z0-9*_-]+\.)*[A-Za-z0-9*_-]*$`
+ const dnsNameRegexp = `^(\*\.)?(\?\.)*([A-Za-z0-9*_-]+\.)*[A-Za-z0-9*_-]*$`
var err error
l.CompiledExpression, err = regexp.Compile(dnsNameRegexp)
|
Add missing [ to dnsNameRegexp. (#<I>)
|
diff --git a/lib/node_modules/@stdlib/regexp/native-function/lib/index.js b/lib/node_modules/@stdlib/regexp/native-function/lib/index.js
index <HASH>..<HASH> 100644
--- a/lib/node_modules/@stdlib/regexp/native-function/lib/index.js
+++ b/lib/node_modules/@stdlib/regexp/native-function/lib/index.js
@@ -60,8 +60,3 @@ setReadOnly( reNativeFunction, 'REGEXP', REGEXP );
// EXPORTS //
module.exports = reNativeFunction;
-
-
-// EXPORTS //
-
-module.exports = reNativeFunction;
|
Delete duplicated module.exports
|
diff --git a/application/tests/Bootstrap.php b/application/tests/Bootstrap.php
index <HASH>..<HASH> 100644
--- a/application/tests/Bootstrap.php
+++ b/application/tests/Bootstrap.php
@@ -324,6 +324,9 @@ switch (ENVIRONMENT)
/*
require __DIR__ . '/_ci_phpunit_test/patcher/bootstrap.php';
MonkeyPatchManager::init([
+ // If you want debug log, set `debug` true, and optionally you can set the log file path
+ 'debug' => true,
+ 'log_file' => '/tmp/monkey-patch-debug.log',
// PHP Parser: PREFER_PHP7, PREFER_PHP5, ONLY_PHP7, ONLY_PHP5
'php_parser' => 'PREFER_PHP5',
'cache_dir' => TESTPATH . '_ci_phpunit_test/tmp/cache',
|
docs: how to enable debug mode and set the log file path, as comment
|
diff --git a/lib/index.js b/lib/index.js
index <HASH>..<HASH> 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,7 +1,7 @@
/**
* Pon task for file system
* @module pon-task-fs
- * @version 2.1.0
+ * @version 2.1.1
*/
'use strict'
|
[ci skip] Travis CI committed after build
|
diff --git a/js/lib/mediawiki.Util.js b/js/lib/mediawiki.Util.js
index <HASH>..<HASH> 100644
--- a/js/lib/mediawiki.Util.js
+++ b/js/lib/mediawiki.Util.js
@@ -187,7 +187,7 @@ var HTML5 = require( 'html5' ).HTML5,
Object.freeze(o); // First freeze the object.
for (var propKey in o) {
var prop = o[propKey];
- if (!o.hasOwnProperty(propKey) || !(typeof prop === "object") || Object.isFrozen(prop)) {
+ if (!o.hasOwnProperty(propKey) || !(prop instanceof Object) || Object.isFrozen(prop)) {
// If the object is on the prototype, not an object, or is already frozen,
// skip it. Note that this might leave an unfrozen reference somewhere in the
// object if there is an already frozen object containing an unfrozen object.
|
Fix a deepFreeze crash
This fixes a crasher from a client log where isFrozen was called on a
non-object. 'foo instanceof Object' seems to be the better test for freeze,
and is used to test the top-level object anyway.
Change-Id: Ice<I>c<I>d<I>df<I>edc5a7f1ec4df<I>e<I>e<I>c
|
diff --git a/src/Uri.php b/src/Uri.php
index <HASH>..<HASH> 100644
--- a/src/Uri.php
+++ b/src/Uri.php
@@ -669,7 +669,7 @@ class Uri implements UriInterface
return preg_replace_callback(
'/(?:[^' . self::CHAR_UNRESERVED . ':@&=\+\$,\/;%]+|%(?![A-Fa-f0-9]{2}))/',
- [$this, 'encodeUrl'],
+ [$this, 'urlEncodeChar'],
$path
);
}
@@ -749,17 +749,18 @@ class Uri implements UriInterface
{
return preg_replace_callback(
'/(?:[^' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . '%:@\/\?]+|%(?![A-Fa-f0-9]{2}))/',
- [$this, 'encodeUrl'],
+ [$this, 'urlEncodeChar'],
$value
);
}
/**
- * Function to urlencode the value returned by a regexp.
+ * URL encode a character returned by a regex.
+ *
* @param array $matches
* @return string
*/
- private function encodeUrl(array $matches)
+ private function urlEncodeChar(array $matches)
{
return rawurlencode($matches[0]);
}
|
Renamed `encodeUrl` to `urlEncodeChar`
- to better describe what it's actually doing (it's not encoding a full URL)
|
diff --git a/oplus/version.py b/oplus/version.py
index <HASH>..<HASH> 100644
--- a/oplus/version.py
+++ b/oplus/version.py
@@ -1 +1 @@
-version='6.0.2.dev2'
+version='6.0.2.dev3'
|
[skip ci] updated version as <I>.dev3
|
diff --git a/pharen.php b/pharen.php
index <HASH>..<HASH> 100755
--- a/pharen.php
+++ b/pharen.php
@@ -281,7 +281,7 @@ class Scope{
public function get_lexing($var_name){
$value = $this->bindings[$var_name]->compile();
- return 'Lexical::$scopes['.$this->id.']["'.$var_name.'"] = '.$value.';';
+ return 'Lexical::$scopes['.$this->id.']["'.$var_name.'"] = '.$var_name.';';
}
public function get_lexical_bindings($indent){
|
Fixed bug where lexings were referring to the value used for the binding, not the variable itself.
|
diff --git a/src/main/java/moe/tristan/easyfxml/spring/SpringContext.java b/src/main/java/moe/tristan/easyfxml/spring/SpringContext.java
index <HASH>..<HASH> 100644
--- a/src/main/java/moe/tristan/easyfxml/spring/SpringContext.java
+++ b/src/main/java/moe/tristan/easyfxml/spring/SpringContext.java
@@ -31,7 +31,7 @@ public class SpringContext {
/**
* The {@link FxmlLoader} object is a /SINGLE-USE/ object to load
* a FXML file and deserialize it as an instance of {@link Node}.
- * It extends {@link FXMLLoader} adding {@link FxmlLoader#onSuccess(Object)}
+ * It extends {@link FXMLLoader} adding {@link FxmlLoader#onSuccess(Node)}
* and {@link FxmlLoader#onFailure(Throwable)} as utility methods to
* do various things.
* <p>
|
Slight signature change to apply to referring JavaDoc
|
diff --git a/hazelcast/src/main/java/com/hazelcast/client/impl/ClientHeartbeatMonitor.java b/hazelcast/src/main/java/com/hazelcast/client/impl/ClientHeartbeatMonitor.java
index <HASH>..<HASH> 100644
--- a/hazelcast/src/main/java/com/hazelcast/client/impl/ClientHeartbeatMonitor.java
+++ b/hazelcast/src/main/java/com/hazelcast/client/impl/ClientHeartbeatMonitor.java
@@ -18,6 +18,7 @@ package com.hazelcast.client.impl;
import com.hazelcast.client.ClientEndpoint;
import com.hazelcast.client.ClientEngine;
+import com.hazelcast.core.ClientType;
import com.hazelcast.instance.GroupProperties;
import com.hazelcast.logging.ILogger;
import com.hazelcast.logging.Logger;
@@ -77,7 +78,7 @@ public class ClientHeartbeatMonitor implements Runnable {
}
private void monitor(String memberUuid, ClientEndpointImpl clientEndpoint) {
- if (clientEndpoint.isFirstConnection()) {
+ if (clientEndpoint.isFirstConnection() && ClientType.CPP.equals(clientEndpoint.getClientType())) {
return;
}
|
Include owner connection to heart beat check
When client is inactive, server needs to close the
connection so that resources(e.g locks) associated with that connection
can be released. When there are 2 connection from client to server,
we did not want to check owner connection since there were no
heartbeat send over it.
After removing separate owner connection from the system this check
caused a bug. With one connection to each node, all connections
needs to be checked and closed.
Leaving the check for C++ client until, it's architecture is updated
as other clients.
Fixes #<I>
|
diff --git a/lib/gemsmith/cli.rb b/lib/gemsmith/cli.rb
index <HASH>..<HASH> 100644
--- a/lib/gemsmith/cli.rb
+++ b/lib/gemsmith/cli.rb
@@ -111,7 +111,7 @@ module Gemsmith
desc "-v, [version]", "Show version."
map "-v" => :version
def version
- print_version
+ say "Gemsmith " + VERSION
end
desc "-h, [help]", "Show this message."
@@ -132,10 +132,5 @@ module Gemsmith
end
end
end
-
- # Print version information.
- def print_version
- say "Gemsmith " + VERSION
- end
end
end
|
Removed the print_version method.
|
diff --git a/lib/webpacker/compiler.rb b/lib/webpacker/compiler.rb
index <HASH>..<HASH> 100644
--- a/lib/webpacker/compiler.rb
+++ b/lib/webpacker/compiler.rb
@@ -87,7 +87,7 @@ class Webpacker::Compiler
end
def compilation_digest_path
- config.cache_path.join(".last-compilation-digest-#{Webpacker.env}")
+ config.cache_path.join("last-compilation-digest-#{Webpacker.env}")
end
def webpack_env
diff --git a/test/compiler_test.rb b/test/compiler_test.rb
index <HASH>..<HASH> 100644
--- a/test/compiler_test.rb
+++ b/test/compiler_test.rb
@@ -59,6 +59,6 @@ class CompilerTest < Minitest::Test
end
def test_compilation_digest_path
- assert Webpacker.compiler.send(:compilation_digest_path).to_s.ends_with?(Webpacker.env)
+ assert_equal Webpacker.compiler.send(:compilation_digest_path).basename.to_s, "last-compilation-digest-#{Webpacker.env}"
end
end
|
Make compilation digest file visible (#<I>)
|
diff --git a/lib/paper_trail/version.rb b/lib/paper_trail/version.rb
index <HASH>..<HASH> 100644
--- a/lib/paper_trail/version.rb
+++ b/lib/paper_trail/version.rb
@@ -116,7 +116,8 @@ class Version < ActiveRecord::Base
end
def index
- sibling_versions.select(:id).order("id ASC").map(&:id).index(self.id)
+ id_column = self.class.primary_key
+ sibling_versions.select(id_column.to_sym).order("#{id_column} ASC").map(&id_column.to_sym).index(self.send(id_column))
end
private
|
Refactor index method on version to call the model's primary key instead of assuming it is "id."
|
diff --git a/superset/jinja_context.py b/superset/jinja_context.py
index <HASH>..<HASH> 100644
--- a/superset/jinja_context.py
+++ b/superset/jinja_context.py
@@ -43,7 +43,7 @@ def url_param(param, default=None):
def current_user_id():
"""The id of the user who is currently logged in"""
- if g.user:
+ if hasattr(g, 'user') and g.user:
return g.user.id
|
[bugfix] Template rendering failed: '_AppCtxGlobals' object has no attribute 'user' (#<I>)
Somehow the nature of `g` in Flask has changed where `g.user` used to
be provided outside the web request scope and its not anymore.
The fix here should address that.
|
diff --git a/okhttp-tests/src/test/java/okhttp3/internal/tls/ClientAuthTest.java b/okhttp-tests/src/test/java/okhttp3/internal/tls/ClientAuthTest.java
index <HASH>..<HASH> 100644
--- a/okhttp-tests/src/test/java/okhttp3/internal/tls/ClientAuthTest.java
+++ b/okhttp-tests/src/test/java/okhttp3/internal/tls/ClientAuthTest.java
@@ -172,6 +172,10 @@ public final class ClientAuthTest {
}
@Test public void missingClientAuthFailsForNeeds() throws Exception {
+ // TODO https://github.com/square/okhttp/issues/4598
+ // StreamReset stream was reset: PROT...
+ assumeFalse(getJvmSpecVersion().equals("11"));
+
OkHttpClient client = buildClient(null, clientIntermediateCa.certificate());
SSLSocketFactory socketFactory = buildServerSslSocketFactory();
@@ -218,7 +222,7 @@ public final class ClientAuthTest {
}
@Test public void invalidClientAuthFails() throws Throwable {
- // TODO github issue link
+ // TODO https://github.com/square/okhttp/issues/4598
// StreamReset stream was reset: PROT...
assumeFalse(getJvmSpecVersion().equals("11"));
|
Fix master build for JDK <I>
|
diff --git a/salt/modules/yumpkg.py b/salt/modules/yumpkg.py
index <HASH>..<HASH> 100644
--- a/salt/modules/yumpkg.py
+++ b/salt/modules/yumpkg.py
@@ -5,6 +5,8 @@ Support for YUM
- rpm Python module
- rpmUtils Python module
'''
+import re
+
try:
import yum
import rpm
|
Add missing re import to yumpkg
|
diff --git a/PHPStan/PropertyReflectionExtension.php b/PHPStan/PropertyReflectionExtension.php
index <HASH>..<HASH> 100644
--- a/PHPStan/PropertyReflectionExtension.php
+++ b/PHPStan/PropertyReflectionExtension.php
@@ -20,8 +20,6 @@ use SignpostMarv\DaftObject\TypeParanoia;
*/
class PropertyReflectionExtension extends Base
{
- const BOOL_CLASS_NOT_DAFTOBJECT = false;
-
public function __construct(ClassReflection $classReflection, Broker $broker, string $property)
{
if ( ! TypeParanoia::IsThingStrings($classReflection->getName(), DaftObject::class)) {
|
removing unreferenced const
|
diff --git a/provider/joyent/provider.go b/provider/joyent/provider.go
index <HASH>..<HASH> 100644
--- a/provider/joyent/provider.go
+++ b/provider/joyent/provider.go
@@ -30,7 +30,7 @@ var _ simplestreams.HasRegion = (*joyentEnviron)(nil)
// RestrictedConfigAttributes is specified in the EnvironProvider interface.
func (joyentProvider) RestrictedConfigAttributes() []string {
- return nil
+ return []string{sdcUrl}
}
// PrepareForCreateEnvironment is specified in the EnvironProvider interface.
|
lp<I>: Use controller region for hosted models
Hosted models in joyent were not using the same
region as the controller. sdc-url should not be
overwritten / set to default for hosted models.
|
diff --git a/lib/seahorse/client/handler_list.rb b/lib/seahorse/client/handler_list.rb
index <HASH>..<HASH> 100644
--- a/lib/seahorse/client/handler_list.rb
+++ b/lib/seahorse/client/handler_list.rb
@@ -13,7 +13,6 @@
module Seahorse
class Client
- # @api private
class HandlerList
include Enumerable
|
HandlerList is now publically documented.
|
diff --git a/tests/Unit/Suites/Product/ProductDetailViewSnippetRendererTest.php b/tests/Unit/Suites/Product/ProductDetailViewSnippetRendererTest.php
index <HASH>..<HASH> 100644
--- a/tests/Unit/Suites/Product/ProductDetailViewSnippetRendererTest.php
+++ b/tests/Unit/Suites/Product/ProductDetailViewSnippetRendererTest.php
@@ -144,9 +144,9 @@ class ProductDetailViewSnippetRendererTest extends \PHPUnit_Framework_TestCase
$this->assertContainsSnippetWithGivenKey($testTitleSnippetKey, ...$result);
$this->assertContainsSnippetWithGivenKey($testMetaDescriptionSnippetKey, ...$result);
- $metaSnippet = array_reduce($result, function ($carry, Snippet $item) {
- return $item->getKey() === $carry ? $item : $carry;
- }, $testMetaSnippetKey);
+ $metaSnippet = array_reduce($result, function ($carry, Snippet $item) use ($testMetaSnippetKey) {
+ return $item->getKey() === $testMetaSnippetKey ? $item : $carry;
+ });
$this->assertContainerContainsSnippet(
$metaSnippet,
|
Issue #<I>: Don't abuse carry and initial value for snippet key
|
diff --git a/container/docker/engine.py b/container/docker/engine.py
index <HASH>..<HASH> 100644
--- a/container/docker/engine.py
+++ b/container/docker/engine.py
@@ -557,7 +557,7 @@ class Engine(BaseEngine, DockerSecretsMixin):
repo = image
tag = 'latest'
if ':' in image:
- repo, tag = image.split(':')
+ repo, tag = image.rsplit(':',1)
logger.debug("Pulling image {}:{}".format(repo, tag))
try:
image_id = self.client.images.pull(repo, tag=tag)
|
Update split in docker pull (#<I>)
|
diff --git a/pyrogram/client/methods/users/set_profile_photo.py b/pyrogram/client/methods/users/set_profile_photo.py
index <HASH>..<HASH> 100644
--- a/pyrogram/client/methods/users/set_profile_photo.py
+++ b/pyrogram/client/methods/users/set_profile_photo.py
@@ -18,22 +18,26 @@
from pyrogram.api import functions
from ...ext import BaseClient
+from typing import Union, BinaryIO
class SetProfilePhoto(BaseClient):
def set_profile_photo(
self,
- photo: str
+ photo: Union[str, BinaryIO]
) -> bool:
"""Set a new profile photo.
+ If you want to set a profile video instead, use :meth:`~Client.set_profile_video`
+
This method only works for Users.
Bots profile photos must be set using BotFather.
Parameters:
photo (``str``):
Profile photo to set.
- Pass a file path as string to upload a new photo that exists on your local machine.
+ Pass a file path as string to upload a new photo that exists on your local machine or
+ pass a binary file-like object with its attribute ".name" set for in-memory uploads.
Returns:
``bool``: True on success.
|
Allow uploading profile photos using file-like objects
|
diff --git a/src/jquery.webui-popover.js b/src/jquery.webui-popover.js
index <HASH>..<HASH> 100644
--- a/src/jquery.webui-popover.js
+++ b/src/jquery.webui-popover.js
@@ -421,6 +421,8 @@
if (that.options.async.success) {
that.options.async.success(that, data);
}
+ },
+ complete: function() {
that.xhr = null;
}
});
|
resetting xhr on complete callback
|
diff --git a/axiom/batch.py b/axiom/batch.py
index <HASH>..<HASH> 100644
--- a/axiom/batch.py
+++ b/axiom/batch.py
@@ -22,9 +22,7 @@ except ImportError:
manhole_ssh = None
from twisted.conch import interfaces as iconch
-from epsilon import extime, process, cooperator, modal
-
-from vertex import juice
+from epsilon import extime, process, cooperator, modal, juice
from axiom import iaxiom, errors as eaxiom, item, attributes
|
Re-merge vertex=>epsilon juice move.
Fixes #<I> (again)
Author: glyph
Reviewer: mithrandi
Hope that it doesn't break anything significant this time...
|
diff --git a/src/Vector.php b/src/Vector.php
index <HASH>..<HASH> 100644
--- a/src/Vector.php
+++ b/src/Vector.php
@@ -68,7 +68,7 @@ class Vector
* Check whether the given vector is the same as this vector.
*
* @api
- * @param self $b The vector to check for equality.
+ * @param \Nubs\Vectorix\Vector $b The vector to check for equality.
* @return bool True if the vectors are equal and false otherwise.
*/
public function isEqual(self $b)
@@ -103,7 +103,7 @@ class Vector
* The vectors must be of the same dimension and have the same keys in their components.
*
* @internal
- * @param self $b The vector to check against.
+ * @param \Nubs\Vectorix\Vector $b The vector to check against.
* @return void
* @throws Exception if the vectors are not of the same dimension.
* @throws Exception if the vectors' components down have the same keys.
|
Use fully qualified class name to make php analyzer happy.
|
diff --git a/integrationtests/integrationtests_suite_test.go b/integrationtests/integrationtests_suite_test.go
index <HASH>..<HASH> 100644
--- a/integrationtests/integrationtests_suite_test.go
+++ b/integrationtests/integrationtests_suite_test.go
@@ -5,7 +5,6 @@ import (
"crypto/md5"
"encoding/hex"
"fmt"
- "go/build"
"io"
"io/ioutil"
"mime/multipart"
@@ -14,6 +13,7 @@ import (
"os"
"os/exec"
"path"
+ "path/filepath"
"runtime"
"strconv"
@@ -73,11 +73,11 @@ var _ = BeforeEach(func() {
err = os.MkdirAll(uploadDir, os.ModeDir|0777)
Expect(err).ToNot(HaveOccurred())
- clientPath = fmt.Sprintf(
- "%s/src/github.com/lucas-clemente/quic-clients/client-%s-debug",
- build.Default.GOPATH,
- runtime.GOOS,
- )
+ _, thisfile, _, ok := runtime.Caller(0)
+ if !ok {
+ Fail("Failed to get current path")
+ }
+ clientPath = filepath.Join(thisfile, fmt.Sprintf("../../../quic-clients/client-%s-debug", runtime.GOOS))
})
var _ = AfterEach(func() {
|
determine the path to the quic_clients at runtime in integration tests
|
diff --git a/memorious/operations/aleph.py b/memorious/operations/aleph.py
index <HASH>..<HASH> 100644
--- a/memorious/operations/aleph.py
+++ b/memorious/operations/aleph.py
@@ -78,4 +78,4 @@ def get_collection_id(context, session):
def make_url(path):
- return urljoin(settings.ALEPH_HOST, '/api/1/%s' % path)
+ return urljoin(settings.ALEPH_HOST, '/api/%s/%s' % (settings.ALEPH_API_VERSION, path))
diff --git a/memorious/settings.py b/memorious/settings.py
index <HASH>..<HASH> 100644
--- a/memorious/settings.py
+++ b/memorious/settings.py
@@ -85,3 +85,4 @@ ARCHIVE_BUCKET = env('ARCHIVE_BUCKET')
ALEPH_HOST = env('ALEPH_HOST')
ALEPH_API_KEY = env('ALEPH_API_KEY')
+ALEPH_API_VERSION = env('ALEPH_API_VERSION', '1')
|
Env for aleph api version
|
diff --git a/lib/index.js b/lib/index.js
index <HASH>..<HASH> 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -161,14 +161,14 @@ export class Driver {
if (this.config.missing === false) {
if (options.missing === true) {
- return fn(err, results, misses);
+ return fn(errors, results, misses);
}
- return fn(err, results);
+ return fn(errors, results);
}
if (options.missing === false) {
- return fn(err, results);
+ return fn(errors, results);
}
return fn(errors, results, misses);
|
fix to properly return the errors i get multi case
|
diff --git a/tests/index.js b/tests/index.js
index <HASH>..<HASH> 100644
--- a/tests/index.js
+++ b/tests/index.js
@@ -35,6 +35,6 @@ if( hasQuietFlag() ) {
await Promise.all(
(await readdir(testdir))
.filter(name => name.endsWith(TEST_SUFFIX))
- .map(testscript => harness.spawn(NODE_BINARY, [...execArgv, resolve(testdir, testscript)]))
+ .map(testfile => harness.spawn(NODE_BINARY, [...execArgv, resolve(testdir, testfile)]))
);
})();
|
tests: arguably, `testfile` fits better with `testdir` than `testscript`
|
diff --git a/runtime/default.go b/runtime/default.go
index <HASH>..<HASH> 100644
--- a/runtime/default.go
+++ b/runtime/default.go
@@ -85,6 +85,7 @@ func newService(s *Service, c CreateOptions) *service {
Env: c.Env,
Args: args,
},
+ closed: make(chan bool),
output: c.Output,
}
}
|
Fix panic caused when ctrl+c a non started service
|
diff --git a/src/python/dxpy/cli/exec_io.py b/src/python/dxpy/cli/exec_io.py
index <HASH>..<HASH> 100644
--- a/src/python/dxpy/cli/exec_io.py
+++ b/src/python/dxpy/cli/exec_io.py
@@ -402,7 +402,7 @@ def get_input_single(param_desc):
+ BOLD() + param_desc['name'] + ENDC() + ' is not in the list of choices for that input'))
return value
except EOFError:
- raise Exception('')
+ raise DXCLIError('Unexpected end of input')
def get_optional_input_str(param_desc):
return param_desc.get('label', param_desc['name']) + ' (' + param_desc['name'] + ')'
|
dx run: Avoid stack trace on ^D
|
diff --git a/nurbs/__init__.py b/nurbs/__init__.py
index <HASH>..<HASH> 100644
--- a/nurbs/__init__.py
+++ b/nurbs/__init__.py
@@ -24,4 +24,4 @@ Of course you can :-) Please feel free to contact me about the NURBS-Python pack
"""
-__version__ = "2.3"
+__version__ = "2.3.1"
|
Version bumped to <I>
|
diff --git a/lib/AktiveMerchant/Billing/Gateways/HsbcSecureEpayments.php b/lib/AktiveMerchant/Billing/Gateways/HsbcSecureEpayments.php
index <HASH>..<HASH> 100644
--- a/lib/AktiveMerchant/Billing/Gateways/HsbcSecureEpayments.php
+++ b/lib/AktiveMerchant/Billing/Gateways/HsbcSecureEpayments.php
@@ -260,8 +260,7 @@ XML;
private function add_address($options)
{
- $country = Country::find($options['country'])
- ->code('numeric');
+ $country = Country::find($options['country'])->getCode('numeric');
$this->xml .= <<<XML
<Address>
|
hsbc secure epayments country method call fix
|
diff --git a/src/Krystal/Db/Tests/QueryBuilderTest.php b/src/Krystal/Db/Tests/QueryBuilderTest.php
index <HASH>..<HASH> 100644
--- a/src/Krystal/Db/Tests/QueryBuilderTest.php
+++ b/src/Krystal/Db/Tests/QueryBuilderTest.php
@@ -146,6 +146,14 @@ class QueryBuilderTest extends \PHPUnit_Framework_TestCase
$this->verify('SELECT * FROM `table` WHERE `count` < 1 ');
}
+ public function testCanSaveSelectedTableName()
+ {
+ $this->qb->select('*')
+ ->from('users');
+
+ $this->assertEquals('users', $this->qb->getSelectedTable());
+ }
+
public function testCanGenerateDropTable()
{
$this->qb->dropTable('users', false);
|
Added test case for selected table name
|
diff --git a/lib/actions.js b/lib/actions.js
index <HASH>..<HASH> 100644
--- a/lib/actions.js
+++ b/lib/actions.js
@@ -501,6 +501,20 @@ exports.injectJs = function(file) {
};
/*
+ * Includes javascript script from a url on the page.
+ * @param {string} url - The url to a javascript file to include o the page.
+ */
+exports.includeJs = function(url) {
+ var self = this;
+ return this.ready.then(function() {
+ return new HorsemanPromise(function(resolve, reject) {
+ debug('.includeJs() ' + url);
+ self.page.includeJs(url, resolve);
+ });
+ });
+};
+
+/*
* Select a value in an html select element.
* @param {string} selector - The identifier for the select element.
* @param {string} value - The value to select.
|
Add includeJs action
Fixes #<I>
|
diff --git a/actor-apps/core/src/main/java/im/actor/core/modules/internal/messages/OwnReadActor.java b/actor-apps/core/src/main/java/im/actor/core/modules/internal/messages/OwnReadActor.java
index <HASH>..<HASH> 100644
--- a/actor-apps/core/src/main/java/im/actor/core/modules/internal/messages/OwnReadActor.java
+++ b/actor-apps/core/src/main/java/im/actor/core/modules/internal/messages/OwnReadActor.java
@@ -84,6 +84,9 @@ public class OwnReadActor extends ModuleActor {
// Saving read state
context().getMessagesModule().saveReadState(peer, sortingDate);
+
+ // Clearing notifications
+ context().getNotificationsModule().onOwnRead(peer, sortingDate);
}
// Messages
|
fix(core): Fixing notifications
|
diff --git a/src/data.js b/src/data.js
index <HASH>..<HASH> 100644
--- a/src/data.js
+++ b/src/data.js
@@ -29,10 +29,10 @@ Data.prototype = {
// If not, create one
if ( !unlock ) {
unlock = Data.uid++;
- descriptor[ this.expando ] = { value: unlock };
// Secure it in a non-enumerable, non-writable property
try {
+ descriptor[ this.expando ] = { value: unlock };
Object.defineProperties( owner, descriptor );
// Support: Android<4
|
No ticket: Move property descriptor assignment to save a byte. Close gh-<I>.
|
diff --git a/lib/builderator/control/version/git.rb b/lib/builderator/control/version/git.rb
index <HASH>..<HASH> 100644
--- a/lib/builderator/control/version/git.rb
+++ b/lib/builderator/control/version/git.rb
@@ -16,6 +16,8 @@ module Builderator
## Is there a .git repo in the project root?
def self.supported?
+ return true if ENV['GIT_DIR'] && File.exist?(ENV['GIT_DIR'])
+
Util.relative_path('.git').exist?
end
|
Support setting GIT_DIR for git scm provider
|
diff --git a/Kwf/Controller/Action/User/BackendLoginController.php b/Kwf/Controller/Action/User/BackendLoginController.php
index <HASH>..<HASH> 100644
--- a/Kwf/Controller/Action/User/BackendLoginController.php
+++ b/Kwf/Controller/Action/User/BackendLoginController.php
@@ -115,6 +115,11 @@ class Kwf_Controller_Action_User_BackendLoginController extends Kwf_Controller_A
}
$url = $authMethods[$authMethod]->getLoginRedirectUrl($this->_getRedirectBackUrl(), $state, $formValues);
+ if (!$url) {
+ $html = $authMethods[$authMethod]->getLoginRedirectHtml($this->_getRedirectBackUrl(), $state, $formValues);
+ echo $html;
+ exit;
+ }
$this->redirect($url);
}
|
Implement fallback for auth-method with missing login-redirect-url
|
diff --git a/boot/boot.go b/boot/boot.go
index <HASH>..<HASH> 100644
--- a/boot/boot.go
+++ b/boot/boot.go
@@ -55,19 +55,19 @@ func All() error {
}
help("Setup complete!\n\nNext steps: \n - apex infra plan - show an execution plan for Terraform configs\n - apex infra apply - apply Terraform configs\n - apex deploy - deploy example function")
- } else {
- fmt.Println()
- help(`Enter IAM role used by Lambda functions.`)
- iamRole := prompt.StringRequired(" IAM role: ")
+ return nil
+ }
- fmt.Println()
- if err := initProject(name, description, iamRole); err != nil {
- return err
- }
+ fmt.Println()
+ help(`Enter IAM role used by Lambda functions.`)
+ iamRole := prompt.StringRequired(" IAM role: ")
- help("Setup complete!\n\nNext step: \n - apex deploy - deploy example function")
+ fmt.Println()
+ if err := initProject(name, description, iamRole); err != nil {
+ return err
}
+ help("Setup complete!\n\nNext step: \n - apex deploy - deploy example function")
return nil
}
|
remove else branch to de-nest
|
diff --git a/src/trumbowyg.js b/src/trumbowyg.js
index <HASH>..<HASH> 100644
--- a/src/trumbowyg.js
+++ b/src/trumbowyg.js
@@ -1021,8 +1021,8 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', {
$('body', d).on('mousedown.' + t.eventNamespace, function (e) {
if (!$dropdown.is(e.target)) {
- $('.' + prefix + 'dropdown', d).hide();
- $('.' + prefix + 'active', d).removeClass(prefix + 'active');
+ $('.' + prefix + 'dropdown', t.$box).hide();
+ $('.' + prefix + 'active', t.$btnPane).removeClass(prefix + 'active');
$('body', d).off('mousedown.' + t.eventNamespace);
}
});
|
allow Trumbowyg working with shadow dom
|
diff --git a/blockstack_cli_0.14.1/blockstack_client/proxy.py b/blockstack_cli_0.14.1/blockstack_client/proxy.py
index <HASH>..<HASH> 100644
--- a/blockstack_cli_0.14.1/blockstack_client/proxy.py
+++ b/blockstack_cli_0.14.1/blockstack_client/proxy.py
@@ -686,12 +686,12 @@ def ping(proxy=None):
schema = {
'type': 'object',
'properties': {
- 'alive': {
- 'type': 'boolean'
+ 'status': {
+ 'type': 'string'
},
},
'required': [
- 'alive'
+ 'status'
]
}
@@ -706,6 +706,8 @@ def ping(proxy=None):
if json_is_error(resp):
return resp
+ assert resp['status'] == 'alive'
+
except ValidationError as e:
log.exception(e)
resp = json_traceback(resp.get('error'))
|
update `ping()` response schema to match <I> server response
|
diff --git a/lib/sequent/core/transactions/no_transactions.rb b/lib/sequent/core/transactions/no_transactions.rb
index <HASH>..<HASH> 100644
--- a/lib/sequent/core/transactions/no_transactions.rb
+++ b/lib/sequent/core/transactions/no_transactions.rb
@@ -1,7 +1,11 @@
module Sequent
module Core
module Transactions
-
+ #
+ # NoTransactions is used when replaying the +ViewSchema+ for
+ # view schema upgrades. Transactions are not needed there since the
+ # view state will always be recreated anyway.
+ #
class NoTransactions
def transactional
yield
|
Add comment to clarify intent of NoTransactions
|
diff --git a/asyncio_xmpp/callbacks.py b/asyncio_xmpp/callbacks.py
index <HASH>..<HASH> 100644
--- a/asyncio_xmpp/callbacks.py
+++ b/asyncio_xmpp/callbacks.py
@@ -33,6 +33,9 @@ class CallbacksWithToken:
def remove_callback(self, token):
self._callbacks[token.key].pop(token)
+ def remove_callback_fn(self, key, fn):
+ self._callbacks[key].remove(fn)
+
def emit(self, key, *args):
for fn in self._callbacks[key].values():
self._loop.call_soon(fn, *args)
|
Allow to remove callbacks without token if they match exactly
|
diff --git a/ontrack-web/src/app/service/service.buildfilter.js b/ontrack-web/src/app/service/service.buildfilter.js
index <HASH>..<HASH> 100644
--- a/ontrack-web/src/app/service/service.buildfilter.js
+++ b/ontrack-web/src/app/service/service.buildfilter.js
@@ -113,6 +113,10 @@ angular.module('ot.service.buildfilter', [
if (buildFilterResource._update && buildFilterResource.name == currentFilter.name) {
self.saveFilter(config.branch, currentFilter);
}
+ // Sharing if saved under the same name
+ if (buildFilterResource.shared && config.branch._buildFilterShare && buildFilterResource.name == currentFilter.name) {
+ self.shareFilter(config.branch, currentFilter);
+ }
});
} else {
otNotificationService.error("The type of this filter appears not to be supported: " + type + ". " +
|
#<I> Editing shared filters
|
diff --git a/builtin/providers/openstack/resource_openstack_compute_secgroup_v2.go b/builtin/providers/openstack/resource_openstack_compute_secgroup_v2.go
index <HASH>..<HASH> 100644
--- a/builtin/providers/openstack/resource_openstack_compute_secgroup_v2.go
+++ b/builtin/providers/openstack/resource_openstack_compute_secgroup_v2.go
@@ -92,12 +92,9 @@ func resourceComputeSecGroupV2Update(d *schema.ResourceData, meta interface{}) e
return fmt.Errorf("Error creating OpenStack compute client: %s", err)
}
- var updateOpts secgroups.UpdateOpts
- if d.HasChange("name") {
- updateOpts.Name = d.Get("name").(string)
- }
- if d.HasChange("description") {
- updateOpts.Description = d.Get("description").(string)
+ updateOpts := secgroups.UpdateOpts{
+ Name: d.Get("name").(string),
+ Description: d.Get("description").(string),
}
log.Printf("[DEBUG] Updating Security Group (%s) with options: %+v", d.Id(), updateOpts)
|
always need both name and description when updating
|
diff --git a/aiortc/rtcrtpreceiver.py b/aiortc/rtcrtpreceiver.py
index <HASH>..<HASH> 100644
--- a/aiortc/rtcrtpreceiver.py
+++ b/aiortc/rtcrtpreceiver.py
@@ -69,7 +69,11 @@ class RTCRtpReceiver:
# skip RTCP for now
if is_rtcp(data):
- for packet in RtcpPacket.parse(data):
+ try:
+ packets = RtcpPacket.parse(data)
+ except ValueError:
+ continue
+ for packet in packets:
logger.debug('receiver(%s) < %s' % (self._kind, packet))
# handle RTP
diff --git a/tests/test_rtcrtpreceiver.py b/tests/test_rtcrtpreceiver.py
index <HASH>..<HASH> 100644
--- a/tests/test_rtcrtpreceiver.py
+++ b/tests/test_rtcrtpreceiver.py
@@ -44,6 +44,9 @@ class RTCRtpReceiverTest(TestCase):
# receive RTCP
run(remote.send(load('rtcp_sr.bin')))
+ # receive truncated RTCP
+ run(remote.send(b'\x81\xca\x00'))
+
# receive garbage
run(remote.send(b'garbage'))
|
[rtp] don't bomb when receiving malformed RTCP
|
diff --git a/couchbase/tests/cases/append_t.py b/couchbase/tests/cases/append_t.py
index <HASH>..<HASH> 100644
--- a/couchbase/tests/cases/append_t.py
+++ b/couchbase/tests/cases/append_t.py
@@ -19,7 +19,7 @@ from couchbase import FMT_JSON, FMT_PICKLE, FMT_BYTES, FMT_UTF8
from couchbase.exceptions import (KeyExistsError, ValueFormatError,
ArgumentError, NotFoundError,
- NotStoredError)
+ NotStoredError, CouchbaseError)
from couchbase.tests.base import ConnectionTestCase
@@ -58,8 +58,12 @@ class ConnectionAppendTest(ConnectionTestCase):
def test_append_enoent(self):
key = self.gen_key("append_enoent")
self.cb.delete(key, quiet=True)
- self.assertRaises(NotStoredError,
- self.cb.append, key, "value")
+ try:
+ self.cb.append(key, "value")
+ self.assertTrue(false, "Exception not thrown")
+ except CouchbaseError as e:
+ self.assertTrue(isinstance(e, NotStoredError)
+ or isinstance(e, NotFoundError))
def test_append_multi(self):
kv = self.gen_kv_dict(amount=4, prefix="append_multi")
|
append_t: Newer server build returns ENOENT rather than NOT_STORED
The latest builds of the server return this error code (which is
actually more correct anyway).
Change-Id: I<I>e<I>b<I>b<I>bf<I>dab<I>bf<I>c
Reviewed-on: <URL>
|
diff --git a/lib/webspicy/version.rb b/lib/webspicy/version.rb
index <HASH>..<HASH> 100644
--- a/lib/webspicy/version.rb
+++ b/lib/webspicy/version.rb
@@ -2,7 +2,7 @@ module Webspicy
module Version
MAJOR = 0
MINOR = 20
- TINY = 15
+ TINY = 16
end
VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"
end
|
Bump to <I> and release.
|
diff --git a/lib/reporters/dot_reporter.js b/lib/reporters/dot_reporter.js
index <HASH>..<HASH> 100644
--- a/lib/reporters/dot_reporter.js
+++ b/lib/reporters/dot_reporter.js
@@ -84,7 +84,7 @@ DotReporter.prototype = {
printf(this.out, '\n%s', indent(error.stack, 5));
}
- this.out.write('\n');
+ this.out.write('\n\n');
}, this);
},
summaryDisplay: function() {
|
separate each test failure report by an empty line
|
diff --git a/cliTool/argumentParser.js b/cliTool/argumentParser.js
index <HASH>..<HASH> 100644
--- a/cliTool/argumentParser.js
+++ b/cliTool/argumentParser.js
@@ -63,7 +63,9 @@ function getFormat(formatString) {
else if(format == 'chicago' || format == 'c') {
return require('../core/model/formats/chicago');
}
-
+ else if(format == 'bibtexmisc' || format == 'bm') {
+ return require('../core/model/formats/bibtexmisc');
+ }
throw new Error(formatString + ' is an unsuported citation format. Try "apa" or "chicago"');
}
|
added bibtexmisc formatting style to the parser
|
diff --git a/packages/bonde-admin/src/mobilizations/paths.js b/packages/bonde-admin/src/mobilizations/paths.js
index <HASH>..<HASH> 100644
--- a/packages/bonde-admin/src/mobilizations/paths.js
+++ b/packages/bonde-admin/src/mobilizations/paths.js
@@ -1,5 +1,5 @@
export const mobilizations = () => '/mobilizations'
-export const mobilization = (mobilization, domain = process.env.REACT_APP_DOMAIN_ADMIN) => {
+export const mobilization = (mobilization, domain = process.env.REACT_APP_DOMAIN_PUBLIC) => {
if (domain && domain.indexOf('staging') !== -1) {
return `http://${mobilization.slug}.${domain}`
}
|
fix(admin): change env redirect to mobilization on public version
|
diff --git a/examples/WhenTest.php b/examples/WhenTest.php
index <HASH>..<HASH> 100644
--- a/examples/WhenTest.php
+++ b/examples/WhenTest.php
@@ -1,10 +1,5 @@
<?php
-/**
- * Some of these would make good unit tests, but importing them
- * doesn't solve the problem as the more important ones are the failures
- * We need to look into end-to-end testing
- */
class WhenTest extends \PHPUnit_Framework_TestCase
{
use Eris\TestTrait;
|
Removing comment about end2end testing, which has been addresses by test/Eris/ExampleEnd2EndTest.php
|
diff --git a/dolo/tests/test_customdr.py b/dolo/tests/test_customdr.py
index <HASH>..<HASH> 100644
--- a/dolo/tests/test_customdr.py
+++ b/dolo/tests/test_customdr.py
@@ -1,6 +1,6 @@
def test_custom_dr():
- from dolo import yaml_import
+ from dolo import yaml_import, simulate, time_iteration
import numpy as np
from dolo.numeric.decision_rule import CustomDR
|
FIX: missing imports in tests.
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.