diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/lib/X509/Certificate/Extension/CertificatePolicy/PolicyInformation.php b/lib/X509/Certificate/Extension/CertificatePolicy/PolicyInformation.php
index <HASH>..<HASH> 100644
--- a/lib/X509/Certificate/Extension/CertificatePolicy/PolicyInformation.php
+++ b/lib/X509/Certificate/Extension/CertificatePolicy/PolicyInformation.php
@@ -96,7 +96,7 @@ class PolicyInformation implements \Countable, \IteratorAggregate
* @return PolicyQualifierInfo[]
*/
public function qualifiers() {
- return $this->_qualifiers;
+ return array_values($this->_qualifiers);
}
/**
|
Fix qualifiers method to strip array keys
|
diff --git a/src/main/java/edu/washington/cs/knowitall/commonlib/regex/Expression.java b/src/main/java/edu/washington/cs/knowitall/commonlib/regex/Expression.java
index <HASH>..<HASH> 100644
--- a/src/main/java/edu/washington/cs/knowitall/commonlib/regex/Expression.java
+++ b/src/main/java/edu/washington/cs/knowitall/commonlib/regex/Expression.java
@@ -310,7 +310,7 @@ public interface Expression<E> extends Predicate<E> {
* @param <E>
*/
static abstract class BaseExpression<E> implements Expression<E> {
- private final String source;
+ public final String source;
public BaseExpression(String source) {
this.source = source;
|
Made the source field of BaseExpression public.
|
diff --git a/flux_led/models_db.py b/flux_led/models_db.py
index <HASH>..<HASH> 100755
--- a/flux_led/models_db.py
+++ b/flux_led/models_db.py
@@ -935,7 +935,7 @@ MODELS = [
model_num=0x33,
# 'AK001-ZJ100' == v3 - WIFI370 version
# 'AK001-ZJ210' == v6.37 - Seen on the outdoor string lights from Lytworx
- # 'AK001-ZJ2104' == v7 supports turning on by effect/levels set
+ # 'AK001-ZJ2104' == v7.07 - Seen on usb fairy lights - supports turning on by effect/levels set
# 'AK001-ZJ2134' == v8.02 - seen on the water proof controllers for outdoor garden light
# 'AK001-ZJ2101' == v8.61, 8.62 (44 key) - no dimmable effects confirmed, confirmed auto on
# "AK001-ZJ2145" == v9 # no rf support!
|
Add minor version to 0x<I> v7 in db (#<I>)
|
diff --git a/rest-client.js b/rest-client.js
index <HASH>..<HASH> 100644
--- a/rest-client.js
+++ b/rest-client.js
@@ -105,12 +105,11 @@ return /******/ (function(modules) { // webpackBootstrap
if (args) url += '?' + toQuery(args);
var xhr = new XMLHttpRequest();
+ xhr.open(method, url, true);
var contentType = 'application/json';
if (method == 'POST') contentType = 'application/x-www-form-urlencoded';
-
xhr.setRequestHeader('Content-Type', contentType);
- xhr.open(method, url, true);
this.prerequest(xhr);
diff --git a/src/rest-client.js b/src/rest-client.js
index <HASH>..<HASH> 100644
--- a/src/rest-client.js
+++ b/src/rest-client.js
@@ -32,13 +32,12 @@ class RestClient {
url += '?' + toQuery(args);
let xhr = new XMLHttpRequest();
+ xhr.open(method, url, true);
let contentType = 'application/json';
if (method == 'POST')
contentType = 'application/x-www-form-urlencoded';
-
xhr.setRequestHeader('Content-Type', contentType);
- xhr.open(method, url, true);
this.prerequest(xhr);
|
Fixed wrong xhr open and header setting order
|
diff --git a/src/BulkTools/HTTPBulkToolsResponse.php b/src/BulkTools/HTTPBulkToolsResponse.php
index <HASH>..<HASH> 100644
--- a/src/BulkTools/HTTPBulkToolsResponse.php
+++ b/src/BulkTools/HTTPBulkToolsResponse.php
@@ -334,7 +334,7 @@ class HTTPBulkToolsResponse extends HTTPResponse
);
foreach ($this->successRecords as $record) {
- $data = array('id' => $record->ID, 'class' => $record->ClassName);
+ $data = array('id' => $record->ID, 'class' => str_replace('\\', '\\\\', $record->ClassName));
if (!$this->removesRows) {
$data['row'] = $this->getRecordGridfieldRow($record);
}
|
FIX Row updating broken in SilverStripe 4 (#<I>)
Row updating is broken in SilverStripe 4 when for example using the PublishHandler or UnPublishHandler actions. This is due to unescaped backslashes in the fully qualified class name in json data, which when parsed in javascript treats the backslash as an escape character.
This can be fixed by escaping the backslash character in HTTPBulkToolsResponse.
|
diff --git a/python/mxnet/module/module.py b/python/mxnet/module/module.py
index <HASH>..<HASH> 100644
--- a/python/mxnet/module/module.py
+++ b/python/mxnet/module/module.py
@@ -170,7 +170,11 @@ class Module(BaseModule):
"""Internal helper for parameter initialization"""
if cache is not None:
if cache.has_key(name):
- cache[name].copyto(arr)
+ cache_arr = cache[name]
+
+ # just in case the cached array is just the target itself
+ if cache_arr is not arr:
+ cache_arr.copyto(arr)
else:
assert allow_missing
initializer(name, arr)
|
add a guard to avoid copying to itself in setting parameters
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -75,7 +75,7 @@ install_requires = [
setup(
name='pyrpo',
- version='0.1.0',
+ version='0.1.1',
description=(
'A shell command wrapper for hg, git, bzr, svn'),
long_description=build_long_description(),
|
RLS: setup.py: version number to <I>
|
diff --git a/zengine/settings.py b/zengine/settings.py
index <HASH>..<HASH> 100644
--- a/zengine/settings.py
+++ b/zengine/settings.py
@@ -41,7 +41,12 @@ RIAK_PORT = os.environ.get('RIAK_PORT', 8098)
REDIS_SERVER = os.environ.get('REDIS_SERVER', '127.0.0.1:6379')
-ALLOWED_ORIGINS = ['http://127.0.0.1:8080', 'http://127.0.0.1:9001', 'http://ulakbus.net']
+ALLOWED_ORIGINS = [
+ 'http://127.0.0.1:8080',
+ 'http://127.0.0.1:9001',
+ 'http://ulakbus.net',
+ 'http://www.ulakbus.net'
+]
ENABLED_MIDDLEWARES = [
'zengine.middlewares.CORS',
|
add www subdomain of ulakbus net to ALLOWED_ORIGINS
|
diff --git a/src/org/zaproxy/zap/extension/ascan/ActiveScanAPI.java b/src/org/zaproxy/zap/extension/ascan/ActiveScanAPI.java
index <HASH>..<HASH> 100644
--- a/src/org/zaproxy/zap/extension/ascan/ActiveScanAPI.java
+++ b/src/org/zaproxy/zap/extension/ascan/ActiveScanAPI.java
@@ -712,8 +712,13 @@ public class ActiveScanAPI extends ApiImplementor {
}
try {
- node = SessionStructure
- .find(Model.getSingleton().getSession().getSessionId(), new URI(url, false), method, postData);
+ long sessionId = Model.getSingleton().getSession().getSessionId();
+ node = SessionStructure.find(sessionId, startURI, method, postData);
+ if (node == null && "GET".equalsIgnoreCase(method)) {
+ // Check if there's a non-leaf node that matches the URI, to scan the subtree.
+ // (GET is the default method, but non-leaf nodes do not have any method.)
+ node = SessionStructure.find(sessionId, startURI, null, postData);
+ }
} catch (Exception e) {
throw new ApiException(ApiException.Type.INTERNAL_ERROR, e);
}
|
Allow to use non-leaf nodes with ascan API
Change ActiveScanAPI to use the non-leaf node (URL) to start the scan,
if the provided URL does not match an existing leaf node.
Fix #<I> - Active Scan API - Allow to start the scans with non-leaf
nodes
|
diff --git a/tests/pay_to_test.py b/tests/pay_to_test.py
index <HASH>..<HASH> 100755
--- a/tests/pay_to_test.py
+++ b/tests/pay_to_test.py
@@ -152,5 +152,10 @@ class ScriptTypesTest(unittest.TestCase):
tx2.sign(hash160_lookup=hash160_lookup, p2sh_lookup=p2sh_lookup)
self.assertEqual(tx2.bad_signature_count(), 0)
+ def test_weird_tx(self):
+ # this is from tx 12a8d1d62d12307eac6e62f2f14d7e826604e53c320a154593845aa7c8e59fbf
+ st = script_obj_from_script(b'Q')
+ self.assertNotEqual(st, None)
+
if __name__ == "__main__":
unittest.main()
|
Add a new (failing) test.
|
diff --git a/ast.go b/ast.go
index <HASH>..<HASH> 100644
--- a/ast.go
+++ b/ast.go
@@ -58,17 +58,6 @@ func Parse(sql string) (Statement, error) {
return tokenizer.ParseTree, nil
}
-func ParseFromTokenizer(tokenizer *Tokenizer) (Statement, error) {
- if yyParse(tokenizer) != 0 {
- if tokenizer.partialDDL != nil {
- tokenizer.ParseTree = tokenizer.partialDDL
- return tokenizer.ParseTree, nil
- }
- return nil, tokenizer.LastError
- }
- return tokenizer.ParseTree, nil
-}
-
// ParseStrictDDL is the same as Parse except it errors on
// partially parsed DDL statements.
func ParseStrictDDL(sql string) (Statement, error) {
|
Remove a function that is not upstream and no longer needed.
|
diff --git a/enforcer_synced.go b/enforcer_synced.go
index <HASH>..<HASH> 100644
--- a/enforcer_synced.go
+++ b/enforcer_synced.go
@@ -92,6 +92,13 @@ func (e *SyncedEnforcer) SetWatcher(watcher persist.Watcher) error {
return watcher.SetUpdateCallback(func(string) { _ = e.LoadPolicy() })
}
+// LoadModel reloads the model from the model CONF file.
+func (e *SyncedEnforcer) LoadModel() error {
+ e.m.Lock()
+ defer e.m.Unlock()
+ return e.Enforcer.LoadModel()
+}
+
// ClearPolicy clears all policy.
func (e *SyncedEnforcer) ClearPolicy() {
e.m.Lock()
|
fix: LoadModel is not synchronized (#<I>)
|
diff --git a/test/test.js b/test/test.js
index <HASH>..<HASH> 100644
--- a/test/test.js
+++ b/test/test.js
@@ -22,7 +22,7 @@ describe('timeout()', function(){
describe('when above the timeout', function(){
describe('with no response made', function(){
- it('should respond with 408 Request timeout', function(done){
+ it('should respond with 503 Request timeout', function(done){
var app = connect()
.use(timeout(300))
.use(function(req, res){
|
tests: fix test description
closes #8
|
diff --git a/core/server/api/v2/utils/serializers/output/utils/members.js b/core/server/api/v2/utils/serializers/output/utils/members.js
index <HASH>..<HASH> 100644
--- a/core/server/api/v2/utils/serializers/output/utils/members.js
+++ b/core/server/api/v2/utils/serializers/output/utils/members.js
@@ -47,6 +47,7 @@ const forPost = (attrs, frame) => {
if (!origInclude || !origInclude.includes('tags')) {
delete attrs.tags;
+ attrs.primary_tag = null;
}
}
|
Removed serving primary_tag when members is enabled
no issue
- Content API v2 served primary_tag by default if members flag is enabled
- reference: <URL>
|
diff --git a/fireplace/cards/gvg/neutral_epic.py b/fireplace/cards/gvg/neutral_epic.py
index <HASH>..<HASH> 100644
--- a/fireplace/cards/gvg/neutral_epic.py
+++ b/fireplace/cards/gvg/neutral_epic.py
@@ -9,3 +9,24 @@ class GVG_104:
def OWN_CARD_PLAYED(self, card):
if card.type == CardType.MINION and card.atk == 1:
return [Buff(card, "GVG_104a")]
+
+
+# Piloted Sky Golem
+class GVG_105:
+ def deathrattle(self):
+ return [Summon(CONTROLLER, randomCollectible(type=CardType.MINION, cost=4))]
+
+
+# Junkbot
+class GVG_106:
+ def OWN_MINION_DESTROY(self, minion):
+ if minion.race == Race.MECHANICAL:
+ return [Buff(SELF, "GVG_106e")]
+
+
+# Enhance-o Mechano
+class GVG_107:
+ def action(self):
+ for target in self.controller.field:
+ tag = random.choice((GameTag.WINDFURY, GameTag.TAUNT, GameTag.DIVINE_SHIELD))
+ yield SetTag(target, {tag: True})
|
Implement Piloted Sky Golem, Junkbot and Enhance-o Mechano
|
diff --git a/shared/api/instance_state.go b/shared/api/instance_state.go
index <HASH>..<HASH> 100644
--- a/shared/api/instance_state.go
+++ b/shared/api/instance_state.go
@@ -182,4 +182,12 @@ type InstanceStateNetworkCounters struct {
// Number of packets sent
// Example: 964
PacketsSent int64 `json:"packets_sent" yaml:"packets_sent"`
+
+ // Number of errors received
+ // Example: 14
+ ErrorsReceived int64 `json:"errors_received" yaml:"errors_received"`
+
+ // Number of errors sent
+ // Example: 41
+ ErrorsSent int64 `json:"errors_sent" yaml:"errors_sent"`
}
|
shared/api: Add Errors{Received,Sent} to network counters
|
diff --git a/Queue.js b/Queue.js
index <HASH>..<HASH> 100644
--- a/Queue.js
+++ b/Queue.js
@@ -82,6 +82,9 @@ class Queue {
// queue size of non-mature elements only
schedSize (callback) {callback (null, 0);}
+ // queue size of reserved elements only
+ resvSize (callback) {callback (null, null);}
+
// Date of next
next_t (callback) {callback (null, null);}
|
added commom Queue.resvSize()
|
diff --git a/go/galeraautofix/mariadb/mariadb.go b/go/galeraautofix/mariadb/mariadb.go
index <HASH>..<HASH> 100644
--- a/go/galeraautofix/mariadb/mariadb.go
+++ b/go/galeraautofix/mariadb/mariadb.go
@@ -36,6 +36,7 @@ func ForceStop(ctx context.Context) error {
}
exec.Command(`pkill`, `-9`, `-f`, `mysqld`).Run()
+ exec.Command(`pkill`, `-9`, `-f`, `socat`).Run()
return nil
}
|
kill any socat that is still running when force stopping MariaDB in galera-autofix
|
diff --git a/indra/assemblers/graph/assembler.py b/indra/assemblers/graph/assembler.py
index <HASH>..<HASH> 100644
--- a/indra/assemblers/graph/assembler.py
+++ b/indra/assemblers/graph/assembler.py
@@ -142,6 +142,7 @@ class GraphAssembler():
self._add_complex(stmt.members)
elif all([ag is not None for ag in stmt.agent_list()]):
self._add_stmt_edge(stmt)
+ return self.get_string()
def get_string(self):
"""Return the assembled graph as a string.
diff --git a/indra/tests/test_graph_assembler.py b/indra/tests/test_graph_assembler.py
index <HASH>..<HASH> 100644
--- a/indra/tests/test_graph_assembler.py
+++ b/indra/tests/test_graph_assembler.py
@@ -8,7 +8,8 @@ def test_phosphorylation():
st = [Phosphorylation(Agent('MAP2K1'), Agent('MAPK1'))]
ga = GraphAssembler()
ga.add_statements(st)
- ga.make_model()
+ model = ga.make_model()
+ assert 'MAP2K1' in model
assert len(ga.graph.nodes()) == 2
assert len(ga.graph.edges()) == 1
|
Return agraph string when assembling graph
|
diff --git a/dbt/adapters/redshift.py b/dbt/adapters/redshift.py
index <HASH>..<HASH> 100644
--- a/dbt/adapters/redshift.py
+++ b/dbt/adapters/redshift.py
@@ -37,7 +37,7 @@ class RedshiftAdapter(PostgresAdapter):
@classmethod
def dist_qualifier(cls, dist):
- dist_key = dist_key.strip().lower()
+ dist_key = dist.strip().lower()
if dist_key in ['all', 'even']:
return 'diststyle({})'.format(dist_key)
@@ -53,8 +53,10 @@ class RedshiftAdapter(PostgresAdapter):
.format(sort_type, valid_sort_types)
)
- if type(sort_keys) == str:
- sort_keys = [sort_keys]
+ if type(sort) == str:
+ sort_keys = [sort]
+ else:
+ sort_keys = sort
formatted_sort_keys = ['"{}"'.format(sort_key)
for sort_key in sort_keys]
|
fix typos in sort/dist key generator
|
diff --git a/builtin/providers/aws/resource_aws_elasticsearch_domain.go b/builtin/providers/aws/resource_aws_elasticsearch_domain.go
index <HASH>..<HASH> 100644
--- a/builtin/providers/aws/resource_aws_elasticsearch_domain.go
+++ b/builtin/providers/aws/resource_aws_elasticsearch_domain.go
@@ -381,7 +381,7 @@ func resourceAwsElasticSearchDomainUpdate(d *schema.ResourceData, meta interface
return err
}
- err = resource.Retry(50*time.Minute, func() *resource.RetryError {
+ err = resource.Retry(60*time.Minute, func() *resource.RetryError {
out, err := conn.DescribeElasticsearchDomain(&elasticsearch.DescribeElasticsearchDomainInput{
DomainName: aws.String(d.Get("domain_name").(string)),
})
@@ -417,7 +417,7 @@ func resourceAwsElasticSearchDomainDelete(d *schema.ResourceData, meta interface
}
log.Printf("[DEBUG] Waiting for ElasticSearch domain %q to be deleted", d.Get("domain_name").(string))
- err = resource.Retry(60*time.Minute, func() *resource.RetryError {
+ err = resource.Retry(90*time.Minute, func() *resource.RetryError {
out, err := conn.DescribeElasticsearchDomain(&elasticsearch.DescribeElasticsearchDomainInput{
DomainName: aws.String(d.Get("domain_name").(string)),
})
|
provider/aws: Bump `aws_elasticsearch_domain` timeout values
Fixes #<I>
The Update timeout and delete timeouts were a little short. Bumped them
to <I> mins and <I> mins respectively. I have been on the receiving of the
timeout for the Delete function
|
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
@@ -72,6 +72,5 @@ EOS
components/simon_game/lib
components/simon_game/test
config
- helpers
)
end
\ No newline at end of file
|
Rubigen would still create a helpers directory when creating a new project. Fixed
git-svn-id: <URL>
|
diff --git a/staging/src/k8s.io/apiserver/pkg/server/filters/priority-and-fairness.go b/staging/src/k8s.io/apiserver/pkg/server/filters/priority-and-fairness.go
index <HASH>..<HASH> 100644
--- a/staging/src/k8s.io/apiserver/pkg/server/filters/priority-and-fairness.go
+++ b/staging/src/k8s.io/apiserver/pkg/server/filters/priority-and-fairness.go
@@ -122,8 +122,13 @@ func WithPriorityAndFairness(
served = true
innerCtx := context.WithValue(ctx, priorityAndFairnessKey, classification)
innerReq := r.Clone(innerCtx)
+
+ // We intentionally set the UID of the flow-schema and priority-level instead of name. This is so that
+ // the names that cluster-admins choose for categorization and priority levels are not exposed, also
+ // the names might make it obvious to the users that they are rejected due to classification with low priority.
w.Header().Set(flowcontrol.ResponseHeaderMatchedPriorityLevelConfigurationUID, string(classification.PriorityLevelUID))
w.Header().Set(flowcontrol.ResponseHeaderMatchedFlowSchemaUID, string(classification.FlowSchemaUID))
+
handler.ServeHTTP(w, innerReq)
}
digest := utilflowcontrol.RequestDigest{RequestInfo: requestInfo, User: user}
|
add comment to describe why we set the UID in the response headers
|
diff --git a/lib/engineyard-serverside/dependency_manager/composer.rb b/lib/engineyard-serverside/dependency_manager/composer.rb
index <HASH>..<HASH> 100644
--- a/lib/engineyard-serverside/dependency_manager/composer.rb
+++ b/lib/engineyard-serverside/dependency_manager/composer.rb
@@ -13,7 +13,7 @@ module EY
shell.status "Installing composer packages (composer.#{lock_or_json} detected)"
composer_install
else
- raise EY::Serverside::RemoteFailure.new("Composer not available!")
+ raise EY::Serverside::RemoteFailure.new("composer.#{lock_or_json} detected but composer not available!")
end
end
|
Slightly more verbose error message.
|
diff --git a/gseapy/stats.py b/gseapy/stats.py
index <HASH>..<HASH> 100644
--- a/gseapy/stats.py
+++ b/gseapy/stats.py
@@ -75,8 +75,9 @@ def calc_pvalues(query, gene_sets, background=20000, **kwargs):
# p(X >= hitCounts)
pval = hypergeom.sf(x-1, bg, m, k)
#oddr, pval2 = odds_ratio_calc(bg, k, m, x)
- expect_count = k*m/bg
- oddr= x / expect_count
+ # expect_count = k*m/bg
+ # oddr= x / expect_count
+ oddr= (x*(bg-m))/(m*(k-x)) # thanks to @sreichl.
vals.append((s, pval, oddr, x, m, hits))
return zip(*vals)
|
odds ratio correction, #<I>
|
diff --git a/src/server/pkg/collection/collection.go b/src/server/pkg/collection/collection.go
index <HASH>..<HASH> 100644
--- a/src/server/pkg/collection/collection.go
+++ b/src/server/pkg/collection/collection.go
@@ -213,6 +213,12 @@ func (c *readWriteCollection) Delete(key string) error {
}
func (c *readWriteCollection) DeleteAll() {
+ for _, index := range c.indexes {
+ // Delete indexes
+ indexDir := c.prefix
+ indexDir = strings.TrimRight(indexDir, "/")
+ c.stm.DelAll(fmt.Sprintf("%s__index_%s/", indexDir, index))
+ }
c.stm.DelAll(c.prefix)
}
|
Delete indexes in DeleteAll
|
diff --git a/blackbird/test/configread_test/global_section_test.py b/blackbird/test/configread_test/global_section_test.py
index <HASH>..<HASH> 100644
--- a/blackbird/test/configread_test/global_section_test.py
+++ b/blackbird/test/configread_test/global_section_test.py
@@ -32,8 +32,7 @@ class TestSetModuleDir(ConfigReaderBase):
config = ConfigReader(infile=cfg_lines).config
check_value = os.path.abspath('plugins')
- print os.path.abspath(os.path.curdir)
-
+ os.path.abspath(os.path.curdir)
ok_(check_value in config['global']['module_dir'],
msg=('Doesn\'t insert default "module_dir" value.'
'All config value: {0}'.format(config)
diff --git a/blackbird/test/test_configread/test_global/test_module_dir.py b/blackbird/test/test_configread/test_global/test_module_dir.py
index <HASH>..<HASH> 100644
--- a/blackbird/test/test_configread/test_global/test_module_dir.py
+++ b/blackbird/test/test_configread/test_global/test_module_dir.py
@@ -41,7 +41,6 @@ class TestConfigReaderAddDefaultModuleDir(object):
infile=infile
)
module_dirs = test_config.config['global']['module_dir']
- print module_dirs
nose.tools.ok_(
(
len(module_dirs) == 2
|
Oooops!:scream_cat: Forgot removing print debug
|
diff --git a/src/joint.dia.graph.js b/src/joint.dia.graph.js
index <HASH>..<HASH> 100644
--- a/src/joint.dia.graph.js
+++ b/src/joint.dia.graph.js
@@ -954,20 +954,20 @@ joint.dia.Graph = Backbone.Model.extend({
// Return bounding box of all elements.
- getBBox: function(cells) {
- return this.getCellsBBox(cells || this.getElements());
+ getBBox: function(cells, opt) {
+ return this.getCellsBBox(cells || this.getElements(), opt);
},
// Return the bounding box of all cells in array provided.
// Links are being ignored.
- getCellsBBox: function(cells) {
+ getCellsBBox: function(cells, opt) {
return _.reduce(cells, function(memo, cell) {
if (cell.isLink()) return memo;
if (memo) {
- return memo.union(cell.getBBox());
+ return memo.union(cell.getBBox(opt));
} else {
- return cell.getBBox();
+ return cell.getBBox(opt);
}
}, null);
},
|
Added options support to graph.getBBox in order to match the ones of cell.getBBox
|
diff --git a/src/widgets/remote/reaction/reaction.js b/src/widgets/remote/reaction/reaction.js
index <HASH>..<HASH> 100644
--- a/src/widgets/remote/reaction/reaction.js
+++ b/src/widgets/remote/reaction/reaction.js
@@ -72,9 +72,9 @@
let state = $.ajaxResponseGet ( res, 'state' );
- if ( _.isUndefined ( state ) ) return;
+ if ( _.isNull ( state ) ) return;
- this._remoteState ( resj );
+ this._remoteState ( state );
}
|
RemoteReaction: fixed leftover refactoring
|
diff --git a/Dispatcher.php b/Dispatcher.php
index <HASH>..<HASH> 100644
--- a/Dispatcher.php
+++ b/Dispatcher.php
@@ -40,9 +40,12 @@ abstract class QM_Dispatcher {
public function output( QM_Collector $collector ) {
$filter = 'query_monitor_output_' . $this->id . '_' . $collector->id;
-
$output = apply_filters( $filter, null, $collector );
+ if ( false === $output ) {
+ return;
+ }
+
if ( !is_a( $output, 'QM_Output' ) ) {
$output = $this->get_outputter( $collector );
}
|
A dispatcher can return boolean `false` for a particular collector in order to not output it
|
diff --git a/erizo_controller/erizoController/roomController.js b/erizo_controller/erizoController/roomController.js
index <HASH>..<HASH> 100644
--- a/erizo_controller/erizoController/roomController.js
+++ b/erizo_controller/erizoController/roomController.js
@@ -23,14 +23,14 @@ exports.RoomController = function (spec) {
var amqper = spec.amqper;
- var KEELALIVE_INTERVAL = 5*1000;
+ var KEEPALIVE_INTERVAL = 5*1000;
var eventListeners = [];
var callbackFor = function(erizo_id, publisher_id) {
return function(ok) {
if (ok !== true) {
- dispatchEvent("unpublish", erizo_id);
+ dispatchEvent("unpublish", publisher_id);
amqper.callRpc("ErizoAgent", "deleteErizoJS", [erizo_id], {callback: function(){
delete erizos[publisher_id];
}});
@@ -45,7 +45,7 @@ exports.RoomController = function (spec) {
}
};
- var keepAliveLoop = setInterval(sendKeepAlive, KEELALIVE_INTERVAL);
+ var keepAliveLoop = setInterval(sendKeepAlive, KEEPALIVE_INTERVAL);
var createErizoJS = function(publisher_id, callback) {
amqper.callRpc("ErizoAgent", "createErizoJS", [publisher_id], {callback: function(erizo_id) {
|
Corrected keepalive variable name
|
diff --git a/public/app/features/dashboard/shareSnapshotCtrl.js b/public/app/features/dashboard/shareSnapshotCtrl.js
index <HASH>..<HASH> 100644
--- a/public/app/features/dashboard/shareSnapshotCtrl.js
+++ b/public/app/features/dashboard/shareSnapshotCtrl.js
@@ -41,10 +41,13 @@ function (angular, _) {
$scope.createSnapshot = function(external) {
$scope.dashboard.snapshot = {
- timestamp: new Date(),
- originalUrl: $location.absUrl()
+ timestamp: new Date()
};
+ if (!external) {
+ $scope.dashboard.snapshot.originalUrl = $location.absUrl();
+ }
+
$scope.loading = true;
$scope.snapshot.external = external;
|
(snapshot) restrict saving original url for local snapshot
|
diff --git a/lib/proxy.js b/lib/proxy.js
index <HASH>..<HASH> 100644
--- a/lib/proxy.js
+++ b/lib/proxy.js
@@ -69,7 +69,7 @@ module.exports.createProxy = function (host, ports, options, reqCallback) {
}
// Alter accept-encoding header to ensure plain-text response
- req.headers['accept-encoding'] = '*;q=1,gzip=0';
+ req.headers["accept-encoding"] = "*;q=1,gzip=0";
var tags = messages.scriptTags(host, ports[0], ports[1]);
|
Add gzip support for proxy + spec
|
diff --git a/tests/test_mongoalchemy_object.py b/tests/test_mongoalchemy_object.py
index <HASH>..<HASH> 100644
--- a/tests/test_mongoalchemy_object.py
+++ b/tests/test_mongoalchemy_object.py
@@ -95,6 +95,10 @@ class MongoAlchemyObjectTestCase(BaseTestCase):
def should_be_able_to_create_two_decoupled_mongoalchemy_instances(self):
app = Flask('new_test')
+ app.config['MONGOALCHEMY_DATABASE'] = 'my_database'
+ db1 = MongoAlchemy(app)
+ db2 = MongoAlchemy(app)
+ assert db1.Document is not db2.Document, "two document should be totally different"
def teardown(self):
del(self.app)
|
Added test reproducing issue #<I>
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -24,7 +24,7 @@
var long_months = ['January', 'February', 'March', 'April', 'May', 'June',
'July', 'August', 'September', 'October', 'November', 'December']
- var short_months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Nov', 'Dec']
+ var short_months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
var tokens = {
d: function (date) {
|
whoops! short_months doesn't have october!
unit tests ftw
|
diff --git a/profiling/stats.py b/profiling/stats.py
index <HASH>..<HASH> 100644
--- a/profiling/stats.py
+++ b/profiling/stats.py
@@ -308,7 +308,6 @@ class RecordingStatistics(RecordingStatistic, Statistics):
self.wall_time = max(0, self.wall() - self._wall_time_started)
except AttributeError:
raise RuntimeError('Starting does not recorded.')
- self.own_count = 1
del self._cpu_time_started
del self._wall_time_started
|
RecordingStatistics doesn't increase own_count
|
diff --git a/menuconfig.py b/menuconfig.py
index <HASH>..<HASH> 100755
--- a/menuconfig.py
+++ b/menuconfig.py
@@ -1610,8 +1610,8 @@ def _update_menu():
# changed. Changing a value might change which items in the menu are
# visible.
#
- # Tries to preserve the location of the cursor when items disappear above
- # it.
+ # If possible, preserves the location of the cursor on the screen when
+ # items are added/removed above the selected item.
global _shown
global _sel_node_i
|
menuconfig: Make comment re. preserving cursor position more accurate
Items being added above the selected item would mess with the cursor
position too, if we didn't compensate.
|
diff --git a/lib/connection.js b/lib/connection.js
index <HASH>..<HASH> 100644
--- a/lib/connection.js
+++ b/lib/connection.js
@@ -63,8 +63,8 @@ Connection.prototype.open = function (callback) {
this.netClient.connect(this.options.port, this.options.host, function() {
self.removeListener('error', errorConnecting);
function startupCallback() {
- if (self.options.keySpace) {
- self.execute('USE ' + self.options.keySpace + ';', null, connectionReadyCallback);
+ if (self.options.keyspace) {
+ self.execute('USE ' + self.options.keyspace + ';', null, connectionReadyCallback);
}
else {
connectionReadyCallback();
|
Changed from keyspace to all lower case to fix #3
|
diff --git a/keyboard/_nixkeyboard.py b/keyboard/_nixkeyboard.py
index <HASH>..<HASH> 100644
--- a/keyboard/_nixkeyboard.py
+++ b/keyboard/_nixkeyboard.py
@@ -64,6 +64,7 @@ def build_tables():
to_name[(scan_code, modifiers)] = name
if is_keypad:
keypad_scan_codes.add(scan_code)
+ from_name['keypad ' + name] = (scan_code, ())
if name not in from_name or len(modifiers) < len(from_name[name][1]):
from_name[name] = (scan_code, modifiers)
@@ -136,12 +137,16 @@ def write_event(scan_code, is_down):
build_device()
device.write_event(EV_KEY, scan_code, int(is_down))
-def map_char(character):
+def map_char(name):
build_tables()
- try:
- return from_name[character]
- except KeyError:
- raise ValueError('Character {} is not mapped to any known key.'.format(repr(character)))
+ if name in from_name:
+ return from_name[name]
+
+ parts = name.split(' ', 1)
+ if (name.startswith('left ') or name.startswith('right ')) and parts[1] in from_name:
+ return from_name[parts[1]]
+ else:
+ raise ValueError('Name {} is not mapped to any known key.'.format(repr(name)))
def press(scan_code):
write_event(scan_code, True)
|
Allow sending of keypad events on nix
|
diff --git a/detect.go b/detect.go
index <HASH>..<HASH> 100644
--- a/detect.go
+++ b/detect.go
@@ -10,23 +10,26 @@ import (
)
// The Host type represents all the supported host types.
-type Host int
+type Host string
const (
// HostNull reprents a null host.
- HostNull Host = iota
+ HostNull Host = ""
// HostRPi represents the RaspberryPi.
- HostRPi
+ HostRPi = "Raspberry Pi"
// HostBBB represents the BeagleBone Black.
- HostBBB
+ HostBBB = "BeagleBone Black"
+
+ // HostGalileo represents the Intel Galileo board.
+ HostGalileo = "Intel Galileo"
// HostCubieTruck represents the Cubie Truck.
- HostCubieTruck
+ HostCubieTruck = "CubieTruck"
- // HostGalileo represents the Intel Galileo board.
- HostGalileo
+ // HostRadxa represents the Cubie Truck.
+ HostRadxa = "Radxa"
)
func execOutput(name string, arg ...string) (output string, err error) {
|
Host type is now a string
|
diff --git a/flask_appbuilder/api/__init__.py b/flask_appbuilder/api/__init__.py
index <HASH>..<HASH> 100644
--- a/flask_appbuilder/api/__init__.py
+++ b/flask_appbuilder/api/__init__.py
@@ -517,7 +517,7 @@ class BaseApi(object):
"""
Sets initialized inner views
"""
- pass
+ pass # pragma: no cover
def get_method_permission(self, method_name: str) -> str:
"""
@@ -531,7 +531,7 @@ class BaseApi(object):
def set_response_key_mappings(self, response, func, rison_args, **kwargs):
if not hasattr(func, "_response_key_func_mappings"):
- return
+ return # pragma: no cover
_keys = rison_args.get("keys", None)
if not _keys:
for k, v in func._response_key_func_mappings.items():
@@ -1044,7 +1044,7 @@ class ModelRestApi(BaseModelApi):
elif kwargs.get("caller") == "show":
columns = self.show_columns
else:
- columns = self.label_columns
+ columns = self.label_columns # pragma: no cover
response[API_LABEL_COLUMNS_RES_KEY] = self._label_columns_json(columns)
def merge_list_label_columns(self, response, **kwargs):
|
[api] Exempt code coverage from unreachable code
|
diff --git a/src/sortable.js b/src/sortable.js
index <HASH>..<HASH> 100644
--- a/src/sortable.js
+++ b/src/sortable.js
@@ -5,8 +5,8 @@
*/
angular.module('ui.sortable', [])
.value('uiSortableConfig',{})
- .directive('uiSortable', [ 'uiSortableConfig',
- function(uiSortableConfig) {
+ .directive('uiSortable', [ 'uiSortableConfig', '$log',
+ function(uiSortableConfig, log) {
return {
require: '?ngModel',
link: function(scope, element, attrs, ngModel) {
@@ -85,9 +85,6 @@ angular.module('ui.sortable', [])
}
};
- }
-
-
scope.$watch(attrs.uiSortable, function(newVal, oldVal){
angular.forEach(newVal, function(value, key){
@@ -113,8 +110,11 @@ angular.module('ui.sortable', [])
// call apply after stop
opts.stop = combineCallbacks( opts.stop, apply );
- // Create sortable
+ } else {
+ log.info('ui.sortable: ngModel not provided!', element);
+ }
+ // Create sortable
element.sortable(opts);
}
};
|
Moved inside 'if (ngModel){}' any code that calls combineCallbacks and added $log.info() message in case ngModel is falsy.
Possibly closes #<I> and #<I>.
|
diff --git a/discord/abc.py b/discord/abc.py
index <HASH>..<HASH> 100644
--- a/discord/abc.py
+++ b/discord/abc.py
@@ -755,7 +755,7 @@ class GuildChannel:
Returns a list of all active instant invites from this channel.
- You must have :attr:`~Permissions.manage_guild` to get this information.
+ You must have :attr:`~Permissions.manage_channels` to get this information.
Raises
-------
|
Fix wrong documented permission for GuildChannel.invites()
I tested it just now, and manage_guild is not the permission you need to
fetch invites from a given channel. You need manage_channels.
Note that this isn't the same as Guild.invites(), which DOES use
manage_guild.
|
diff --git a/pandas/io/tests/test_data.py b/pandas/io/tests/test_data.py
index <HASH>..<HASH> 100644
--- a/pandas/io/tests/test_data.py
+++ b/pandas/io/tests/test_data.py
@@ -445,7 +445,10 @@ class TestFred(tm.TestCase):
end = datetime(2013, 1, 27)
received = web.DataReader("GDP", "fred", start, end)['GDP'].tail(1)[0]
- self.assertEqual(int(received), 16535)
+
+ # < 7/30/14 16535 was returned
+ #self.assertEqual(int(received), 16535)
+ self.assertEqual(int(received), 16502)
self.assertRaises(Exception, web.DataReader, "NON EXISTENT SERIES",
'fred', start, end)
|
NETWORK: change failing FRED test
|
diff --git a/src/Components.php b/src/Components.php
index <HASH>..<HASH> 100644
--- a/src/Components.php
+++ b/src/Components.php
@@ -219,6 +219,13 @@ final class Components
// --------------------------------------------------------------------------
+ /**
+ * Returns an instance of the app as a component
+ *
+ * @param bool $bUseCache Whether to use the cache or not
+ *
+ * @return Component
+ */
public static function getApp($bUseCache = true)
{
// If we have already fetched this data then don't get it again
|
chore: Added docbloc
|
diff --git a/src/MailhogClient.php b/src/MailhogClient.php
index <HASH>..<HASH> 100644
--- a/src/MailhogClient.php
+++ b/src/MailhogClient.php
@@ -30,7 +30,7 @@ class MailhogClient
{
$this->httpClient = $client;
$this->requestFactory = $requestFactory;
- $this->baseUri = $baseUri;
+ $this->baseUri = rtrim($baseUri, '/');
}
/**
|
Remove trailing slashes from base URL
In order to prevent double slashes in URL causing Mailhog to send
redirect responses breaking everything.
|
diff --git a/js/btcmarkets.js b/js/btcmarkets.js
index <HASH>..<HASH> 100644
--- a/js/btcmarkets.js
+++ b/js/btcmarkets.js
@@ -695,7 +695,7 @@ module.exports = class btcmarkets extends Exchange {
const status = this.parseOrderStatus (this.safeString (order, 'status'));
let cost = undefined;
if (price !== undefined) {
- if (amount !== undefined) {
+ if (filled !== undefined) {
cost = price * filled;
}
}
|
[btcmarkets] build cost calc
|
diff --git a/src/Algebra.php b/src/Algebra.php
index <HASH>..<HASH> 100644
--- a/src/Algebra.php
+++ b/src/Algebra.php
@@ -332,11 +332,9 @@ class Algebra
return [$z₁, $z₂, $z₃];
}
- // One root is real, and two are are complex conjugates
- if ($D > 0) {
- $z₁ = $S + $T - $a₂ / 3;
+ // D > 0: One root is real, and two are are complex conjugates
+ $z₁ = $S + $T - $a₂ / 3;
- return [$z₁, \NAN, \NAN];
- }
+ return [$z₁, \NAN, \NAN];
}
}
|
Minor change to flow of cubic equation.
|
diff --git a/src/Options/class-options-manager.php b/src/Options/class-options-manager.php
index <HASH>..<HASH> 100644
--- a/src/Options/class-options-manager.php
+++ b/src/Options/class-options-manager.php
@@ -231,7 +231,7 @@ class Options_Manager {
public function should_nag() {
// Option is stored as yes/no.
return filter_var(
- $this->store->get( 'should_nag' ),
+ $this->store->get( 'should_nag', true ),
FILTER_VALIDATE_BOOLEAN
);
}
|
Ensure default should nag value is set
|
diff --git a/spyder/widgets/explorer.py b/spyder/widgets/explorer.py
index <HASH>..<HASH> 100644
--- a/spyder/widgets/explorer.py
+++ b/spyder/widgets/explorer.py
@@ -437,9 +437,6 @@ class DirView(QTreeView):
actions.append(None)
if fnames and all([osp.isdir(_fn) for _fn in fnames]):
actions += self.create_folder_manage_actions(fnames)
- if actions:
- actions.append(None)
- actions += self.common_actions
return actions
def update_menu(self):
|
Remove global options from context menu
Remove the following items from the file explorer context menu:
* Edit filename filters...
* Show all files
* Show icons and text
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -178,10 +178,10 @@ class NoisePeer extends stream.Duplex {
}
_destroy (err, callback) {
- this._handshake.destroy()
+ if (this._handshake.finished === false) this._handshake.destroy()
if (this._transport) {
- // if (this._transport.tx) this._transport.tx.destroy()
- // if (this._transport.rx) this._transport.rx.destroy()
+ if (this._transport.tx) this._transport.tx.destroy()
+ if (this._transport.rx) this._transport.rx.destroy()
}
callback(err)
}
|
Only destroy handshake if not finished
|
diff --git a/src/observatoryControl/gpsFix.py b/src/observatoryControl/gpsFix.py
index <HASH>..<HASH> 100755
--- a/src/observatoryControl/gpsFix.py
+++ b/src/observatoryControl/gpsFix.py
@@ -69,8 +69,8 @@ def fetchGPSfix():
'longitude': gpsp.longitude,
'altitude': gpsp.altitude
}
- if (time.time() > tstart + 30):
- return False # Give up after 30 seconds
+ if (time.time() > tstart + 90):
+ return False # Give up after 90 seconds
time.sleep(2)
|
Increased time out when waiting for GPS fix to <I> secs
|
diff --git a/salt/states/service.py b/salt/states/service.py
index <HASH>..<HASH> 100644
--- a/salt/states/service.py
+++ b/salt/states/service.py
@@ -404,7 +404,13 @@ def enabled(name, **kwargs):
name
The name of the init or rc script used to manage the service
'''
- return _enable(name, None, **kwargs)
+ ret = {'name': name,
+ 'changes': {},
+ 'result': True,
+ 'comment': ''}
+
+ ret.update(_enable(name, None, **kwargs))
+ return ret
def disabled(name, **kwargs):
@@ -417,7 +423,13 @@ def disabled(name, **kwargs):
name
The name of the init or rc script used to manage the service
'''
- return _disable(name, None, **kwargs)
+ ret = {'name': name,
+ 'changes': {},
+ 'result': True,
+ 'comment': ''}
+
+ ret.update(_disable(name, None, **kwargs))
+ return ret
def mod_watch(name, sfun=None, sig=None, reload=False, full_restart=False):
|
Re-add stateful return for service.enabled and service.disabled
Modifies `service.enabled` and `service.disabled` so they work properly
with the changes to the return value of `_enable()` and `_disable()`.
|
diff --git a/app/assets/javascripts/peoplefinder/wordlimit.js b/app/assets/javascripts/peoplefinder/wordlimit.js
index <HASH>..<HASH> 100644
--- a/app/assets/javascripts/peoplefinder/wordlimit.js
+++ b/app/assets/javascripts/peoplefinder/wordlimit.js
@@ -1,3 +1,4 @@
+/* global jQuery */
jQuery(function ($){
'use strict';
@@ -7,10 +8,10 @@ jQuery(function ($){
var $textarea = $(o);
var limit = $textarea.data('limit');
var $counterBox = $(
- '<p class="textarea-word-count form-hint">'
- + 'Maximum ' + limit + ' characters, including spaces. '
- + '<span class="chars-remaining">(' + limit + ' remaining)</span>'
- + '<p/>'
+ '<p class="textarea-word-count form-hint">' +
+ 'Maximum ' + limit + ' characters, including spaces. ' +
+ '<span class="chars-remaining">(' + limit + ' remaining)</span>' +
+ '<p/>'
);
var $counter = $counterBox.find('.chars-remaining');
@@ -20,7 +21,7 @@ jQuery(function ($){
var charsLeft = limit - $textarea.val().length;
if( charsLeft > 0 ){
- $counterBox.removeClass('error')
+ $counterBox.removeClass('error');
$counter.html( '(' + charsLeft + ' remaining)');
}else {
$counterBox.addClass('error');
|
Conform to jshint settings
|
diff --git a/installer/install.js b/installer/install.js
index <HASH>..<HASH> 100644
--- a/installer/install.js
+++ b/installer/install.js
@@ -12,6 +12,10 @@ const platform = mapPlatform(process.env.NW_PLATFORM || process.platform);
const arch = mapArch(process.env.NW_ARCH || process.arch);
download(version, platform, arch)
+ .then(fixFilePermissions)
+ .then(function(path) {
+ console.log("Chromedriver binary available at '" + path + "'");
+ })
.catch(function(err) {
if (err.statusCode === 404) {
console.error("Chromedriver '" + version + ":" + platform + ":" + arch + "' doesn't exist")
@@ -63,3 +67,19 @@ function readVersion() {
return pkg.version;
}
+
+// borrowed from node-chromedriver
+function fixFilePermissions(path) {
+ // Check that the binary is user-executable
+ if (platform !== "win") {
+ const stat = fs.statSync(path);
+
+ // 64 == 0100 (no octal literal in strict mode)
+ if (!(stat.mode & 64)) { // eslint-disable-line no-bitwise
+ console.log("Making Chromedriver executable");
+ fs.chmodSync(path, "755");
+ }
+ }
+
+ return path;
+}
|
Update to fix file permissions on driver.
|
diff --git a/docs/examples/models_recursive.py b/docs/examples/models_recursive.py
index <HASH>..<HASH> 100644
--- a/docs/examples/models_recursive.py
+++ b/docs/examples/models_recursive.py
@@ -1,10 +1,10 @@
-from typing import List
+from typing import List, Optional
from pydantic import BaseModel
class Foo(BaseModel):
count: int
- size: float = None
+ size: Optional[float] = None
class Bar(BaseModel):
|
Fix mypy error in models_recursive.py example. (#<I>)
|
diff --git a/lib/discordrb/api.rb b/lib/discordrb/api.rb
index <HASH>..<HASH> 100644
--- a/lib/discordrb/api.rb
+++ b/lib/discordrb/api.rb
@@ -180,6 +180,16 @@ module Discordrb::API
)
end
+ # Get a server's channels list
+ def channels(token, server_id)
+ request(
+ __method__,
+ :get,
+ "#{api_base}/guilds/#{server_id}/channels",
+ Authorization: token
+ )
+ end
+
# Login to the server
def login(email, password)
request(
|
Add support for server's channel endpoint
This change adds support for the channels endpoint for a server. The authorization token and server_id need to be supplied for this method.
|
diff --git a/PHPCI/Plugin/Email.php b/PHPCI/Plugin/Email.php
index <HASH>..<HASH> 100644
--- a/PHPCI/Plugin/Email.php
+++ b/PHPCI/Plugin/Email.php
@@ -108,7 +108,7 @@ class Email implements \PHPCI\Plugin
if (is_array($ccList) && count($ccList)) {
foreach ($ccList as $address) {
- $message->addCc($address, $address);
+ $email->addCc($address, $address);
}
}
|
Fixed code in CC mails.
|
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MaxGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MaxGlobalStep.java
index <HASH>..<HASH> 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MaxGlobalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/MaxGlobalStep.java
@@ -37,7 +37,7 @@ public final class MaxGlobalStep<S extends Number> extends ReducingBarrierStep<S
public MaxGlobalStep(final Traversal.Admin traversal) {
super(traversal);
- this.setSeedSupplier(new ConstantSupplier<>((S) Double.valueOf(Double.MIN_VALUE)));
+ this.setSeedSupplier(new ConstantSupplier<>((S) Double.valueOf(-Double.MAX_VALUE)));
this.setBiFunction(MaxBiFunction.<S>instance());
}
|
replaced Double.MIN_VALUE with -Double.MAX_VALUE
|
diff --git a/spec/dummy/config/routes.rb b/spec/dummy/config/routes.rb
index <HASH>..<HASH> 100644
--- a/spec/dummy/config/routes.rb
+++ b/spec/dummy/config/routes.rb
@@ -1,5 +1,5 @@
Rails.application.routes.draw do
+ mount NoCms::Admin::Pages::Engine => "/admin"
mount NoCms::Pages::Engine => "/"
- mount NoCms::Admin::Pages::Engine => "/admin/pages"
end
|
Solved a routing misconception
Mounting admin#pages in admin/pages would duplicate pages in the path
|
diff --git a/cmd/integration/integration.go b/cmd/integration/integration.go
index <HASH>..<HASH> 100644
--- a/cmd/integration/integration.go
+++ b/cmd/integration/integration.go
@@ -19,7 +19,6 @@ limitations under the License.
package main
import (
- "encoding/json"
"io/ioutil"
"net"
"net/http"
@@ -238,7 +237,7 @@ func runReplicationControllerTest(c *client.Client) {
glog.Fatalf("Unexpected error: %#v", err)
}
var controller api.ReplicationController
- if err := json.Unmarshal(data, &controller); err != nil {
+ if err := api.Scheme.DecodeInto(data, &controller); err != nil {
glog.Fatalf("Unexpected error: %#v", err)
}
|
Integration test was not decoding using api.Scheme
|
diff --git a/tests/test_tree.py b/tests/test_tree.py
index <HASH>..<HASH> 100644
--- a/tests/test_tree.py
+++ b/tests/test_tree.py
@@ -175,8 +175,11 @@ class BGTreeTestCase(unittest.TestCase):
def test_get_tree_consistent_multicolors_unrooted_no_wgd_correct(self):
# if `rooted` argument is set to `False`, then regardless of `tree.root` value outcome shall be the same
tree = NewickReader.from_string(data_string="(((v1, v2), v3),(v4, v5));")
- for root in [self.v1, self.v2, self.v3, self.v4, self.v5, "1", "2", "3", "4"]:
- tree.root = root
+ for root in [self.v1, self.v2, self.v3, self.v4, self.v5, "1", "2", "3", "4", None]:
+ if root is not None:
+ tree.root = root
+ else:
+ tree._BGTree__root = root
tree_consistent_multicolors = tree.get_tree_consistent_multicolors(rooted=False, account_for_wgd=False)
self.assertIsInstance(tree_consistent_multicolors, list)
self.assertEqual(len(tree_consistent_multicolors), 16)
|
updated the test suite to cover the case when root of the tree is `None`, but tree consistent colors are requested for a unrooted tree with no account for wgd, and so can be done with any root.
|
diff --git a/middleman-cli/lib/middleman-cli/console.rb b/middleman-cli/lib/middleman-cli/console.rb
index <HASH>..<HASH> 100644
--- a/middleman-cli/lib/middleman-cli/console.rb
+++ b/middleman-cli/lib/middleman-cli/console.rb
@@ -1,7 +1,9 @@
# CLI Module
module Middleman::Cli
+ # Alias "c" to "console"
+ Base.map({ 'c' => 'console' })
- # A thor task for creating new projects
+ # The CLI Console class
class Console < Thor
include Thor::Actions
|
added an alias for `console` command
Almost every other command has an alias except `console`. Also the
comment above the class definition wrongly said `console` was a command
for creating new projects. Corrected appropriately
|
diff --git a/vault/expiration.go b/vault/expiration.go
index <HASH>..<HASH> 100644
--- a/vault/expiration.go
+++ b/vault/expiration.go
@@ -307,7 +307,7 @@ func (m *ExpirationManager) Restore(errorFunc func()) (retErr error) {
switch {
case retErr == nil:
- case errwrap.Contains(retErr, context.Canceled.Error()):
+ case strings.Contains(retErr.Error(), context.Canceled.Error()):
// Don't run error func because we lost leadership
m.logger.Warn("context cancled while restoring leases, stopping lease loading")
retErr = nil
|
Use strings.Contains for error possibly coming from storage
They may not well errwrap
Fixes #<I>
|
diff --git a/test/test_f90nml.py b/test/test_f90nml.py
index <HASH>..<HASH> 100644
--- a/test/test_f90nml.py
+++ b/test/test_f90nml.py
@@ -347,6 +347,7 @@ class Test(unittest.TestCase):
test_nml.indent = '\t'
self.assert_write(test_nml, 'types_indent_tab.nml')
+ self.assertRaises(ValueError, setattr, test_nml, 'indent', -4)
self.assertRaises(ValueError, setattr, test_nml, 'indent', 'xyz')
self.assertRaises(TypeError, setattr, test_nml, 'indent', [1, 2, 3])
@@ -357,6 +358,11 @@ class Test(unittest.TestCase):
self.assertRaises(TypeError, setattr, test_nml, 'end_comma', 'xyz')
+ def test_colwidth(self):
+ test_nml = f90nml.read('types.nml')
+ self.assertRaises(ValueError, setattr, test_nml, 'colwidth', -1)
+ self.assertRaises(TypeError, setattr, test_nml, 'colwidth', 'xyz')
+
if __name__ == '__main__':
if os.path.isfile('tmp.nml'):
|
Column width testing (not yet implemented; gg tdd)
|
diff --git a/lib/athena.js b/lib/athena.js
index <HASH>..<HASH> 100644
--- a/lib/athena.js
+++ b/lib/athena.js
@@ -58,7 +58,7 @@ async.map = function (/* hlog, */ arr, method, resultsHandler)
{
if (finished && Object.keys(waiting).length === 0 && typeof args.resultsHandler === 'function')
{
- args.resultsHandler(context.__hlog, results);
+ args.resultsHandler.call(context, context.__hlog, results);
args.resultsHandler = null; // prevent from being called multiple times
}
}
@@ -105,7 +105,7 @@ async.parallel = function (/* hlog, */ methods, resultsHandler)
{
if (finished && Object.keys(waiting).length === 0 && typeof args.resultsHandler === 'function')
{
- args.resultsHandler(context.__hlog, results);
+ args.resultsHandler.call(context, context.__hlog, results);
args.resultsHandler = null; // prevent from being called multiple times
}
}
|
Send this context for all result handlers.
|
diff --git a/lib/nats/server/options.rb b/lib/nats/server/options.rb
index <HASH>..<HASH> 100644
--- a/lib/nats/server/options.rb
+++ b/lib/nats/server/options.rb
@@ -120,14 +120,11 @@ module NATSD
def open_syslog
return unless @options[:syslog]
- unless Syslog.opened?
- Syslog.open("#{@options[:syslog]}", Syslog::LOG_PID, Syslog::LOG_USER )
- end
+ Syslog.open("#{@options[:syslog]}", Syslog::LOG_PID, Syslog::LOG_USER ) unless Syslog.opened?
end
def close_syslog
- return unless @options[:syslog]
- Syslog.close
+ Syslog.close unless @options[:syslog]
end
def symbolize_users(users)
@@ -159,7 +156,7 @@ module NATSD
debug "DEBUG is on"
trace "TRACE is on"
- #Syslog
+ # Syslog
@syslog = @options[:syslog]
# Authorization
|
modified open_syslog and close_syslog method
|
diff --git a/src/test/java/com/hubspot/dropwizard/guice/InjectedResourcesTest.java b/src/test/java/com/hubspot/dropwizard/guice/InjectedResourcesTest.java
index <HASH>..<HASH> 100644
--- a/src/test/java/com/hubspot/dropwizard/guice/InjectedResourcesTest.java
+++ b/src/test/java/com/hubspot/dropwizard/guice/InjectedResourcesTest.java
@@ -2,7 +2,12 @@ package com.hubspot.dropwizard.guice;
import com.hubspot.dropwizard.guice.objects.ExplicitDAO;
import com.hubspot.dropwizard.guice.objects.ExplicitResource;
+import com.squarespace.jersey2.guice.JerseyGuiceUtils;
+
import io.dropwizard.testing.junit.ResourceTestRule;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
@@ -14,6 +19,10 @@ import static org.assertj.core.api.Assertions.assertThat;
*/
public class InjectedResourcesTest {
+ static {
+ JerseyGuiceUtils.reset();
+ }
+
@ClassRule
public static final ResourceTestRule resources = ResourceTestRule.builder()
.addResource(new ExplicitResource(new ExplicitDAO()))
|
Make sure this is set up before the test runs
|
diff --git a/pinax/documents/views.py b/pinax/documents/views.py
index <HASH>..<HASH> 100644
--- a/pinax/documents/views.py
+++ b/pinax/documents/views.py
@@ -159,7 +159,7 @@ def folder_share(request, pk):
if not folder.can_share(request.user):
raise Http404()
form_kwargs = {
- "colleagues": User.objects.filter(pk__in=[u.pk for u in Relationship.set_for_user(request.user)])
+ "colleagues": User.objects.all() # @@@ make this a hookset to be defined at site level
}
if request.method == "POST":
if "remove" in request.POST:
|
Share with all users for now
This is far from ideal. We need to make this a configurable thing that is a hookset with a default implementation so it can be defined at the site level before we consider this a stable release.
|
diff --git a/gocloud/main.go b/gocloud/main.go
index <HASH>..<HASH> 100644
--- a/gocloud/main.go
+++ b/gocloud/main.go
@@ -35,7 +35,9 @@ func init() {
func main() {
if e := router.RunWithArgs(); e != nil {
- log.Println("ERROR: " + e.Error())
+ if e != cli.NoRouteError {
+ log.Println("ERROR: " + e.Error())
+ }
os.Exit(1)
}
}
|
do not print error message on route not found error
|
diff --git a/railties/lib/rails/commands/command.rb b/railties/lib/rails/commands/command.rb
index <HASH>..<HASH> 100644
--- a/railties/lib/rails/commands/command.rb
+++ b/railties/lib/rails/commands/command.rb
@@ -27,10 +27,6 @@ module Rails
@@command_options[command_name] = options_to_parse
end
- def self.command_name_for(task_name)
- task_name.gsub(':', '_').to_sym
- end
-
def self.set_banner(command_name, banner)
options_for(command_name) { |opts, _| opts.banner = banner }
end
@@ -61,6 +57,10 @@ module Rails
@@commands << command
end
+ def self.command_name_for(task_name)
+ task_name.gsub(':', '_').to_sym
+ end
+
def command_for(command_name)
klass = @@commands.find do |command|
command_instance_methods = command.public_instance_methods
|
Move `command_name_for` to private section.
Users shouldn't have to lookup the command name for a task. Put it in
the private section, so it doesn't show up in any generated documentation.
|
diff --git a/src/main/java/com/lmax/disruptor/LiteBlockingWaitStrategy.java b/src/main/java/com/lmax/disruptor/LiteBlockingWaitStrategy.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/lmax/disruptor/LiteBlockingWaitStrategy.java
+++ b/src/main/java/com/lmax/disruptor/LiteBlockingWaitStrategy.java
@@ -39,18 +39,18 @@ public final class LiteBlockingWaitStrategy implements WaitStrategy
if ((availableSequence = cursorSequence.get()) < sequence)
{
lock.lock();
-
+
try
{
do
{
signalNeeded.set(true);
-
+
if ((availableSequence = cursorSequence.get()) >= sequence)
{
break;
}
-
+
barrier.checkAlert();
processorNotifyCondition.await();
}
|
Remove trailing whitespace from LiteBlockingWaitStrategy.
This was causing checkstyle to complain.
|
diff --git a/template/helper/Form.php b/template/helper/Form.php
index <HASH>..<HASH> 100644
--- a/template/helper/Form.php
+++ b/template/helper/Form.php
@@ -455,7 +455,11 @@ class Form extends \lithium\template\Helper {
if (is_array($name)) {
return $this->_fields($name, $options);
}
- list(, $options, $template) = $this->_defaults(__FUNCTION__, $name, $options);
+ $method = __FUNCTION__;
+ if($options['type'] && !empty($this->_config['field-' . $options['type']])) {
+ $method = 'field-' . $options['type'];
+ }
+ list(, $options, $template) = $this->_defaults($method, $name, $options);
$defaults = array(
'label' => null,
'type' => isset($options['list']) ? 'select' : 'text',
|
Bugfix for Form->config() field settings
Fixed an issue where if you wanted to set different defaults through
Form->config for different field types (field-checkbox, field-radio)
these settings would be ignored.
These settings are now recognised and if they are not set it defaults
back to just field for its settings as before.
|
diff --git a/lib/cork/board.rb b/lib/cork/board.rb
index <HASH>..<HASH> 100644
--- a/lib/cork/board.rb
+++ b/lib/cork/board.rb
@@ -1,3 +1,5 @@
+require 'colored'
+
module Cork
# Provides support for UI output. Cork provides support for nested
# sections of information and for a verbose mode.
diff --git a/spec/board_spec.rb b/spec/board_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/board_spec.rb
+++ b/spec/board_spec.rb
@@ -187,6 +187,19 @@ module Cork
end
end
+ describe '#notice' do
+ it 'outputs the given string when not silent' do
+ @board.notice('Hello World')
+ @output.string.should == ("\n[!] Hello World".green + "\n")
+ end
+
+ it 'outputs the given string without color codes when ansi is disabled' do
+ @board = Board.new(:out => @output, :ansi => false)
+ @board.notice('Hello World')
+ @output.string.should == "\n[!] Hello World\n"
+ end
+ end
+
# describe '#wrap_with_indent' do
# it 'wrap_string with a default indentation of zero' do
# UI.indentation_level = 0
|
Added tests for the `notice` Board method
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ setup(
long_description=readme + '\n\n' + history,
author='Beau Barker',
author_email='beauinmelbourne@gmail.com',
- url='http://jsonrpcserver.readthedocs.org/',
+ url='https://jsonrpcserver.readthedocs.org/',
packages=['jsonrpcserver'],
package_data={'jsonrpcserver': ['request-schema.json']},
include_package_data=True,
|
Replaced the http readthedocs link with https.
|
diff --git a/redisson/src/main/java/org/redisson/codec/DefenceModule.java b/redisson/src/main/java/org/redisson/codec/DefenceModule.java
index <HASH>..<HASH> 100644
--- a/redisson/src/main/java/org/redisson/codec/DefenceModule.java
+++ b/redisson/src/main/java/org/redisson/codec/DefenceModule.java
@@ -24,7 +24,6 @@ import com.fasterxml.jackson.databind.DeserializationConfig;
import com.fasterxml.jackson.databind.deser.ValueInstantiator;
import com.fasterxml.jackson.databind.deser.ValueInstantiators.Base;
import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.fasterxml.jackson.dataformat.avro.PackageVersion;
/**
* Fix for https://github.com/FasterXML/jackson-databind/issues/1599
@@ -68,10 +67,6 @@ public class DefenceModule extends SimpleModule {
}
- public DefenceModule() {
- super(PackageVersion.VERSION);
- }
-
@Override
public void setupModule(SetupContext context) {
context.addValueInstantiators(new DefenceValueInstantiator());
|
Fixed - reference to avro module has been removed. #<I>
|
diff --git a/base/src/main/java/uk/ac/ebi/atlas/model/experiment/baseline/BaselineExperimentConfiguration.java b/base/src/main/java/uk/ac/ebi/atlas/model/experiment/baseline/BaselineExperimentConfiguration.java
index <HASH>..<HASH> 100644
--- a/base/src/main/java/uk/ac/ebi/atlas/model/experiment/baseline/BaselineExperimentConfiguration.java
+++ b/base/src/main/java/uk/ac/ebi/atlas/model/experiment/baseline/BaselineExperimentConfiguration.java
@@ -51,7 +51,7 @@ public class BaselineExperimentConfiguration {
}
public List<String> getMenuFilterFactorTypes() {
- return xmlReader.getList("menuFilterFactorTypes");
+ return Arrays.asList(xmlReader.getString("menuFilterFactorTypes").split("\\W*,\\W*"));
}
public Map<String, String> getSpeciesMapping() {
|
Split menuFilterFactorTypes by commas
|
diff --git a/source/rafcon/utils/plugins.py b/source/rafcon/utils/plugins.py
index <HASH>..<HASH> 100644
--- a/source/rafcon/utils/plugins.py
+++ b/source/rafcon/utils/plugins.py
@@ -36,11 +36,15 @@ def load_plugins():
dir_name, plugin_name = os.path.split(plugin_path.rstrip('/'))
logger.info("Found plugin '{}' at {}".format(plugin_name, plugin_path))
sys.path.insert(0, dir_name)
- try:
- module = importlib.import_module(plugin_name)
- plugin_dict[plugin_name] = module
- except ImportError as e:
- logger.error("Could not import plugin '{}': {}".format(plugin_name, e))
+ if plugin_name in plugin_dict:
+ logger.error("Plugin '{}' already loaded".format(plugin_name))
+ else:
+ try:
+ module = importlib.import_module(plugin_name)
+ plugin_dict[plugin_name] = module
+ logger.info("Successfully loaded plugin '{}'".format(plugin_name))
+ except ImportError as e:
+ logger.error("Could not import plugin '{}': {}".format(plugin_name, e))
def run_hook(hook_name, *args, **kwargs):
|
Print error when loading plugin with the same name
It is currently not possible to load two plugins with the same folder
name, e.g. ~/rafcon_dds/plugin and ~/rafcon_verification/plugin at the
same time.
|
diff --git a/stellar/command.py b/stellar/command.py
index <HASH>..<HASH> 100644
--- a/stellar/command.py
+++ b/stellar/command.py
@@ -195,6 +195,7 @@ def init():
print
else:
db_name = url.rsplit('/', 1)[-1]
+ url = url.rsplit('/', 1)[0] + '/'
name = click.prompt(
'Please enter your project name (used internally, eg. %s)' % db_name,
|
Fix incorrect configuration file after init
Url and stellar_url data in stellar.yaml configuration file
data should not include database name.
|
diff --git a/app/models/wupee/notifier.rb b/app/models/wupee/notifier.rb
index <HASH>..<HASH> 100644
--- a/app/models/wupee/notifier.rb
+++ b/app/models/wupee/notifier.rb
@@ -47,7 +47,7 @@ module Wupee
notification.save!
subject_interpolations = interpolate_subject_vars(notification)
- send_email(notification, subject_interpolations) if notif_type_config.wants_notification?
+ send_email(notification, subject_interpolations) if notif_type_config.wants_email?
end
end
|
fix dummy bug... wrong method was called to know if receiver wants email or not
|
diff --git a/core/google/cloud/connection.py b/core/google/cloud/connection.py
index <HASH>..<HASH> 100644
--- a/core/google/cloud/connection.py
+++ b/core/google/cloud/connection.py
@@ -28,7 +28,7 @@ API_BASE_URL = 'https://www.googleapis.com'
"""The base of the API call URL."""
DEFAULT_USER_AGENT = 'gcloud-python/{0}'.format(
- get_distribution('google-cloud').version)
+ get_distribution('google-cloud-core').version)
"""The user agent for google-cloud-python requests."""
diff --git a/unit_tests/test_connection.py b/unit_tests/test_connection.py
index <HASH>..<HASH> 100644
--- a/unit_tests/test_connection.py
+++ b/unit_tests/test_connection.py
@@ -70,7 +70,7 @@ class TestConnection(unittest.TestCase):
def test_user_agent_format(self):
from pkg_resources import get_distribution
expected_ua = 'gcloud-python/{0}'.format(
- get_distribution('google-cloud').version)
+ get_distribution('google-cloud-core').version)
conn = self._makeOne()
self.assertEqual(conn.USER_AGENT, expected_ua)
|
Changing user-agent to use the version from google-cloud-core.
See #<I> for larger discussion.
|
diff --git a/airflow/providers_manager.py b/airflow/providers_manager.py
index <HASH>..<HASH> 100644
--- a/airflow/providers_manager.py
+++ b/airflow/providers_manager.py
@@ -140,6 +140,16 @@ def _sanity_check(provider_package: str, class_name: str) -> bool:
return False
try:
import_string(class_name)
+ except ImportError as e:
+ # When there is an ImportError we turn it into debug warnings as this is
+ # an expected case when only some providers are installed
+ log.debug(
+ "Exception when importing '%s' from '%s' package: %s",
+ class_name,
+ provider_package,
+ e,
+ )
+ return False
except Exception as e:
log.warning(
"Exception when importing '%s' from '%s' package: %s",
@@ -642,16 +652,6 @@ class ProvidersManager(LoggingMixin):
field_behaviours = hook_class.get_ui_field_behaviour()
if field_behaviours:
self._add_customized_fields(package_name, hook_class, field_behaviours)
- except ImportError as e:
- # When there is an ImportError we turn it into debug warnings as this is
- # an expected case when only some providers are installed
- log.debug(
- "Exception when importing '%s' from '%s' package: %s",
- hook_class_name,
- package_name,
- e,
- )
- return None
except Exception as e:
log.warning(
"Exception when importing '%s' from '%s' package: %s",
|
Log provider import errors as debug warnings (#<I>)
|
diff --git a/backup/restorelib.php b/backup/restorelib.php
index <HASH>..<HASH> 100644
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -6197,7 +6197,7 @@
foreach ($assignments as $assignment) {
$olduser = backup_getid($restore->backup_unique_code,"user",$assignment->userid);
- if ($olduser->info == "notincourse") { // it's possible that user is not in the course
+ if (!$olduser || $olduser->info == "notincourse") { // it's possible that user is not in the course
continue;
}
$assignment->userid = $olduser->new_id; // new userid here
|
Fixed notice when restoring a backup file that was created with Users: none.
|
diff --git a/interfaces/associations/manyToMany/find.populate.where.js b/interfaces/associations/manyToMany/find.populate.where.js
index <HASH>..<HASH> 100644
--- a/interfaces/associations/manyToMany/find.populate.where.js
+++ b/interfaces/associations/manyToMany/find.populate.where.js
@@ -83,6 +83,26 @@ describe('Association Interface', function() {
});
});
+ it('should return only taxis with the given id', function(done) {
+ Associations.Driver.find({ name: 'manymany find where1' })
+ .populate('taxis', { id: 1 })
+ .exec(function(err, drivers) {
+ if (err) {
+ return done(err);
+ }
+
+ assert(_.isArray(drivers));
+ assert.equal(drivers.length, 1);
+ assert(_.isArray(drivers[0].taxis));
+ assert.equal(drivers[0].taxis.length, 1);
+ assert.equal(drivers[0].taxis[0].id, 1);
+
+ return done();
+ });
+ });
+
+
+
it('should add an empty array when no child records are returned from a populate', function(done) {
Associations.Driver.find({ name: 'manymany find where1' })
.populate('taxis', { medallion: { '<': 0 }})
|
Add test to ensure that child criteria are disambiguated in many-to-many joins
refs <URL>
|
diff --git a/lib/mischacks.rb b/lib/mischacks.rb
index <HASH>..<HASH> 100644
--- a/lib/mischacks.rb
+++ b/lib/mischacks.rb
@@ -127,14 +127,12 @@ module MiscHacks
def self.try_n_times n=10
i = 0
begin
- ret = yield
+ yield
rescue
i += 1
retry if i < n
raise
end
-
- ret
end
end
|
Simplify try_n_times
|
diff --git a/alerta/auth/basic.py b/alerta/auth/basic.py
index <HASH>..<HASH> 100644
--- a/alerta/auth/basic.py
+++ b/alerta/auth/basic.py
@@ -108,13 +108,11 @@ def forgot():
try:
email = request.json['email']
except KeyError:
- raise ApiError("must supply 'email'", 401)
+ raise ApiError("must supply 'email'", 400)
user = User.find_by_email(email)
if user:
- if not user.email_verified:
- raise ApiError('user email not verified', 401)
- elif not user.is_active:
+ if not user.is_active:
raise ApiError('user not active', 403)
send_password_reset(user)
|
Improve password reset flow (#<I>)
|
diff --git a/docs/conf.py b/docs/conf.py
index <HASH>..<HASH> 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -21,8 +21,8 @@ source_suffix = '.rst'
master_doc = 'index'
project = 'django-treebeard'
copyright = '2008-2013, Gustavo Picon'
-version = '2.0a1'
-release = '2.0a1'
+version = '2.0b1'
+release = '2.0b1'
exclude_trees = ['_build']
pygments_style = 'sphinx'
html_theme = 'default'
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@ class pytest_test(test):
setup_args = dict(
name='django-treebeard',
- version='2.0a1',
+ version='2.0b1',
url='https://tabo.pe/projects/django-treebeard/',
author='Gustavo Picon',
author_email='tabo@tabo.pe',
diff --git a/treebeard/__init__.py b/treebeard/__init__.py
index <HASH>..<HASH> 100644
--- a/treebeard/__init__.py
+++ b/treebeard/__init__.py
@@ -1 +1 @@
-__version__ = '2.0a1'
+__version__ = '2.0b1'
|
preparing <I>b1 release
|
diff --git a/test/nexmo/applications_test.rb b/test/nexmo/applications_test.rb
index <HASH>..<HASH> 100644
--- a/test/nexmo/applications_test.rb
+++ b/test/nexmo/applications_test.rb
@@ -13,10 +13,6 @@ class NexmoApplicationsTest < Nexmo::Test
'https://api.nexmo.com/v1/applications/' + application_id
end
- def application_id
- 'xx-xx-xx-xx'
- end
-
def headers
{'Content-Type' => 'application/json'}
end
diff --git a/test/nexmo/test.rb b/test/nexmo/test.rb
index <HASH>..<HASH> 100644
--- a/test/nexmo/test.rb
+++ b/test/nexmo/test.rb
@@ -27,7 +27,7 @@ module Nexmo
end
def application_id
- 'nexmo-application-id'
+ 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'
end
def private_key
|
Remove NexmoApplicationsTest#application_id method
|
diff --git a/src/main/java/org/mariadb/jdbc/internal/common/packet/PacketOutputStream.java b/src/main/java/org/mariadb/jdbc/internal/common/packet/PacketOutputStream.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/mariadb/jdbc/internal/common/packet/PacketOutputStream.java
+++ b/src/main/java/org/mariadb/jdbc/internal/common/packet/PacketOutputStream.java
@@ -10,7 +10,7 @@ public class PacketOutputStream extends OutputStream{
private static final int MAX_PACKET_LENGTH = 0x00ffffff;
private static final int SEQNO_OFFSET = 3;
private static final int HEADER_LENGTH = 4;
- private static final int MAX_SEQNO = 0xff;
+ private static final int MAX_SEQNO = 0xffff;
OutputStream baseStream;
|
Fixed "MySQL Protocol limit reached" error (when sending data > 2GB) by setting
MAX_SEQNO to max integer value.
|
diff --git a/src/Extensions.php b/src/Extensions.php
index <HASH>..<HASH> 100644
--- a/src/Extensions.php
+++ b/src/Extensions.php
@@ -210,7 +210,7 @@ class Extensions
*/
public function checkLocalAutoloader($force = false)
{
- if (!$force && (!$this->app['filesystem']->has('extensions://local/') || $this->app['filesystem']->has('extensions://local/.built'))) {
+ if (!$force && (!$this->app['filesystem']->has('extensions://local/') || $this->app['filesystem']->has('app://cache/.local.autoload.built'))) {
return;
}
@@ -264,7 +264,7 @@ class Extensions
$boltJson['autoload']['psr-4'] = $boltPsr4;
$composerJsonFile->write($boltJson);
$this->app['extend.manager']->dumpautoload();
- $this->app['filesystem']->write('extensions://local/.built', time());
+ $this->app['filesystem']->write('app://cache/.local.autoload.built', time());
}
/**
|
Write the local extension autoload lock file out the the cache
|
diff --git a/src/main/java/com/qiniu/util/Etag.java b/src/main/java/com/qiniu/util/Etag.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/qiniu/util/Etag.java
+++ b/src/main/java/com/qiniu/util/Etag.java
@@ -49,8 +49,19 @@ public final class Etag {
* @throws IOException 文件读取异常
*/
public static String file(File file) throws IOException {
- FileInputStream fi = new FileInputStream(file);
- return stream(fi, file.length());
+ FileInputStream fi = null;
+ try {
+ fi = new FileInputStream(file);
+ return stream(fi, file.length());
+ } finally {
+ if (fi != null) {
+ try {
+ fi.close();
+ } catch (Throwable t) {
+ }
+ }
+ }
+
}
/**
@@ -66,7 +77,7 @@ public final class Etag {
}
/**
- * 计算输入流的etag
+ * 计算输入流的etag，如果计算完毕不需要这个InputStream对象，请自行关闭流
*
* @param in 数据输入流
* @param len 数据流长度
|
[ISSUE-<I>] close the input stream generated from the file object
|
diff --git a/src/system/modules/metamodels/MetaModels/BackendIntegration/Boot.php b/src/system/modules/metamodels/MetaModels/BackendIntegration/Boot.php
index <HASH>..<HASH> 100644
--- a/src/system/modules/metamodels/MetaModels/BackendIntegration/Boot.php
+++ b/src/system/modules/metamodels/MetaModels/BackendIntegration/Boot.php
@@ -154,7 +154,7 @@ class Boot
public static function perform()
{
// Do not execute anything if we are on the index page because no User is logged in
- if (\Environment::get('script') == 'contao/index.php')
+ if (strpos(\Environment::getInstance()->script, 'contao/index.php') !== false)
{
return;
}
|
adjust Environment call to be compatible with contao <I>
|
diff --git a/python/sdss_access/sync/cli.py b/python/sdss_access/sync/cli.py
index <HASH>..<HASH> 100644
--- a/python/sdss_access/sync/cli.py
+++ b/python/sdss_access/sync/cli.py
@@ -92,9 +92,10 @@ class Cli(object):
running_files = n_tasks - finished_files
if self.verbose:
- print("SDSS_ACCESS> syncing... please wait for {0} rsync streams ({1} files) to"
- " complete [running for {2} seconds]".format(running_count, running_files,
- pause_count * pause))
+ tqdm.write("SDSS_ACCESS> syncing... please wait for {0} rsync streams ({1} "
+ "files) to complete [running for {2} seconds]".format(running_count,
+ running_files,
+ pause_count * pause))
# update the process polling
sleep(pause)
|
switching stdout to tqdm.write to fix verbose prints
|
diff --git a/DoctrineMigrationsBundle.php b/DoctrineMigrationsBundle.php
index <HASH>..<HASH> 100644
--- a/DoctrineMigrationsBundle.php
+++ b/DoctrineMigrationsBundle.php
@@ -21,19 +21,4 @@ use Symfony\Component\HttpKernel\Bundle\Bundle;
*/
class DoctrineMigrationsBundle extends Bundle
{
- /**
- * {@inheritdoc}
- */
- public function getNamespace()
- {
- return __NAMESPACE__;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getPath()
- {
- return __DIR__;
- }
}
|
removed the need to define getNamespace() and getPath() in bundles
|
diff --git a/plaso/parsers/santa.py b/plaso/parsers/santa.py
index <HASH>..<HASH> 100644
--- a/plaso/parsers/santa.py
+++ b/plaso/parsers/santa.py
@@ -72,7 +72,7 @@ class SantaProcessExitEventData(events.EventData):
action (str): action recorded by Santa.
pid (str): process identifier for the process.
pid_version (str): the process identifier version extracted from the Mach
- audit token. The version can sed to identify process identifier
+ audit token. The version can be used to identify process identifier
rollovers.
ppid (str): parent process identifier for the executed process.
uid (str): user identifier associated with the executed process.
@@ -101,7 +101,7 @@ class SantaFileSystemEventData(events.EventData):
file_new_path (str): new file path and name for RENAME events.
pid (str): process identifier for the process.
pid_version (str): the process identifier version extracted from the Mach
- audit token. The version can sed to identify process identifier
+ audit token. The version can be used to identify process identifier
rollovers.
ppid (str): parent process identifier for the executed process.
process (str): process name.
|
Corrected typo in Santa parser docstrings (#<I>)
|
diff --git a/lib/kubeclient/common.rb b/lib/kubeclient/common.rb
index <HASH>..<HASH> 100644
--- a/lib/kubeclient/common.rb
+++ b/lib/kubeclient/common.rb
@@ -399,12 +399,7 @@ module Kubeclient
@entities[kind.to_s].resource_name
end
ns_prefix = build_namespace_prefix(namespace)
- # TODO: Change this once services supports the new scheme
- if entity_name_plural == 'pods'
- rest_client["#{ns_prefix}#{entity_name_plural}/#{name}:#{port}/proxy"].url
- else
- rest_client["proxy/#{ns_prefix}#{entity_name_plural}/#{name}:#{port}"].url
- end
+ rest_client["#{ns_prefix}#{entity_name_plural}/#{name}:#{port}/proxy"].url
end
def process_template(template)
|
Remove special handling for services when building th proxy URL
|
diff --git a/aeron-driver/src/main/java/io/aeron/driver/MediaDriver.java b/aeron-driver/src/main/java/io/aeron/driver/MediaDriver.java
index <HASH>..<HASH> 100644
--- a/aeron-driver/src/main/java/io/aeron/driver/MediaDriver.java
+++ b/aeron-driver/src/main/java/io/aeron/driver/MediaDriver.java
@@ -366,6 +366,8 @@ public final class MediaDriver implements AutoCloseable
if ('/' == c || '\\' == c)
{
builder.setLength(lastCharIndex);
+ } else {
+ break;
}
}
|
[Java] Bug fix in reportExistingErrors
|
diff --git a/undertow/src/main/java/org/wildfly/extension/undertow/LocationService.java b/undertow/src/main/java/org/wildfly/extension/undertow/LocationService.java
index <HASH>..<HASH> 100644
--- a/undertow/src/main/java/org/wildfly/extension/undertow/LocationService.java
+++ b/undertow/src/main/java/org/wildfly/extension/undertow/LocationService.java
@@ -90,7 +90,7 @@ public class LocationService implements Service<LocationService>, FilterLocation
}
protected static HttpHandler configureHandlerChain(HttpHandler rootHandler, List<UndertowFilter> filters) {
- filters.sort((o1, o2) -> o1.getPriority() >= o2.getPriority() ? 1 : -1);
+ filters.sort((o1, o2) -> Integer.compare(o1.getPriority(), o2.getPriority()));
Collections.reverse(filters); //handler chain goes last first
HttpHandler handler = rootHandler;
for (UndertowFilter filter : filters) {
|
WFLY-<I> Fix the comparator implementation for sorting undertow filter-ref
|
diff --git a/bika/lims/browser/js/bika.lims.site.js b/bika/lims/browser/js/bika.lims.site.js
index <HASH>..<HASH> 100644
--- a/bika/lims/browser/js/bika.lims.site.js
+++ b/bika/lims/browser/js/bika.lims.site.js
@@ -383,16 +383,6 @@ function SiteView() {
stop_spinner();
window.bika.lims.log("Error at " + settings.url + ": " + thrownError);
});
-
- //Disable submit button once its form submitted to avoid saving twice.
- $('form').each(function() {
- $(this).submit(function(){
- $(this).find(':input[type=submit]').each(function() {
- $(this).prop('disabled', true);
- });
- });
- });
-
}
function portalAlert(html) {
|
Do not deactivate submit buttons, causes unexpected behavior
|
diff --git a/cli/Valet/Nginx.php b/cli/Valet/Nginx.php
index <HASH>..<HASH> 100644
--- a/cli/Valet/Nginx.php
+++ b/cli/Valet/Nginx.php
@@ -118,7 +118,7 @@ class Nginx
$this->cli->run(
'sudo nginx -c '.static::NGINX_CONF.' -t',
function ($exitCode, $outputMessage) {
- throw new DomainException("Nginx cannot start, please check your nginx.conf [$exitCode: $outputMessage].");
+ throw new DomainException("Nginx cannot start; please check your nginx.conf [$exitCode: $outputMessage].");
}
);
}
|
Convert comma to semicolon
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.