diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/bsp-gonk/vendor/silk/silk-camera/index.js b/bsp-gonk/vendor/silk/silk-camera/index.js
index <HASH>..<HASH> 100644
--- a/bsp-gonk/vendor/silk/silk-camera/index.js
+++ b/bsp-gonk/vendor/silk/silk-camera/index.js
@@ -47,7 +47,7 @@ type FrameReplacer = {
* @property height height of the object rectangle
* @memberof silk-camera
*/
-type Rect = {
+export type Rect = {
x: number;
y: number;
width: number;
@@ -105,7 +105,7 @@ export type CameraFrameSize = 'low' | 'normal' | 'high' | 'full';
* The camera frame size
* @memberof silk-camera
*/
-type SizeType = {
+export type SizeType = {
width: number;
height: number;
};
|
Export flow types from silk-camera
|
diff --git a/hawkular-wildfly-agent-itest-parent/hawkular-wildfly-agent-itest/src/test/java/org/hawkular/cmdgw/ws/test/AbstractCommandITest.java b/hawkular-wildfly-agent-itest-parent/hawkular-wildfly-agent-itest/src/test/java/org/hawkular/cmdgw/ws/test/AbstractCommandITest.java
index <HASH>..<HASH> 100644
--- a/hawkular-wildfly-agent-itest-parent/hawkular-wildfly-agent-itest/src/test/java/org/hawkular/cmdgw/ws/test/AbstractCommandITest.java
+++ b/hawkular-wildfly-agent-itest-parent/hawkular-wildfly-agent-itest/src/test/java/org/hawkular/cmdgw/ws/test/AbstractCommandITest.java
@@ -239,7 +239,7 @@ public abstract class AbstractCommandITest {
InventoryJacksonConfig.configure(mapper);
this.client = new OkHttpClient();
- trace(OperationBuilder.class);
+ // trace(OperationBuilder.class);
setLogger("org.hawkular.agent.monitor.cmd", Level.TRACE);
}
|
Do not trace OperationBuilder during itests
|
diff --git a/nornir/plugins/functions/text/__init__.py b/nornir/plugins/functions/text/__init__.py
index <HASH>..<HASH> 100644
--- a/nornir/plugins/functions/text/__init__.py
+++ b/nornir/plugins/functions/text/__init__.py
@@ -2,6 +2,8 @@ import logging
import pprint
import threading
from typing import List, Optional, cast
+from collections import OrderedDict
+import json
from colorama import Fore, Style, init
@@ -61,7 +63,10 @@ def _print_individual_result(
# for consistency between py3.6 and py3.7
print(f"{x.__class__.__name__}{x.args}")
elif x and not isinstance(x, str):
- pprint.pprint(x, indent=2)
+ if isinstance(x, OrderedDict):
+ print(json.dumps(x, indent=2))
+ else:
+ pprint.pprint(x, indent=2)
elif x:
print(x)
|
Print result (#<I>)
* Add support for OrderedDict to print_result()
* Add support for OrderedDict in print_result()
|
diff --git a/lib/utils.js b/lib/utils.js
index <HASH>..<HASH> 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -97,7 +97,8 @@ function collectInterestingProperties (properties, interestingKeys) {
return properties.reduce((parsedProps, prop) => {
const keyValue = module.exports.getKeyName(prop);
if (interestingKeys.has(keyValue)) {
- parsedProps[keyValue] = prop.value;
+ // In TypeScript, unwrap any usage of `{} as const`.
+ parsedProps[keyValue] = prop.value.type === 'TSAsExpression' ? prop.value.expression : prop.value;
}
return parsedProps;
}, {});
diff --git a/tests/lib/utils.js b/tests/lib/utils.js
index <HASH>..<HASH> 100644
--- a/tests/lib/utils.js
+++ b/tests/lib/utils.js
@@ -139,6 +139,13 @@ describe('utils', () => {
isNewStyle: true,
},
+ // Util function with "{} as const".
+ 'export default createESLintRule({ create() {}, meta: {} as const });': {
+ create: { type: 'FunctionExpression' },
+ meta: { type: 'ObjectExpression' },
+ isNewStyle: true,
+ },
+
// Util function from util object
'export default util.createRule<Options, MessageIds>({ create() {}, meta: {} });': {
create: { type: 'FunctionExpression' },
|
Fix: Handle `meta: {} as const` for TypeScript rules (#<I>)
|
diff --git a/diff_cover/tests/test_snippets.py b/diff_cover/tests/test_snippets.py
index <HASH>..<HASH> 100644
--- a/diff_cover/tests/test_snippets.py
+++ b/diff_cover/tests/test_snippets.py
@@ -1,5 +1,5 @@
-import mock
from __future__ import unicode_literals
+import mock
import os
import tempfile
from pygments.token import Token
|
Fix future import in snippet tests
|
diff --git a/pyvex/block.py b/pyvex/block.py
index <HASH>..<HASH> 100644
--- a/pyvex/block.py
+++ b/pyvex/block.py
@@ -206,7 +206,7 @@ class IRSB(VEXObject):
data = stat.data
elif isinstance(stat, stmt.Put) and stat.offset == reg_next:
data = stat.data
- if data.result_size != reg_next_size:
+ if data.result_size(self.tyenv) != reg_next_size:
return None
elif isinstance(stat, stmt.LoadG) and stat.dst == tmp_next:
return None
@@ -221,7 +221,7 @@ class IRSB(VEXObject):
elif isinstance(data, expr.Get):
tmp_next = None
reg_next = data.offset
- reg_next_size = data.result_size
+ reg_next_size = data.result_size(self.tyenv)
else:
return None
|
More fixes after the latest PR.
Make sure .result_size is changed to .result_size(irsb.tyenv) everywhere.
|
diff --git a/lib/rules/disallow-emberkeys.js b/lib/rules/disallow-emberkeys.js
index <HASH>..<HASH> 100644
--- a/lib/rules/disallow-emberkeys.js
+++ b/lib/rules/disallow-emberkeys.js
@@ -20,7 +20,7 @@ module.exports.prototype.check = function(file, errors) {
helpers.findEmberFunction('keys', 0).forEach(function(node) {
errors.add(
'Ember.keys is deprecated in Ember 1.13',
- node.loc.start
+ node.callee.property.loc.start
);
});
};
diff --git a/test/lib/rules/disallow-emberkeys.js b/test/lib/rules/disallow-emberkeys.js
index <HASH>..<HASH> 100644
--- a/test/lib/rules/disallow-emberkeys.js
+++ b/test/lib/rules/disallow-emberkeys.js
@@ -36,7 +36,7 @@ describe('lib/rules/disallow-embertrycatch', function () {
Ember.keys();
},
errors: [{
- column: 0, line: 1, filename: 'input', rule: 'disallowEmberKeys', fixed: undefined,
+ column: 6, line: 1, filename: 'input', rule: 'disallowEmberKeys', fixed: undefined,
message: 'Ember.keys is deprecated in Ember 1.13'
}]
}, {
|
Ember.keys() warnings should point at .keys() invocation, not Ember object
|
diff --git a/lib/graphql/relay/relation_connection.rb b/lib/graphql/relay/relation_connection.rb
index <HASH>..<HASH> 100644
--- a/lib/graphql/relay/relation_connection.rb
+++ b/lib/graphql/relay/relation_connection.rb
@@ -76,7 +76,9 @@ module GraphQL
def create_order_condition(table, column, value, direction_marker)
table_name = ActiveRecord::Base.connection.quote_table_name(table)
name = ActiveRecord::Base.connection.quote_column_name(column)
- if (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR >= 2) || ActiveRecord::VERSION::MAJOR > 4
+ if ActiveRecord::VERSION::MAJOR == 5
+ casted_value = object.table.able_to_type_cast? ? object.table.type_cast_for_database(column, value) : value
+ elsif ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR >= 2
casted_value = object.table.engine.columns_hash[column].cast_type.type_cast_from_user(value)
else
casted_value = object.table.engine.columns_hash[column].type_cast(value)
|
Added support for type casting in AR5
|
diff --git a/src/edit/commands.js b/src/edit/commands.js
index <HASH>..<HASH> 100644
--- a/src/edit/commands.js
+++ b/src/edit/commands.js
@@ -398,7 +398,7 @@ defineCommand("deleteCharAfter", {
label: "Delete a character after the cursor",
run(pm) {
let {head, empty} = pm.selection
- if (!empty || head.offset == 0) return false
+ if (!empty || head.offset == pm.doc.path(head.path).maxOffset) return false
let to = moveForward(pm.doc.path(head.path), head.offset, "char")
return pm.apply(pm.tr.delete(head, new Pos(head.path, to)), andScroll)
},
@@ -409,7 +409,7 @@ defineCommand("deleteWordAfter", {
label: "Delete a character after the cursor",
run(pm) {
let {head, empty} = pm.selection
- if (!empty || head.offset == 0) return false
+ if (!empty || head.offset == pm.doc.path(head.path).maxOffset) return false
let to = moveForward(pm.doc.path(head.path), head.offset, "word")
return pm.apply(pm.tr.delete(head, new Pos(head.path, to)), andScroll)
},
|
Fix deleteCharAfter not working at start of textblock
|
diff --git a/src/Shared/ModuleConstantsRule.php b/src/Shared/ModuleConstantsRule.php
index <HASH>..<HASH> 100644
--- a/src/Shared/ModuleConstantsRule.php
+++ b/src/Shared/ModuleConstantsRule.php
@@ -43,6 +43,8 @@ class ModuleConstantsRule extends AbstractRule implements InterfaceAware
foreach ($node->findChildrenOfType('ConstantDeclarator') as $constant) {
$value = $constant->getValue()->getValue();
+ $value = $this->trimBundleNamePrefix($value);
+
if ($constant->getImage() === $value) {
continue;
}
@@ -65,4 +67,18 @@ class ModuleConstantsRule extends AbstractRule implements InterfaceAware
}
}
+ /**
+ * @param mixed $constantValue
+ *
+ * @return mixed
+ */
+ private function trimBundleNamePrefix($constantValue)
+ {
+ if (!is_string($constantValue)) {
+ return $constantValue;
+ }
+
+ return preg_replace('/[A-Z0-9_]+:/', '', $constantValue);
+ }
+
}
|
Remove bundle prefix from constant value before comparing to constant name
|
diff --git a/src/Illuminate/Contracts/Pagination/Paginator.php b/src/Illuminate/Contracts/Pagination/Paginator.php
index <HASH>..<HASH> 100644
--- a/src/Illuminate/Contracts/Pagination/Paginator.php
+++ b/src/Illuminate/Contracts/Pagination/Paginator.php
@@ -10,6 +10,23 @@ interface Paginator {
public function url($page);
/**
+ * Add a set of query string values to the paginator.
+ *
+ * @param array|string $key
+ * @param string $value
+ * @return $this
+ */
+ public function appends($key, $value = null);
+
+ /**
+ * Get / set the URL fragment to be appended to URLs.
+ *
+ * @param string|null $fragment
+ * @return $this|string
+ */
+ public function fragment($fragment = null);
+
+ /**
* The the URL for the next page, or null.
*
* @return string|null
|
Add a few methods to contract.
|
diff --git a/lib/linguist/heuristics.rb b/lib/linguist/heuristics.rb
index <HASH>..<HASH> 100644
--- a/lib/linguist/heuristics.rb
+++ b/lib/linguist/heuristics.rb
@@ -355,7 +355,7 @@ module Linguist
disambiguate ".php" do |data|
if data.include?("<?hh")
Language["Hack"]
- elsif /<?[^h]/.match(data)
+ elsif /<\?[^h]/.match(data)
Language["PHP"]
end
end
|
fix php disambiguation regex (#<I>)
Because of an error in the regular expression, disambiguation rule for the .php
matched any non-empty file as PHP, except for Hack files.
|
diff --git a/Neos.Flow/Classes/Security/Context.php b/Neos.Flow/Classes/Security/Context.php
index <HASH>..<HASH> 100644
--- a/Neos.Flow/Classes/Security/Context.php
+++ b/Neos.Flow/Classes/Security/Context.php
@@ -171,8 +171,8 @@ class Context
protected $sessionManager;
/**
- * @Flow\Inject
- * @var PsrSecurityLoggerInterface
+ * @Flow\Inject(name="Neos.Flow:SecurityLogger")
+ * @var \Psr\Log\LoggerInterface
*/
protected $securityLogger;
|
TASK: Use virtual object injection for security logger
|
diff --git a/src/test/java/com/treasuredata/client/TestServerFailures.java b/src/test/java/com/treasuredata/client/TestServerFailures.java
index <HASH>..<HASH> 100644
--- a/src/test/java/com/treasuredata/client/TestServerFailures.java
+++ b/src/test/java/com/treasuredata/client/TestServerFailures.java
@@ -58,6 +58,7 @@ public class TestServerFailures
public void setUp()
throws Exception
{
+ // NOTICE. This jetty server does not accept SSL connection. So use http in TDClient
server = new Server();
port = TestProxyAccess.findAvailablePort();
http = new ServerConnector(server);
|
Add a note on jetty server (a mock of TD API)
|
diff --git a/tests/test_invenio_accounts.py b/tests/test_invenio_accounts.py
index <HASH>..<HASH> 100644
--- a/tests/test_invenio_accounts.py
+++ b/tests/test_invenio_accounts.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
#
# This file is part of Invenio.
-# Copyright (C) 2015 CERN.
+# Copyright (C) 2015, 2016 CERN.
#
# Invenio is free software; you can redistribute it
# and/or modify it under the terms of the GNU General Public License as
@@ -121,3 +121,10 @@ def test_view(app):
with app.test_client() as client:
res = client.get(login_url)
assert res.status_code == 200
+
+
+def test_configuration(app):
+ """Test configuration."""
+ app.config['ACCOUNTS_USE_CELERY'] = 'deadbeef'
+ InvenioAccounts(app)
+ assert 'deadbeef' == app.config['ACCOUNTS_USE_CELERY']
|
tests: respect ACCOUNTS_USE_CELERY configuration
* Checks that value in ACCOUNTS_USE_CELERY configuration is respected.
(closes #<I>)
|
diff --git a/djcelery/schedulers.py b/djcelery/schedulers.py
index <HASH>..<HASH> 100644
--- a/djcelery/schedulers.py
+++ b/djcelery/schedulers.py
@@ -125,6 +125,15 @@ class DatabaseScheduler(Scheduler):
def schedule_changed(self):
if self._last_timestamp is not None:
+ # If MySQL is running with transaction isolation level
+ # REPEATABLE-READ (default), then we won't see changes done by
+ # other transactions until the current transaction is
+ # committed (Issue #41).
+ try:
+ transaction.commit()
+ except transaction.TransactionManagementError:
+ pass # not in transaction management.
+
ts = self.Changes.last_change()
if not ts or ts < self._last_timestamp:
return False
|
DatabaseScheduler would not react to changes when using MySQL and REPEATABLE-READ. Closes #<I>
|
diff --git a/pyvex/block.py b/pyvex/block.py
index <HASH>..<HASH> 100644
--- a/pyvex/block.py
+++ b/pyvex/block.py
@@ -120,7 +120,7 @@ class IRSB(VEXObject):
irsb.statements = stmts
irsb.next = next_expr
irsb.jumpkind = jumpkind
- irsb.direct_next = irsb._is_defaultexit_direct_jump()
+ irsb._direct_next = irsb._is_defaultexit_direct_jump()
return irsb
|
Fixed incorrect attribute name in IRSB construction method.
|
diff --git a/src/XeroPHP/Models/Accounting/ExpenseClaim.php b/src/XeroPHP/Models/Accounting/ExpenseClaim.php
index <HASH>..<HASH> 100644
--- a/src/XeroPHP/Models/Accounting/ExpenseClaim.php
+++ b/src/XeroPHP/Models/Accounting/ExpenseClaim.php
@@ -2,9 +2,11 @@
namespace XeroPHP\Models\Accounting;
use XeroPHP\Remote;
+use XeroPHP\Traits\AttachmentTrait;
class ExpenseClaim extends Remote\Model
{
+ use AttachmentTrait;
/**
* Xero identifier
|
Adds attachments to ExpenseClaim
|
diff --git a/tests/src/Verifier/PasswordVerifierTest.php b/tests/src/Verifier/PasswordVerifierTest.php
index <HASH>..<HASH> 100644
--- a/tests/src/Verifier/PasswordVerifierTest.php
+++ b/tests/src/Verifier/PasswordVerifierTest.php
@@ -3,16 +3,16 @@ namespace Aura\Auth\Verifier;
class PasswordVerifierTest extends \PHPUnit_Framework_TestCase
{
- public function test()
+ protected function setUp()
{
- if (defined('PASSWORD_BCRYPT')) {
- // use the real password_hash()
- $algo = PASSWORD_BCRYPT;
- } else {
- // use the fake password_hash()
- $this->markTestIncomplete("password_hash functionality not available. Install ircmaxell/password-compat for 5.3+");
+ if (! defined('PASSWORD_BCRYPT')) {
+ $this->markTestSkipped("password_hash functionality not available. Install ircmaxell/password-compat for 5.3+");
}
+ }
+ public function test()
+ {
+ $algo = PASSWORD_BCRYPT;
$verifier = new PasswordVerifier($algo);
$plaintext = 'password';
$encrypted = password_hash($plaintext, $algo);
|
check password_hash() existence in setup
|
diff --git a/src/main/java/org/jfrog/hudson/release/scm/perforce/PerforceCoordinator.java b/src/main/java/org/jfrog/hudson/release/scm/perforce/PerforceCoordinator.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/jfrog/hudson/release/scm/perforce/PerforceCoordinator.java
+++ b/src/main/java/org/jfrog/hudson/release/scm/perforce/PerforceCoordinator.java
@@ -63,8 +63,7 @@ public class PerforceCoordinator extends AbstractScmCoordinator {
labelChangeListId = currentChangeListId + "";
perforce.commitWorkingCopy(currentChangeListId, releaseAction.getDefaultReleaseComment());
} else {
- perforce.commitWorkingCopy(currentChangeListId, releaseAction.getDefaultReleaseComment());
- perforce.deleteChangeList(currentChangeListId);
+ safeRevertWorkingCopy();
currentChangeListId = perforce.getDefaultChangeListId();
}
|
HAP-<I> - Support Perforce in release management
* Reverting local copy in case of unchanged files
Conflicts:
src/main/java/org/jfrog/hudson/release/scm/perforce/PerforceCoordinator.java
|
diff --git a/source/convertToJson.js b/source/convertToJson.js
index <HASH>..<HASH> 100644
--- a/source/convertToJson.js
+++ b/source/convertToJson.js
@@ -147,15 +147,15 @@ export function parseValue(value, schemaEntry, options) {
return result
}
if (result.value !== null) {
- try {
- if (schemaEntry.oneOf && schemaEntry.oneOf.indexOf(result.value) < 0) {
- return { error: 'invalid' }
- }
- if (schemaEntry.validate) {
+ if (schemaEntry.oneOf && schemaEntry.oneOf.indexOf(result.value) < 0) {
+ return { error: 'invalid' }
+ }
+ if (schemaEntry.validate) {
+ try {
schemaEntry.validate(result.value)
+ } catch (error) {
+ return { error: error.message }
}
- } catch (error) {
- return { error: error.message }
}
}
return result
|
Added `oneOf` schema property (refactored)
|
diff --git a/devel/dataset/transform_file_structure.py b/devel/dataset/transform_file_structure.py
index <HASH>..<HASH> 100644
--- a/devel/dataset/transform_file_structure.py
+++ b/devel/dataset/transform_file_structure.py
@@ -2,8 +2,16 @@
def prepare_pilsen_pigs_dataset(input_dir, output_dir, output_format=".mhd"):
+ from google_drive_downloader import GoogleDriveDownloader as gdd
+ import io3d
+ from pathlib import Path
import SimpleITK
+ # teoretické načtení složky T040
+ imput_dir = Path(r'G:\.shortcut-targets-by-id\1Vq6QAiJ7cHDJUdgKXjUxx5iw7zk6MMPI\transplantation')
+ dp = io3d.read(list(imput_dir.glob('*040D_V*'))[0])
+ f_name = list(imput_dir.glob('*040D_V*'))[0]
+
pass
|
Update transform_file_structure.py
Import and donwland of a file V_<I>
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,9 @@ setup(
# Indicate who your project is intended for
'Intended Audience :: Developers',
- 'Topic :: Software Development :: Build Tools',
+ 'Topic :: Scientific/Engineering :: Artificial Intelligence',
+ 'Topic :: Scientific/Engineering :: Information Analysis',
+ 'Topic :: Scientific/Engineering :: Human Machine Interfaces',
# Pick your license as you wish (should match "license" above)
'License :: OSI Approved :: MIT License',
@@ -64,7 +66,7 @@ setup(
],
# What does your project relate to?
- keywords='nlp naturallanguage text classification development',
+ keywords='nlp nlu naturallanguage text classification development',
# You can just specify the packages manually here if your project is
# simple. Or you can use find_packages().
|
Tweaked setup.py.
|
diff --git a/features/gtf.py b/features/gtf.py
index <HASH>..<HASH> 100644
--- a/features/gtf.py
+++ b/features/gtf.py
@@ -1,10 +1,10 @@
-from ebias.resource import Resource
+from ebias.resource import Resource, Target
from lhc.file_format.gtf_.iterator import GtfIterator as GtfIteratorParser
from lhc.file_format.gtf_.set_ import GtfSet as GtfSetParser
from lhc.file_format.gtf_.index import IndexedGtfFile
-class GtfIterator(Resource):
+class GtfIterator(Target):
EXT = ['.gtf', '.gtf.gz']
TYPE = 'gene_model'
diff --git a/run_ebias.py b/run_ebias.py
index <HASH>..<HASH> 100755
--- a/run_ebias.py
+++ b/run_ebias.py
@@ -27,4 +27,3 @@ def getParser():
if __name__ == '__main__':
import sys
sys.exit(main())
-
|
gtf iterator is now a target
|
diff --git a/lib/router/alias.js b/lib/router/alias.js
index <HASH>..<HASH> 100644
--- a/lib/router/alias.js
+++ b/lib/router/alias.js
@@ -84,9 +84,13 @@ var alias = {
we.express.bind(this)(req, res);
} else {
// is a target how have alias then redirect to it
- res.setHeader('Cache-Control', 'public, max-age=345600');
- res.setHeader('Expires', new Date(Date.now() + 345600000).toUTCString());
- return res.redirect(307, urlAlias.alias);
+ res.writeHead(307, {
+ 'Location': urlAlias.alias,
+ 'Content-Type': 'multipart/form-data',
+ 'Cache-Control':'public, max-age=345600',
+ 'Expires': new Date(Date.now() + 345600000).toUTCString()
+ });
+ return res.end();
}
} else {
we.log.verbose('ulrAlias not found for:', path);
|
fix url alias redirect to use http methods
|
diff --git a/src/ChannelDefinition.js b/src/ChannelDefinition.js
index <HASH>..<HASH> 100644
--- a/src/ChannelDefinition.js
+++ b/src/ChannelDefinition.js
@@ -16,7 +16,7 @@ var defaultConfiguration = {
};
var ChannelDefinition = function(exchange, topic) {
- this.configuration = defaultConfiguration;
+ this.configuration = _.extend(defaultConfiguration { exchange: exchange, topic: topic });
} ;
ChannelDefinition.prototype = {
|
Fixing bugs I introduced in last commit
|
diff --git a/growler/middleware_chain.py b/growler/middleware_chain.py
index <HASH>..<HASH> 100644
--- a/growler/middleware_chain.py
+++ b/growler/middleware_chain.py
@@ -4,12 +4,16 @@
"""
"""
+from collections import namedtuple
+
class MiddlewareChain:
"""
Class handling the storage and retreival of growler middleware functions.
"""
+ middleware_tuple = namedtuple('middleware', ['func', 'path'])
+
def __init__(self):
self.mw_list = []
@@ -25,10 +29,11 @@ class MiddlewareChain:
"""
Add a function to the middleware chain, listening on func
"""
- self.mw_list.append((func,))
+ self.mw_list.append(self.middleware_tuple(func=func,
+ path=path,))
def __contains__(self, func):
for mw in self.mw_list:
- if func == mw[0]:
+ if func is mw.func:
return True
return False
|
growler.middleware_chain: Uses a namedtuple to store middleware information in the list
|
diff --git a/lib/active_scaffold/actions/field_search.rb b/lib/active_scaffold/actions/field_search.rb
index <HASH>..<HASH> 100644
--- a/lib/active_scaffold/actions/field_search.rb
+++ b/lib/active_scaffold/actions/field_search.rb
@@ -58,7 +58,7 @@ module ActiveScaffold::Actions
if search_conditions.blank?
@filtered = false
else
- @filtered = human_conditions.nil? ? true : human_conditions.compact.join(' and ')
+ @filtered = human_conditions.nil? ? true : human_conditions.compact.join(I18n.t('support.array.two_words_connector'))
end
includes_for_search_columns = columns.collect{ |column| column.includes}.flatten.uniq.compact
|
human_conditions: use two words connector for proper I<I>n
|
diff --git a/src/microkernel-1-version.js b/src/microkernel-1-version.js
index <HASH>..<HASH> 100644
--- a/src/microkernel-1-version.js
+++ b/src/microkernel-1-version.js
@@ -29,7 +29,7 @@ const yaml = require("js-yaml")
/* the mixin class */
module.exports = class MicrokernelVersion {
version () {
- const VERSION = yaml.safeLoad(fs.readFileSync(path.join(__dirname, "..", "VERSION.yml"), "utf8"))
+ const VERSION = yaml.load(fs.readFileSync(path.join(__dirname, "..", "VERSION.yml"), "utf8"))
return {
major: VERSION.major,
minor: VERSION.minor,
|
upgrade to newer js-yaml API
|
diff --git a/script/create-dist.py b/script/create-dist.py
index <HASH>..<HASH> 100755
--- a/script/create-dist.py
+++ b/script/create-dist.py
@@ -132,9 +132,9 @@ def copy_license():
shutil.copy2(os.path.join(SOURCE_ROOT, 'LICENSE'), DIST_DIR)
def create_api_json_schema():
- outfile = os.path.join(DIST_DIR, 'electron-api.json')
- execute(['electron-docs-linter', '--outfile={0}'.format(outfile)],
- '--version={}'.format(ELECTRON_VERSION.replace('v', '')))
+ outfile = os.path.relpath(os.path.join(DIST_DIR, 'electron-api.json'))
+ execute(['electron-docs-linter', 'docs', '--outfile={0}'.format(outfile),
+ '--version={}'.format(ELECTRON_VERSION.replace('v', ''))])
def strip_binaries():
for binary in TARGET_BINARIES[PLATFORM]:
|
fix syntax and use relative path to electron-api.json target
|
diff --git a/src/Kunstmaan/AdminListBundle/Controller/AdminListController.php b/src/Kunstmaan/AdminListBundle/Controller/AdminListController.php
index <HASH>..<HASH> 100644
--- a/src/Kunstmaan/AdminListBundle/Controller/AdminListController.php
+++ b/src/Kunstmaan/AdminListBundle/Controller/AdminListController.php
@@ -136,7 +136,7 @@ abstract class AdminListController extends Controller
$tabPane->bindRequest($request);
$form = $tabPane->getForm();
} else {
- $form->submit($request);
+ $form->handleRequest($request);
}
if ($form->isValid()) {
@@ -214,7 +214,7 @@ abstract class AdminListController extends Controller
$tabPane->bindRequest($request);
$form = $tabPane->getForm();
} else {
- $form->submit($request);
+ $form->handleRequest($request);
}
if ($form->isValid()) {
|
[AdminListBundle]: form submit to form handlerequest (#<I>)
|
diff --git a/lib/mux.js b/lib/mux.js
index <HASH>..<HASH> 100644
--- a/lib/mux.js
+++ b/lib/mux.js
@@ -155,10 +155,15 @@ function Ctor(options, receiveProps) {
_emitter.on(CHANGE_EVENT, function (kp) {
var willComputedProps = []
var mappings = []
+
+ if (!Object.keys(_cptDepsMapping).length) return
+
while(kp) {
_cptDepsMapping[kp] && (mappings = mappings.concat(_cptDepsMapping[kp]))
kp = $keypath.digest(kp)
}
+
+ if (!mappings.length) return
/**
* get all computed props that depend on kp
*/
@@ -190,7 +195,6 @@ function Ctor(options, receiveProps) {
var args = arguments
var evtArgs = $util.copyArray(args)
var kp = $normalize($join(_rootPath(), propname))
-
args[0] = CHANGE_EVENT + ':' + kp
_emitter.emit(CHANGE_EVENT, kp)
emitter.emit.apply(emitter, args)
|
filtrate some vars to stop empty logic when computed changed
|
diff --git a/ospd/parser.py b/ospd/parser.py
index <HASH>..<HASH> 100644
--- a/ospd/parser.py
+++ b/ospd/parser.py
@@ -101,6 +101,7 @@ def create_args_parser(description: str) -> ParserType:
'-b',
'--bind-address',
default=DEFAULT_ADDRESS,
+ dest='address',
help='Address to listen on. Default: %(default)s',
)
parser.add_argument(
|
Store bind-address argument in address property
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,7 @@ test_requirements = [
if sys.version_info < (2, 7) or (
sys.version_info >= (3, 0) and sys.version_info < (3, 1)):
# Require unittest2 for Python which doesn't contain the new unittest
- # module (appears in Python 2.7 and Python 3.4)
+ # module (appears in Python 2.7 and Python 3.5)
test_requirements.append('unittest2')
if sys.version_info >= (3, 0):
@@ -73,7 +73,7 @@ pytest_runner = ['pytest-runner'] if 'ptr' in sys.argv else []
setup_params = dict(
name = 'keyring',
- version = "3.4",
+ version = "3.5",
description = "Store and access your passwords safely.",
url = "http://bitbucket.org/kang/python-keyring-lib",
keywords = "keyring Keychain GnomeKeyring Kwallet password storage",
|
Bumped to <I> in preparation for next release.
|
diff --git a/indra/tests/test_belief_sklearn.py b/indra/tests/test_belief_sklearn.py
index <HASH>..<HASH> 100644
--- a/indra/tests/test_belief_sklearn.py
+++ b/indra/tests/test_belief_sklearn.py
@@ -354,6 +354,19 @@ def test_set_hierarchy_probs():
assert stmt.belief != prior_prob
+def test_set_hierarchy_probs_specific_false():
+ # Get probs for a set of statements, and a belief engine instance
+ be, test_stmts_copy, prior_probs = setup_belief(include_more_specific=False)
+ # Set beliefs on the flattened statements
+ top_level = ac.filter_top_level(test_stmts_copy)
+ be.set_hierarchy_probs(test_stmts_copy)
+ # Compare hierarchy probs to prior probs
+ for stmt, prior_prob in zip(test_stmts_copy, prior_probs):
+ # Because we haven't included any supports, the beliefs should
+ # not have changed
+ assert stmt.belief == prior_prob
+
+
def test_hybrid_scorer():
# First instantiate and train the SimpleScorer on readers
# Make a model
@@ -402,4 +415,3 @@ def test_hybrid_scorer():
print(expected_beliefs[ix], hybrid_beliefs[ix])
assert np.allclose(hybrid_beliefs, expected_beliefs)
-
|
Add regression test for feature matrix discrepancy error
|
diff --git a/pyscreenshot/check/speedtest.py b/pyscreenshot/check/speedtest.py
index <HASH>..<HASH> 100644
--- a/pyscreenshot/check/speedtest.py
+++ b/pyscreenshot/check/speedtest.py
@@ -4,6 +4,9 @@ import time
import pyscreenshot
from entrypoint2 import entrypoint
+from pyscreenshot.plugins.gnome_dbus import GnomeDBusWrapper
+from pyscreenshot.plugins.gnome_screenshot import GnomeScreenshotWrapper
+from pyscreenshot.plugins.kwin_dbus import KwinDBusWrapper
from pyscreenshot.util import proc
@@ -28,6 +31,9 @@ def run(force_backend, n, childprocess, bbox=None):
print("")
+novirt = [GnomeDBusWrapper.name, KwinDBusWrapper.name, GnomeScreenshotWrapper.name]
+
+
def run_all(n, childprocess_param, virtual_only=True, bbox=None):
debug = True
print("")
@@ -46,7 +52,8 @@ def run_all(n, childprocess_param, virtual_only=True, bbox=None):
debugpar = []
for x in ["default"] + pyscreenshot.backends():
backendpar = ["--backend", x]
- if virtual_only and x == "gnome-screenshot": # TODO: remove
+ # skip non X backends
+ if virtual_only and x in novirt:
continue
p = proc(
"pyscreenshot.check.speedtest",
|
speedtest: skip non X backends
|
diff --git a/client/html/templates/checkout/standard/process-body-standard.php b/client/html/templates/checkout/standard/process-body-standard.php
index <HASH>..<HASH> 100644
--- a/client/html/templates/checkout/standard/process-body-standard.php
+++ b/client/html/templates/checkout/standard/process-body-standard.php
@@ -7,7 +7,7 @@
$enc = $this->encoder();
-$prefix =$this->get( 'standardUrlExternal', true );
+$prefix = $this->get( 'standardUrlExternal', true );
/** client/html/checkout/standard/process/validate
|
Scrutinizer Auto-Fixes (#<I>)
This commit consists of patches automatically generated for this project on <URL>
|
diff --git a/lib/utils/build-name-from-env.js b/lib/utils/build-name-from-env.js
index <HASH>..<HASH> 100644
--- a/lib/utils/build-name-from-env.js
+++ b/lib/utils/build-name-from-env.js
@@ -1,5 +1,5 @@
module.exports = function() {
- let buildNum = process.env.TRAVIS_JOB_NUMBER || process.env.BITBUCKET_BUILD_NUMBER;
+ let buildNum = process.env.TRAVIS_JOB_NUMBER || process.env.BITBUCKET_BUILD_NUMBER || process.env.CIRCLE_BUILD_NUM;
let prefix = process.env.BROWSERSTACK_BUILD_NAME_PREFIX;
if (buildNum && prefix) {
return prefix + '-' + buildNum;
|
Add support for CIRCLE_BUILD_NUM
|
diff --git a/src/Barryvdh/Debugbar/ServiceProvider.php b/src/Barryvdh/Debugbar/ServiceProvider.php
index <HASH>..<HASH> 100644
--- a/src/Barryvdh/Debugbar/ServiceProvider.php
+++ b/src/Barryvdh/Debugbar/ServiceProvider.php
@@ -71,14 +71,15 @@ class ServiceProvider extends \Illuminate\Support\ServiceProvider {
}
if($db = $app['db']){
- $pdo = new TraceablePDO( $db->getPdo() );
- $debugbar->addCollector(new PDOCollector( $pdo ));
+ try{
+ $pdo = new TraceablePDO( $db->getPdo() );
+ $debugbar->addCollector(new PDOCollector( $pdo ));
+ }catch(\PDOException $e){
+ //Not connection set..
+ }
}
- if($mailer = $app['mailer']){
- $debugbar['messages']->aggregate(new SwiftLogCollector($mailer->getSwiftMailer()));
- $debugbar->addCollector(new SwiftMailCollector($mailer->getSwiftMailer()));
- }
+
return $debugbar;
});
|
Remove Mailer and check for DB Connection
|
diff --git a/session.go b/session.go
index <HASH>..<HASH> 100644
--- a/session.go
+++ b/session.go
@@ -1,15 +1,35 @@
package revel
import (
+ "github.com/streadway/simpleuuid"
"net/http"
"net/url"
"strings"
+ "time"
)
// A signed cookie (and thus limited to 4kb in size).
// Restriction: Keys may not have a colon in them.
type Session map[string]string
+const (
+ SESSION_ID_KEY = "_ID"
+)
+
+// Return a UUID identifying this session.
+func (s Session) Id() string {
+ if uuidStr, ok := s[SESSION_ID_KEY]; ok {
+ return uuidStr
+ }
+
+ uuid, err := simpleuuid.NewTime(time.Now())
+ if err != nil {
+ panic(err) // I don't think this can actually happen.
+ }
+ s[SESSION_ID_KEY] = uuid.String()
+ return s[SESSION_ID_KEY]
+}
+
type SessionPlugin struct{ EmptyPlugin }
func (p SessionPlugin) BeforeRequest(c *Controller) {
@@ -20,6 +40,9 @@ func (p SessionPlugin) AfterRequest(c *Controller) {
// Store the session (and sign it).
var sessionValue string
for key, value := range c.Session {
+ if strings.Contains(key, ":") {
+ panic("Session keys may not have colons")
+ }
sessionValue += "\x00" + key + ":" + value + "\x00"
}
sessionData := url.QueryEscape(sessionValue)
|
Add Session.Id() to return a UUID for the session.
Using the simpleuuid package.
|
diff --git a/src/pytds/__init__.py b/src/pytds/__init__.py
index <HASH>..<HASH> 100644
--- a/src/pytds/__init__.py
+++ b/src/pytds/__init__.py
@@ -47,8 +47,8 @@ __version__ = pkg_resources.get_distribution('python-tds').version
def _ver_to_int(ver):
- maj, minor, rev = ver.split('.')
- return (int(maj) << 24) + (int(minor) << 16) + (int(rev) << 8)
+ maj, minor, _ = ver.split('.')
+ return (int(maj) << 24) + (int(minor) << 16)
intversion = _ver_to_int(__version__)
|
Change to send only major and minor parts of version to server
Third component can contain git hash, which cannot be converted to integer properly
|
diff --git a/fancy_getopt.py b/fancy_getopt.py
index <HASH>..<HASH> 100644
--- a/fancy_getopt.py
+++ b/fancy_getopt.py
@@ -31,12 +31,6 @@ neg_alias_re = re.compile("^(%s)=!(%s)$" % (longopt_pat, longopt_pat))
# (for use as attributes of some object).
longopt_xlate = string.maketrans('-', '_')
-# This records (option, value) pairs in the order seen on the command line;
-# it's close to what getopt.getopt() returns, but with short options
-# expanded. (Ugh, this module should be OO-ified.)
-_option_order = None
-
-
class FancyGetopt:
"""Wrapper around the standard 'getopt()' module that provides some
handy extra functionality:
|
global _option_order is not used
|
diff --git a/ruby_event_store/lib/ruby_event_store/spec/event_repository_lint.rb b/ruby_event_store/lib/ruby_event_store/spec/event_repository_lint.rb
index <HASH>..<HASH> 100644
--- a/ruby_event_store/lib/ruby_event_store/spec/event_repository_lint.rb
+++ b/ruby_event_store/lib/ruby_event_store/spec/event_repository_lint.rb
@@ -1200,6 +1200,7 @@ module RubyEventStore
'8a6f053e-3ce2-4c82-a55b-4d02c66ae6ea',
'd345f86d-b903-4d78-803f-38990c078d9e'
]).in_batches.result).to_a[0]).to eq([e1,e3])
+ expect(repository.read(specification.with_id([]).result).to_a).to eq([])
end
specify do
|
Expect `read.events([])` to return empty collection
|
diff --git a/src/Moip.php b/src/Moip.php
index <HASH>..<HASH> 100644
--- a/src/Moip.php
+++ b/src/Moip.php
@@ -44,7 +44,7 @@ class Moip
*
* @const string
*/
- const CLIENT_VERSION = '1.3.0';
+ const CLIENT_VERSION = '1.3.1';
/**
* Authentication that will be added to the header of request.
|
chore: bumped version to <I>
|
diff --git a/src/Users.php b/src/Users.php
index <HASH>..<HASH> 100644
--- a/src/Users.php
+++ b/src/Users.php
@@ -231,7 +231,7 @@ class Users
$this->getUsers();
// In most cases by far, we'll request an ID, and we can return it here.
- if (array_key_exists($userId, $this->users)) {
+ if ($userId && array_key_exists($userId, $this->users)) {
return $this->users[$userId];
}
|
Don't break if UserId is `null`
|
diff --git a/splinter/driver/webdriver/remote.py b/splinter/driver/webdriver/remote.py
index <HASH>..<HASH> 100644
--- a/splinter/driver/webdriver/remote.py
+++ b/splinter/driver/webdriver/remote.py
@@ -3,26 +3,18 @@
import subprocess
from selenium.webdriver import Remote
-from selenium.webdriver.firefox.firefox_profile import FirefoxProfile
from splinter.driver.webdriver import BaseWebDriver, WebDriverElement as BaseWebDriverElement
from splinter.driver.webdriver.cookie_manager import CookieManager
class WebDriver(BaseWebDriver):
- def __init__(self, server, port=4443, profile=None, extensions=None):
+ def __init__(self, server='localhost', port=4443):
self.old_popen = subprocess.Popen
- firefox_profile = FirefoxProfile(profile)
- firefox_profile.set_preference('extensions.logging.enabled', False)
- firefox_profile.set_preference('network.dns.disableIPv6', False)
-
- if extensions:
- for extension in extensions:
- firefox_profile.add_extension(extension)
self._patch_subprocess()
- dest = 'http://%s:%s/wd/hub'%(server,port)
- self.driver = Remote(dest, {}, firefox_profile)
+ dest = 'http://%s:%s/wd/hub' % (server, port)
+ self.driver = Remote(dest, {})
self._unpatch_subprocess()
self.element_class = WebDriverElement
|
using localhost as defaul remote server
|
diff --git a/check.go b/check.go
index <HASH>..<HASH> 100644
--- a/check.go
+++ b/check.go
@@ -50,7 +50,7 @@ func Check(root string, dh *DirectoryHierarchy, keywords []string) (*Result, err
creator.curSet = nil
}
case RelativeType, FullType:
- info, err := os.Lstat(filepath.Join(root, e.Path()))
+ info, err := os.Lstat(e.Path())
if err != nil {
return nil, err
}
|
check: recognize correct path
Fixes #<I>. Check() changes its working directory to `root`, which
is specified as an argument. Thus, it shouldn't open
a file using its absolute path; instead it should open the file
with the relative path to the root.
|
diff --git a/src/Controllers/OAuthController.php b/src/Controllers/OAuthController.php
index <HASH>..<HASH> 100644
--- a/src/Controllers/OAuthController.php
+++ b/src/Controllers/OAuthController.php
@@ -62,7 +62,6 @@ class OAuthController extends HookController {
// If is a new user, fill and save with auth data
if (!$auth->_id) {
- $auth->setTrustedAction(true);
$auth->fill($opauth_data['info']);
}
@@ -74,6 +73,7 @@ class OAuthController extends HookController {
// set visible provider_id on auth row.
// such as 'facebook_id', 'google_id', etc.
+ $auth->setTrustedAction(true);
$auth->setAttribute($identity->provider . '_id', $identity->uid);
$auth->save();
|
set Auth updates as 'trusted action' when using OAuth.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ def readme(file='', split=False):
setup(
name='pyderman',
- version='1.4.0',
+ version='2.0.0',
description='Installs the latest Chrome/Firefox/Opera/PhantomJS/Edge web drivers automatically.',
long_description=readme('README.md'),
long_description_content_type='text/markdown',
|
Increment to <I>, due to potentially-breaking Error handling changes.
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -36,7 +36,7 @@ module.exports = function(opt) {
file.contents = null;
- file.path = pathToCss;
+ file.path = gutil.replaceExtension(file.path, '.css');
fs.readFile(pathToCss, function (err, contents) {
if (err) {
@@ -50,7 +50,6 @@ module.exports = function(opt) {
file.contents = contents;
return cb(null, file);
-
});
});
};
|
fixed #<I> .pipe(gulp.dest(dest)) not working.
|
diff --git a/jobs/create-version-branch.js b/jobs/create-version-branch.js
index <HASH>..<HASH> 100644
--- a/jobs/create-version-branch.js
+++ b/jobs/create-version-branch.js
@@ -169,7 +169,7 @@ module.exports = async function (
if (!satisfies && openPR) {
const dependencyNameAndVersion = `${depName}-${latestDependencyVersion}`
- if (!openPR.comments.includes(dependencyNameAndVersion)) {
+ if (!openPR.comments || !openPR.comments.includes(dependencyNameAndVersion)) {
hasNewUpdates = true
await upsert(repositories, openPR._id, {
comments: [...(openPR.comments || []), dependencyNameAndVersion]
|
fix(create-version-branch): comments on PR docs might not exist yet
|
diff --git a/gwtbootstrap3/src/main/java/org/gwtbootstrap3/client/ui/SuggestBox.java b/gwtbootstrap3/src/main/java/org/gwtbootstrap3/client/ui/SuggestBox.java
index <HASH>..<HASH> 100644
--- a/gwtbootstrap3/src/main/java/org/gwtbootstrap3/client/ui/SuggestBox.java
+++ b/gwtbootstrap3/src/main/java/org/gwtbootstrap3/client/ui/SuggestBox.java
@@ -138,8 +138,11 @@ public class SuggestBox extends com.google.gwt.user.client.ui.SuggestBox impleme
};
Window.addResizeHandler(popupResizeHandler);
}
+ if (!suggestBox.getElement().getStyle().getZIndex().equals("")) {
+ getPopupPanel().getElement().getStyle()
+ .setZIndex(Integer.valueOf(suggestBox.getElement().getStyle().getZIndex()));
+ }
}
-
}
private final EnabledMixin<SuggestBox> enabledMixin = new EnabledMixin<SuggestBox>(this);
|
Fixes <I>. Update the z-index of the popup when SuggestBox z-index is
not "".
|
diff --git a/tofu/imas2tofu/_core.py b/tofu/imas2tofu/_core.py
index <HASH>..<HASH> 100644
--- a/tofu/imas2tofu/_core.py
+++ b/tofu/imas2tofu/_core.py
@@ -2704,8 +2704,8 @@ class MultiIDSLoader(object):
if np.any(indnan):
nunav, ntot = str(indnan.sum()), str(D.shape[1])
msg = "Some lines of sight geometry unavailable in ids:\n"
- msg += " - nb. of LOS unavailable: %s / %s\n"%(nunav, ntot)
- msg += " - indices: %s"%str(indnan.nonzero()[0])
+ msg += " - unavailable LOS: {0} / {1}\n".format(nunav, ntot)
+ msg += " - indices: {0}"%format(str(indnan.nonzero()[0]))
warnings.warn(msg)
else:
dgeom = None
diff --git a/tofu/version.py b/tofu/version.py
index <HASH>..<HASH> 100644
--- a/tofu/version.py
+++ b/tofu/version.py
@@ -1,2 +1,2 @@
# Do not edit, pipeline versioning governed by git tags!
-__version__ = '1.4.1-188-g044d87f'
+__version__ = '1.4.1-189-g5ca9e73'
|
[Issue<I>] PEP8 Compliance
|
diff --git a/round/developers.py b/round/developers.py
index <HASH>..<HASH> 100644
--- a/round/developers.py
+++ b/round/developers.py
@@ -6,7 +6,7 @@
from .config import *
from .wrappers import *
-import Applications as apps
+import applications as apps
class Developers(object):
|
import capitalization error
Applications should be applications
|
diff --git a/src/subscription.js b/src/subscription.js
index <HASH>..<HASH> 100644
--- a/src/subscription.js
+++ b/src/subscription.js
@@ -47,15 +47,15 @@ class EventSubscription {
_setActivationState(activated, cancelReason) {
this._internal.cancelReason = cancelReason;
this._internal.state = activated ? 'active' : 'canceled';
- for (let i = 0; i < this._internal.activatePromises.length; i++) {
- const p = this._internal.activatePromises[i];
+ while (this._internal.activatePromises.length > 0) {
+ const p = this._internal.activatePromises.shift();
if (activated) {
p.callback && p.callback(true);
p.resolve && p.resolve();
}
else {
p.callback && p.callback(false, cancelReason);
- p.reject(cancelReason);
+ p.reject && p.reject(cancelReason);
}
}
}
|
Trigger activation callbacks once
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -29,9 +29,10 @@ setup(name='hpOneView',
version='2.0.0',
description='HPE OneView Python Library',
url='https://github.com/HewlettPackard/python-hpOneView',
+ download_url="https://github.com/HewlettPackard/python-hpOneView/releases/tag/hpOneView-API-v200",
author='Hewlett Packard Enterprise Development LP',
- author_email = 'oneview-pythonsdk@hpe.com',
+ author_email='oneview-pythonsdk@hpe.com',
license='MIT',
packages=find_packages(exclude=['examples*', 'tests*']),
- keywords=['oneview'],
+ keywords=['oneview', 'hpe'],
install_requires=['future>=0.15.2'])
|
Add link in setup.py to download <I>
|
diff --git a/regcompiler.rb b/regcompiler.rb
index <HASH>..<HASH> 100755
--- a/regcompiler.rb
+++ b/regcompiler.rb
@@ -2147,10 +2147,10 @@ end
end
end
- def continuing_to_match
- @threads.each{|thr| progress=thr[:progress]
+ def continuing_to_match progress
+ @threads.each{|thr| thr_progress=thr[:progress]
progress.variable_names.each{|vname|
- raw_register_var vname,progress.raw_variable(vname)
+ progress.raw_register_var vname,thr_progress.raw_variable(vname)
}
}
@@ -2199,7 +2199,7 @@ end
#p :end_try_match, @progress.cursor.pos
- continuing_to_match if respond_to? :continuing_to_match
+ continuing_to_match(@progress) if respond_to? :continuing_to_match
return true
end
|
fixed continuing_to_match to call things on the right object
|
diff --git a/edisgo/data/import_data.py b/edisgo/data/import_data.py
index <HASH>..<HASH> 100644
--- a/edisgo/data/import_data.py
+++ b/edisgo/data/import_data.py
@@ -1488,14 +1488,13 @@ def _import_genos_from_oedb(network):
if row['geom']:
geom = row['geom']
else:
- # MV generators: set geom to EnergyMap's geom, if available
- if int(row['voltage_level']) in [4,5]:
- # check if original geom from Energy Map is available
- if row['geom_em']:
- geom = row['geom_em']
- logger.warning('Generator {} has no geom entry, EnergyMap\'s geom entry will be used.'
- .format(id)
- )
+ # Set geom to EnergyMap's original geom, if this only this is
+ # available
+ if row['geom_em']:
+ geom = row['geom_em']
+ logger.warning('Generator {} has no geom entry, EnergyMap\'s geom entry will be used.'
+ .format(id)
+ )
return geom
|
Fix geom is None for LV generators
If geom of a generator is set to None this leads to subsequent errors...
|
diff --git a/support/app.js b/support/app.js
index <HASH>..<HASH> 100644
--- a/support/app.js
+++ b/support/app.js
@@ -25,7 +25,7 @@ app.get('/middleware', foo, foo, foo, foo, function(req, res){
var n = 100;
while (n--) {
- app.get('/foo', function(req, res){
+ app.get('/foo', foo, foo, function(req, res){
});
}
|
added some middleware to support/app.js
|
diff --git a/stdeb/util.py b/stdeb/util.py
index <HASH>..<HASH> 100644
--- a/stdeb/util.py
+++ b/stdeb/util.py
@@ -48,7 +48,7 @@ stdeb_cmdline_opts = [
('remove-expanded-source-dir','r',
'remove the expanded source directory'),
('ignore-install-requires', 'i',
- 'ignore the requirements from requires.txt in the egg-info directory
+ 'ignore the requirements from requires.txt in the egg-info directory'),
]
stdeb_cmd_bool_opts = [
|
fix SyntaxError introduced by --ignore-install-requires patch
|
diff --git a/src/views/pages/preview.blade.php b/src/views/pages/preview.blade.php
index <HASH>..<HASH> 100644
--- a/src/views/pages/preview.blade.php
+++ b/src/views/pages/preview.blade.php
@@ -12,16 +12,17 @@
<div id="overlay-inner">
<div class="pull-left">
- <div class="preview-text">You are previewing version #{{ $version->version }} of page "{{ $version->name }}"</div>
+ <div class="preview-text">You are previewing version #{{ $version->version }} of "{{ $version->page->name }}"</div>
</div>
-
- <div class="pull-right">
- @if (Session::has('comment_saved'))
- <span class="label label-success">Comment added!</span>
- @endif
- <button class="btn btn-default" id="add-comment-button">Add comment</button>
- </div>
+ @if ($version->status == 'draft')
+ <div class="pull-right">
+ @if (Session::has('comment_saved'))
+ <span class="label label-success">Comment added!</span>
+ @endif
+ <button class="btn btn-default" id="add-comment-button">Add comment</button>
+ </div>
+ @endif
<div class="clearfix"></div>
|
Only show the comment link on the preview when we are looking at a draft version.
|
diff --git a/packages/build-essentials/src/styles/styleConstants.js b/packages/build-essentials/src/styles/styleConstants.js
index <HASH>..<HASH> 100644
--- a/packages/build-essentials/src/styles/styleConstants.js
+++ b/packages/build-essentials/src/styles/styleConstants.js
@@ -20,7 +20,7 @@ const config = {
secondaryToolbar: ['linkIconButtonFlyout'],
flashMessageContainer: '2',
loadingIndicatorContainer: '2',
- secondaryInspector: ['context', 'close'],
+ secondaryInspector: ['context', 'iframe', 'close'],
secondaryInspectorElevated: ['context', 'dropdownContents'],
dialog: ['context'],
fullScreenClose: ['context'],
|
BUGFIX: Increase close button z- index
The secondary inspector has two constants for z index. The close
button needs to be incresed to value higher than 3. And the
possible iFrame has not z index yet. So we define a iframe zindex constant and so we also increase the close button constant.
|
diff --git a/src/phpDocumentor/Configuration/Loader.php b/src/phpDocumentor/Configuration/Loader.php
index <HASH>..<HASH> 100644
--- a/src/phpDocumentor/Configuration/Loader.php
+++ b/src/phpDocumentor/Configuration/Loader.php
@@ -50,7 +50,10 @@ class Loader
if (!$userConfigFilePath) {
$userConfigFilePath = $input->getParameterOption('-c');
}
- $userConfigFilePath = realpath($userConfigFilePath);
+
+ if ($userConfigFilePath !== false) {
+ $userConfigFilePath = realpath($userConfigFilePath);
+ }
if ($userConfigFilePath && $userConfigFilePath != 'none' && is_readable($userConfigFilePath)) {
chdir(dirname($userConfigFilePath));
|
only apply realpath if config file was set
see also #<I>
|
diff --git a/nodejs/scripts/tests/GH73/GH73.js b/nodejs/scripts/tests/GH73/GH73.js
index <HASH>..<HASH> 100644
--- a/nodejs/scripts/tests/GH73/GH73.js
+++ b/nodejs/scripts/tests/GH73/GH73.js
@@ -4,9 +4,9 @@ module.exports = {
"Issues" : {
"GH73Core" : require('./GH73Core'),
-
+ // TODO
// runs only standalone under linux
- // "GH73DateTimezoneOffset" : require('./GH73DateTimezoneOffset'),
+// "GH73DateTimezoneOffset" : require('./GH73DateTimezoneOffset'),
"GH73Calendar" : require('./GH73Calendar'),
"GH73GYear" : require('./GH73GYear'),
"GH73GYearMonth" : require('./GH73GYearMonth'),
|
Issue #<I>. TZ tests commenten out.
|
diff --git a/lib/adhearsion/process.rb b/lib/adhearsion/process.rb
index <HASH>..<HASH> 100644
--- a/lib/adhearsion/process.rb
+++ b/lib/adhearsion/process.rb
@@ -59,6 +59,13 @@ module Adhearsion
def request_stop
Events.trigger_immediately :stop_requested
+ IMPORTANT_THREADS << Thread.new do
+ until Adhearsion.active_calls.count == 0
+ logger.trace "Stop requested but we still have #{Adhearsion.active_calls.count} active calls."
+ sleep 0.2
+ end
+ force_stop
+ end
end
def final_shutdown
|
[FEATURE] Shut down when call count reaches 0.
|
diff --git a/src/org/mozilla/javascript/NativeDate.java b/src/org/mozilla/javascript/NativeDate.java
index <HASH>..<HASH> 100644
--- a/src/org/mozilla/javascript/NativeDate.java
+++ b/src/org/mozilla/javascript/NativeDate.java
@@ -1146,7 +1146,7 @@ final class NativeDate extends IdScriptable {
}
/* constants for toString, toUTCString */
- private static String js_NaN_date_str = "Invalid Date";
+ private static final String js_NaN_date_str = "Invalid Date";
private static String toLocale_helper(double t,
java.text.DateFormat formatter)
|
Adding missed final qualifier to the declaration of js_NaN_date_str field
|
diff --git a/app/src/androidTest/java/fi/iki/elonen/router/RouterNanoHTTPD.java b/app/src/androidTest/java/fi/iki/elonen/router/RouterNanoHTTPD.java
index <HASH>..<HASH> 100644
--- a/app/src/androidTest/java/fi/iki/elonen/router/RouterNanoHTTPD.java
+++ b/app/src/androidTest/java/fi/iki/elonen/router/RouterNanoHTTPD.java
@@ -560,13 +560,16 @@ public class RouterNanoHTTPD extends NanoHTTPD {
@Override
public Response serve(IHTTPSession session) {
+ long bodySize = ((HTTPSession)session).getBodySize();
+ session.getInputStream().mark(HTTPSession.BUFSIZE);
+
// Try to find match
Response r = router.process(session);
-
+
//clear remain body
try{
- Map<String, String> remainBody = new HashMap<>();
- session.parseBody(remainBody);
+ session.getInputStream().reset();
+ session.getInputStream().skip(bodySize);
}
catch (Exception e){
String error = "Error: " + e.getClass().getName() + " : " + e.getMessage();
|
fix call parseBody twice cause read timeout (#<I>)
some router.process call parseBody, after that we call parseBody for the second time, cause inputstream read timeout
|
diff --git a/salt/grains/core.py b/salt/grains/core.py
index <HASH>..<HASH> 100644
--- a/salt/grains/core.py
+++ b/salt/grains/core.py
@@ -528,6 +528,7 @@ _OS_FAMILY_MAP = {
'CloudLinux': 'RedHat',
'OVS': 'RedHat',
'OEL': 'RedHat',
+ 'XCP': 'RedHat',
'Mandrake': 'Mandriva',
'ESXi': 'VMWare',
'Mint': 'Debian',
|
Add XCP to the os_family grainmap per #<I>
|
diff --git a/build_id.py b/build_id.py
index <HASH>..<HASH> 100644
--- a/build_id.py
+++ b/build_id.py
@@ -1,14 +1,14 @@
+from __future__ import print_function
import datetime
import sys
import json
-json_data=open('./package.json').read();
+json_data=open('./package.json').read()
data=json.loads(json_data)
-print 'release.version='+data['version']
-print 'ptf.version=0'
-print 'patch.level=0'
+print('release.version='+data['version'])
+print('ptf.version=0')
+print('patch.level=0')
if len(sys.argv) > 1:
- print 'build.level='+sys.argv[1]
+ print('build.level='+sys.argv[1])
else:
- print 'build.level='+(datetime.datetime.now().strftime('%Y%m%d%H%M'))
-
+ print('build.level='+datetime.datetime.now().strftime('%Y%m%d%H%M'))
|
Use print() function in both Python 2 and Python 3
Legacy __print__ statements are syntax errors in Python 3 but __print()__ function works as expected in both Python 2 and Python 3.
|
diff --git a/Controller/AdministrationController.php b/Controller/AdministrationController.php
index <HASH>..<HASH> 100644
--- a/Controller/AdministrationController.php
+++ b/Controller/AdministrationController.php
@@ -1016,10 +1016,13 @@ class AdministrationController extends Controller
$criteriaForm->handleRequest($this->request);
$unique = false;
+ $range = null;
+
if ($criteriaForm->isValid()) {
$range = $criteriaForm->get('range')->getData();
$unique = $criteriaForm->get('unique')->getData() === 'true';
}
+
$actionsForRange = $this->analyticsManager
->getDailyActionNumberForDateRange($range, 'user_login', $unique);
@@ -1065,9 +1068,9 @@ class AdministrationController extends Controller
/**
* @EXT\Route(
- * "/analytics/top/{top_type}",
+ * "/analytics/top/{topType}",
* name="claro_admin_analytics_top",
- * defaults={"top_type" = "top_users_connections"}
+ * defaults={"topType" = "top_users_connections"}
* )
*
* @EXT\Method({"GET", "POST"})
|
[CoreBundle] Fixed stat controller bugs
|
diff --git a/packages/dev-react/config/babel.js b/packages/dev-react/config/babel.js
index <HASH>..<HASH> 100644
--- a/packages/dev-react/config/babel.js
+++ b/packages/dev-react/config/babel.js
@@ -3,11 +3,7 @@ const base = require('@polkadot/dev/config/babel');
module.exports = Object.keys(base).reduce((config, key) => {
config[key] = base[key];
- if (key === 'plugins') {
- config[key] = config[key].concat([
- 'react-hot-loader/babel'
- ]);
- } else if (key === 'presets') {
+ if (key === 'presets') {
const env = config[key].find((item) => item[0] === '@babel/preset-env');
env[1].targets.browsers = [
|
Remove react-hot-loader from default deps
|
diff --git a/spec/attr_vault_spec.rb b/spec/attr_vault_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/attr_vault_spec.rb
+++ b/spec/attr_vault_spec.rb
@@ -355,12 +355,12 @@ describe AttrVault do
context "with a digest field" do
let(:key_id) { '80a8571b-dc8a-44da-9b89-caee87e41ce2' }
- let (:key) {
+ let(:key) {
[{id: key_id,
value: 'aFJDXs+798G7wgS/nap21LXIpm/Rrr39jIVo2m/cdj8=',
created_at: Time.now}]
}
- let(:item) {
+ let(:item) {
# the let form can't be evaluated inside the class definition
# because Ruby scoping rules were written by H.P. Lovecraft, so
# we create a local here to work around that
|
Clean up whitespace and fix a linting error
The "let (:key)" construct was the nearly-problematic one, because
association rules allow (:key) to be a "grouped expression".
|
diff --git a/value/src/main/java/com/google/auto/value/extension/AutoValueExtension.java b/value/src/main/java/com/google/auto/value/extension/AutoValueExtension.java
index <HASH>..<HASH> 100644
--- a/value/src/main/java/com/google/auto/value/extension/AutoValueExtension.java
+++ b/value/src/main/java/com/google/auto/value/extension/AutoValueExtension.java
@@ -9,11 +9,10 @@ import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.TypeElement;
/**
+ * This API is not final and WILL CHANGE in a future release.
* An AutoValueExtension allows for extra functionality to be created during the generation
* of an AutoValue class.
*
- * <p>NOTE: The design of this interface is not final and subject to change.
- *
* <p>Extensions are discovered at compile time using the {@link java.util.ServiceLoader} APIs,
* allowing them to run without any additional annotations.
*
|
Add stronger scare-text to the javadoc for AutoValueExtension. The intent is to allow a <I> release without having to finalize this API.
-------------
Created by MOE: <URL>
|
diff --git a/spec/upyun_spec.rb b/spec/upyun_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/upyun_spec.rb
+++ b/spec/upyun_spec.rb
@@ -337,7 +337,7 @@ describe "Form Upload", current: true do
it "set not correct 'expiration' should return 403 with expired" do
res = @form.upload(@file, {'expiration' => 102400})
expect(res[:code]).to eq(403)
- expect(res[:message]).to match(/Authorize has expired/)
+ expect(res[:message]).to match(/authorization has expired/)
end
it "set 'return-url' should return a hash" do
|
Server is responding differently, updating the spec
The response message was actually "authorization has expired" and not "Authorize has expired"
|
diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/inbound/InboundMessageDispatcherTest.java b/driver/src/test/java/org/neo4j/driver/internal/async/inbound/InboundMessageDispatcherTest.java
index <HASH>..<HASH> 100644
--- a/driver/src/test/java/org/neo4j/driver/internal/async/inbound/InboundMessageDispatcherTest.java
+++ b/driver/src/test/java/org/neo4j/driver/internal/async/inbound/InboundMessageDispatcherTest.java
@@ -67,7 +67,7 @@ class InboundMessageDispatcherTest
@Test
void shouldFailWhenCreatedWithNullLogging()
{
- assertThrows( NullPointerException.class, () -> new InboundMessageDispatcher( mock( Channel.class ), null ) );
+ assertThrows( NullPointerException.class, () -> new InboundMessageDispatcher( newChannelMock(), null ) );
}
@Test
@@ -109,7 +109,7 @@ class InboundMessageDispatcherTest
@Test
void shouldSendResetOnFailure()
{
- Channel channel = mock( Channel.class );
+ Channel channel = newChannelMock();
InboundMessageDispatcher dispatcher = newDispatcher( channel );
dispatcher.enqueue( mock( ResponseHandler.class ) );
|
Fix mocking in a unit test
|
diff --git a/source/org/jasig/portal/RDBMUserLayoutStore.java b/source/org/jasig/portal/RDBMUserLayoutStore.java
index <HASH>..<HASH> 100644
--- a/source/org/jasig/portal/RDBMUserLayoutStore.java
+++ b/source/org/jasig/portal/RDBMUserLayoutStore.java
@@ -837,8 +837,8 @@ public class RDBMUserLayoutStore
setAutoCommit(con, false);
Statement stmt = con.createStatement();
try {
- String sqlTitle = channel.getAttribute("title");
- String sqlDescription = channel.getAttribute("description");
+ String sqlTitle = sqlEscape(channel.getAttribute("title"));
+ String sqlDescription = sqlEscape(channel.getAttribute("description"));
String sqlClass = channel.getAttribute("class");
String sqlTypeID = channel.getAttribute("typeID");
String sysdate = "{ts '" + new Timestamp(System.currentTimeMillis()).toString() + "'}";
|
Added SQL escaping to Title and Description fields of new channels.
git-svn-id: <URL>
|
diff --git a/lib/push.js b/lib/push.js
index <HASH>..<HASH> 100644
--- a/lib/push.js
+++ b/lib/push.js
@@ -32,7 +32,7 @@ module.exports = function push (options, docsOrIds) {
})
replication.on('error', defer.reject)
replication.on('change', function (change) {
- if(change.docs.length > 1) {
+ if (change.docs.length > 1) {
pushedObjects = pushedObjects.concat(change.docs)
}
pushedObjects.push(change.docs)
|
feat(push): fixed undefined object in pushedObj
|
diff --git a/lnwallet/script_utils.go b/lnwallet/script_utils.go
index <HASH>..<HASH> 100644
--- a/lnwallet/script_utils.go
+++ b/lnwallet/script_utils.go
@@ -1005,6 +1005,20 @@ func TweakPubKey(basePoint, commitPoint *btcec.PublicKey) *btcec.PublicKey {
}
}
+// TweakPubKeyWithTweak is the exact same as the TweakPubKey function, however
+// it accepts the raw tweak bytes directly rather than the commitment point.
+func TweakPubKeyWithTweak(pubKey *btcec.PublicKey, tweakBytes []byte) *btcec.PublicKey {
+ tweakX, tweakY := btcec.S256().ScalarBaseMult(tweakBytes)
+
+ x, y := btcec.S256().Add(pubKey.X, pubKey.Y, tweakX, tweakY)
+
+ return &btcec.PublicKey{
+ X: x,
+ Y: y,
+ Curve: btcec.S256(),
+ }
+}
+
// TweakPrivKek tweaks the private key of a public base point given a per
// commitment point. The per commitment secret is the revealed revocation
// secret for the commitment state in question. This private key will only need
|
lnwallet: add TweakPubKeyWithTweak helper function
This commit adds a new helper function which is identical to
TweakPubkey, but lets the caller specify their own hash tweak.
|
diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index <HASH>..<HASH> 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -443,6 +443,7 @@ function domTextBetween(cm, from, to, fromLine, toLine) {
walk(from)
if (from == to) break
from = from.nextSibling
+ extraLinebreak = false
}
return text
}
|
Reset extralinebreak between nodes
|
diff --git a/internal/shareable/shareable_test.go b/internal/shareable/shareable_test.go
index <HASH>..<HASH> 100644
--- a/internal/shareable/shareable_test.go
+++ b/internal/shareable/shareable_test.go
@@ -42,7 +42,8 @@ func TestMain(m *testing.M) {
const bigSize = 2049
-func TestEnsureNotShared(t *testing.T) {
+// Temporary disabled per #575.
+func Disabled_TestEnsureNotShared(t *testing.T) {
// Create img1 and img2 with this size so that the next images are allocated
// with non-upper-left location.
img1 := NewImage(bigSize, 100)
|
shareable: Temporary disable tests (#<I>)
|
diff --git a/tests/UserAgentParserEnhancedTest.php b/tests/UserAgentParserEnhancedTest.php
index <HASH>..<HASH> 100644
--- a/tests/UserAgentParserEnhancedTest.php
+++ b/tests/UserAgentParserEnhancedTest.php
@@ -5,6 +5,7 @@ require_once 'DevicesDetection/UserAgentParserEnhanced/UserAgentParserEnhanced.p
class UserAgentParserEnhancedTest extends PHPUnit_Framework_TestCase
{
/**
+ * @group Plugins
* @dataProvider getUserAgents_asParsed
*/
public function testParse($expected)
|
Cleaning up @group comments on tests to keep only 4 groups: Core, Integration, Plugins and UI
|
diff --git a/lib/nestive/layout_helper.rb b/lib/nestive/layout_helper.rb
index <HASH>..<HASH> 100644
--- a/lib/nestive/layout_helper.rb
+++ b/lib/nestive/layout_helper.rb
@@ -237,8 +237,8 @@ module Nestive
# @todo is `html_safe` "safe" here?
def render_area(name)
[].tap do |output|
- @_area_for.fetch(name, []).reverse_each do |i|
- output.send i.first, i.last
+ @_area_for.fetch(name, []).reverse_each do |method_name, content|
+ output.public_send method_name, content
end
end.join.html_safe
end
|
A bit of codestyle goodness for a private method
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -169,7 +169,6 @@ def runSetup():
'console_scripts': [
'toil = toil.utils.toilMain:main',
'_toil_worker = toil.worker:main',
- 'cwltoil = toil.cwl.cwltoil:main [cwl]',
'toil-cwl-runner = toil.cwl.cwltoil:main [cwl]',
'toil-wdl-runner = toil.wdl.toilwdl:main',
'_toil_mesos_executor = toil.batchSystems.mesos.executor:main [mesos]',
|
Drop the long-deprecated cwltoil (#<I>)
Same entry point is provided by `toil-cwl-runner`
|
diff --git a/parsl/providers/provider_base.py b/parsl/providers/provider_base.py
index <HASH>..<HASH> 100644
--- a/parsl/providers/provider_base.py
+++ b/parsl/providers/provider_base.py
@@ -29,7 +29,15 @@ class JobState(bytes, Enum):
class JobStatus(object):
- """Encapsulates a job state together with other details, presently a (error) message"""
+ """Encapsulates a job state together with other details:
+
+ Args:
+ state: The machine-reachable state of the job this status refers to
+ message: Optional human readable message
+ exit_code: Optional exit code
+ stdout_path: Optional path to a file containing the job's stdout
+ stderr_path: Optional path to a file containing the job's stderr
+ """
SUMMARY_TRUNCATION_THRESHOLD = 2048
def __init__(self, state: JobState, message: Optional[str] = None, exit_code: Optional[int] = None,
|
Elaborate JobStatus docstring to include stdout/err/state info (#<I>)
|
diff --git a/tests/test_connections.py b/tests/test_connections.py
index <HASH>..<HASH> 100644
--- a/tests/test_connections.py
+++ b/tests/test_connections.py
@@ -1,6 +1,6 @@
from dingus import Dingus
-from nydus.db import Cluster
+from nydus.db import Cluster, create_cluster
from nydus.db.routers import BaseRouter
from nydus.db.backends import BaseConnection
@@ -22,12 +22,21 @@ class DummyRouter(BaseRouter):
return [0]
class ClusterTest(BaseTest):
+ def test_create_cluster(self):
+ c = create_cluster({
+ 'engine': DummyConnection,
+ 'router': DummyRouter,
+ 'hosts': {
+ 0: {'resp': 'bar'},
+ }
+ })
+ self.assertEquals(len(c), 1)
+
def test_init(self):
c = Cluster(
hosts={0: BaseConnection(num=1)},
)
self.assertEquals(len(c), 1)
- self.assertTrue(c.redis)
def test_proxy(self):
c = DummyConnection(num=1, resp='bar')
|
Added tests for create_cluster
|
diff --git a/lib/pith/server.rb b/lib/pith/server.rb
index <HASH>..<HASH> 100644
--- a/lib/pith/server.rb
+++ b/lib/pith/server.rb
@@ -12,6 +12,7 @@ module Pith
use Rack::Lint
use Pith::Server::AutoBuild, project
use Adsf::Rack::IndexFileFinder, :root => project.output_dir
+ use Pith::Server::DefaultToHtml, project.output_dir
run Rack::Directory.new(project.output_dir)
end
end
@@ -21,7 +22,7 @@ module Pith
end
extend self
-
+
class AutoBuild
def initialize(app, project)
@@ -36,6 +37,29 @@ module Pith
end
+ class DefaultToHtml
+
+ def initialize(app, root)
+ @app = app
+ @root = root
+ end
+
+ def call(env)
+
+ path_info = ::Rack::Utils.unescape(env["PATH_INFO"])
+ file = "#{@root}#{path_info}"
+ unless File.exist?(file)
+ if File.exist?("#{file}.html")
+ env["PATH_INFO"] += ".html"
+ end
+ end
+
+ @app.call(env)
+
+ end
+
+ end
+
end
end
|
Magically append missing ".html" extension to requests.
(dumb-ass broken impl of content negotiation)
|
diff --git a/h2o-py/h2o/frame.py b/h2o-py/h2o/frame.py
index <HASH>..<HASH> 100644
--- a/h2o-py/h2o/frame.py
+++ b/h2o-py/h2o/frame.py
@@ -664,7 +664,7 @@ class H2OVec:
# whole vec replacement
self._len_check(b)
# lazy update in-place of the whole vec
- self._expr = Expr("=", Expr("[", self._expr, b), Expr(c))
+ self._expr = Expr("=", Expr("[", self._expr, b), None if c is None else Expr(c))
else:
raise NotImplementedError("Only vector replacement is currently supported.")
|
handle assign null over 0
... as well as assign 0 over null
|
diff --git a/client/json-socket-connection.js b/client/json-socket-connection.js
index <HASH>..<HASH> 100644
--- a/client/json-socket-connection.js
+++ b/client/json-socket-connection.js
@@ -18,7 +18,7 @@ var JSONSocketConnection = W.Object.extend({
W.extend(this, W.eventMixin);
this.socketUrl = options.socketUrl;
this._connectionDesired = false;
- this.attemptReconnectionAfterMS = (typeof attemptReconnectionAfterMS !== 'undefined') ? options.attemptReconnectionAfterMS : 1000;
+ this.attemptReconnectionAfterMS = (typeof options.attemptReconnectionAfterMS !== 'undefined') ? options.attemptReconnectionAfterMS : 1000;
},
openSocketConnection : function () {
this._connectionDesired = true;
|
Fixed JSONSocketConnection attemptReconnectionAfterMS undefined condition
|
diff --git a/crypto/crypto.go b/crypto/crypto.go
index <HASH>..<HASH> 100644
--- a/crypto/crypto.go
+++ b/crypto/crypto.go
@@ -97,6 +97,16 @@ func toECDSA(d []byte, strict bool) (*ecdsa.PrivateKey, error) {
return nil, fmt.Errorf("invalid length, need %d bits", priv.Params().BitSize)
}
priv.D = new(big.Int).SetBytes(d)
+
+ // The priv.D must < N
+ if priv.D.Cmp(secp256k1_N) >= 0 {
+ return nil, fmt.Errorf("invalid private key, >=N")
+ }
+ // The priv.D must not be zero or negative.
+ if priv.D.Sign() <= 0 {
+ return nil, fmt.Errorf("invalid private key, zero or negative")
+ }
+
priv.PublicKey.X, priv.PublicKey.Y = priv.PublicKey.Curve.ScalarBaseMult(d)
if priv.PublicKey.X == nil {
return nil, errors.New("invalid private key")
|
crypto: ensure private keys are < N (#<I>)
Fixes #<I>
|
diff --git a/telethon/telegram_client.py b/telethon/telegram_client.py
index <HASH>..<HASH> 100644
--- a/telethon/telegram_client.py
+++ b/telethon/telegram_client.py
@@ -43,7 +43,7 @@ class TelegramClient:
# Current TelegramClient version
__version__ = '0.8'
- # region Initialization
+ # region Default methods of class
def __init__(self, session, api_id, api_hash, proxy=None):
"""Initializes the Telegram client with the specified API ID and Hash.
@@ -82,6 +82,10 @@ class TelegramClient:
# We need to be signed in before we can listen for updates
self.signed_in = False
+ def __del__(self):
+ """Releases the Telegram client, performing disconnection."""
+ self.disconnect()
+
# endregion
# region Connecting
|
TelegramClient: Perform disconnection on class destruction (#<I>)
|
diff --git a/tools/src/main/resources/templates/java/AppTest.java b/tools/src/main/resources/templates/java/AppTest.java
index <HASH>..<HASH> 100644
--- a/tools/src/main/resources/templates/java/AppTest.java
+++ b/tools/src/main/resources/templates/java/AppTest.java
@@ -1,3 +1,4 @@
+import com.jetdrone.vertx.yoke.Yoke;
import com.jetdrone.vertx.yoke.Middleware;
import com.jetdrone.vertx.yoke.middleware.YokeRequest;
import com.jetdrone.vertx.yoke.test.Response;
@@ -12,7 +13,7 @@ public class AppTest extends TestVerticle {
@Test
public void testApp() {
- final YokeTester yoke = new YokeTester(this);
+ final Yoke yoke = new Yoke(this);
yoke.use(new Middleware() {
@Override
public void handle(YokeRequest request, Handler<Object> next) {
@@ -21,7 +22,9 @@ public class AppTest extends TestVerticle {
}
});
- yoke.request("GET", "/", new Handler<Response>() {
+ final YokeTester yokeAssert = new YokeTester(vertx, yoke);
+
+ yokeAssert.request("GET", "/", new Handler<Response>() {
@Override
public void handle(Response response) {
assertEquals("OK", response.body.toString());
|
port yoketester to work with other languages than just java
|
diff --git a/src/Template/GoTemplateParser.php b/src/Template/GoTemplateParser.php
index <HASH>..<HASH> 100644
--- a/src/Template/GoTemplateParser.php
+++ b/src/Template/GoTemplateParser.php
@@ -107,7 +107,7 @@
$reader->setHandler(new class ($rootNode, $this->directiveBag) implements HtmlCallback {
- private $html5EmptyTags = ["img", "meta", "br", "hr", "input"]; // Tags to treat as empty although they're not
+ private $html5EmptyTags = ["img", "meta", "br", "hr", "input", "link"]; // Tags to treat as empty although they're not
/**
* @var GoNode
|
Added link element to empty tag list
|
diff --git a/dallinger/bots.py b/dallinger/bots.py
index <HASH>..<HASH> 100644
--- a/dallinger/bots.py
+++ b/dallinger/bots.py
@@ -116,7 +116,9 @@ class BotBase(object):
self.driver.get(self.URL)
logger.info("Loaded ad page.")
begin = WebDriverWait(self.driver, 10).until(
- EC.element_to_be_clickable((By.CLASS_NAME, "btn-primary"))
+ EC.element_to_be_clickable(
+ (By.CSS_SELECTOR, "button.btn-primary, button.btn-success")
+ )
)
begin.click()
logger.info("Clicked begin experiment button.")
diff --git a/dallinger/recruiters.py b/dallinger/recruiters.py
index <HASH>..<HASH> 100644
--- a/dallinger/recruiters.py
+++ b/dallinger/recruiters.py
@@ -940,7 +940,7 @@ class BotRecruiter(Recruiter):
url = "{}/ad?{}".format(base_url, ad_parameters)
urls.append(url)
bot = factory(url, assignment_id=assignment, worker_id=worker, hit_id=hit)
- job = q.enqueue(bot.run_experiment, timeout=self._timeout)
+ job = q.enqueue(bot.run_experiment, job_timeout=self._timeout)
logger.warning("Created job {} for url {}.".format(job.id, url))
return urls
|
Fix selenium bot test issues. Not sure why these tests only failed on the recruiter branch.
|
diff --git a/resources/assets/js/files.attachments.app.js b/resources/assets/js/files.attachments.app.js
index <HASH>..<HASH> 100644
--- a/resources/assets/js/files.attachments.app.js
+++ b/resources/assets/js/files.attachments.app.js
@@ -108,6 +108,8 @@ Files.Attachments.App = new Class({
if (copy.file.thumbnail) {
that.preview.getElement('img').set('src', Files.sitebase + '/' + that.encodePath(copy.file.thumbnail.relative_path)).show();
+ } else if (copy.file.type == 'image') {
+ that.preview.getElement('img').set('src', that.createRoute({view: 'file', format: 'html', name: encodeURIComponent(copy.file.name), routed: 1}));
}
that.grid.selected = row.name;
|
#<I> Set image source if no thumbnail is set
|
diff --git a/src/index.js b/src/index.js
index <HASH>..<HASH> 100644
--- a/src/index.js
+++ b/src/index.js
@@ -39,7 +39,8 @@ class PublicationServer {
authorization: this._authFn,
pathname: this._mountPath,
parser: 'EJSON',
- transformer: 'uws'
+ transformer: 'uws',
+ pingInterval: false
});
this._primus.on('connection', (spark) => {
@@ -89,4 +90,4 @@ class PublicationServer {
}
}
-module.exports = PublicationServer;
\ No newline at end of file
+module.exports = PublicationServer;
|
Remove the pingInterval
Since we don't use the timeout strategy in the publication-client, we
can remove the pingInterval in favor of our own ping/pong
implementations.
|
diff --git a/holoviews/core/layout.py b/holoviews/core/layout.py
index <HASH>..<HASH> 100644
--- a/holoviews/core/layout.py
+++ b/holoviews/core/layout.py
@@ -277,6 +277,11 @@ class LayoutTree(AttrTree, LabelledData):
return self
+ def select(self, **selections):
+ return self.clone([(path, item.select(**selections))
+ for path, item in self.items()])
+
+
def __getitem__(self, key):
if isinstance(key, int):
if key < len(self):
|
Added select method to elements on LayoutTree
|
diff --git a/lib/licensed/sources/bundler.rb b/lib/licensed/sources/bundler.rb
index <HASH>..<HASH> 100644
--- a/lib/licensed/sources/bundler.rb
+++ b/lib/licensed/sources/bundler.rb
@@ -60,7 +60,7 @@ module Licensed
Dependency.new(
name: spec.name,
version: spec.version.to_s,
- path: spec.gem_dir,
+ path: spec.full_gem_path,
loaded_from: spec.loaded_from,
errors: Array(error),
metadata: {
|
use full_gem_path
I found an issue during debugging the spec_root
method where specs from git sources may report
gem_dir incorrectly. full_gem_path didn't seem to
suffer from the same problem
|
diff --git a/github_fork_repos.py b/github_fork_repos.py
index <HASH>..<HASH> 100755
--- a/github_fork_repos.py
+++ b/github_fork_repos.py
@@ -1,4 +1,4 @@
-#!/bin/env python
+#!/usr/bin/env python
"""
Fork github repos
@@ -12,14 +12,14 @@ from github3 import login
from getpass import getuser
import os
import sys
-import time
+from time import sleep
token = ''
debug = os.getenv("DM_SQUARE_DEBUG")
user = getuser()
if debug:
- print user
+ print 'You are', user
# I have cut and pasted code
# I am a bad person
@@ -52,9 +52,11 @@ for repo in repos:
print repo.name
forked_repo = repo.create_fork(user+'-shadow')
- forked_name = forked_repo.name
+ sleep(2)
+
+ # forked_name = forked_repo.name
# Trap previous fork with dm_ prefix
- if not forked_name.startswith("dm_"):
- newname = "dm_" + forked_name
- forked_repo.edit(newname)
+ #if not forked_name.startswith("dm_"):
+ # newname = "dm_" + forked_name
+ # forked_repo.edit(newname)
|
Take out the rename code for now
|
diff --git a/tests/Unit/Websocket/ApplicationTest.php b/tests/Unit/Websocket/ApplicationTest.php
index <HASH>..<HASH> 100644
--- a/tests/Unit/Websocket/ApplicationTest.php
+++ b/tests/Unit/Websocket/ApplicationTest.php
@@ -21,7 +21,7 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase
$app['sandstone.websocket.router'] = function () {
$wrongTopic = new WrongTopic('my-topic');
- $topicRouterMock = $this->createMock(TopicRouter::class);
+ $topicRouterMock = $this->getMockBuilder(TopicRouter::class)->disableOriginalConstructor()->getMock();
$topicRouterMock
->method('loadTopic')
@@ -31,8 +31,10 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase
return $topicRouterMock;
};
- $this->expectException(\LogicException::class);
- $this->expectExceptionMessage('WrongTopic seems to implements the wrong EventSubscriberInterface');
+ $this->setExpectedExceptionRegExp(
+ \LogicException::class,
+ '/WrongTopic seems to implements the wrong EventSubscriberInterface/'
+ );
$method->invokeArgs($websocketApp, ['my-topic']);
}
|
Fix incompatibility with php <I> in tests
|
diff --git a/test/repo.js b/test/repo.js
index <HASH>..<HASH> 100644
--- a/test/repo.js
+++ b/test/repo.js
@@ -11,7 +11,7 @@ exports.open = function(test){
test.expect(2);
// Test invalid repository
- git.Repo.open('/etc/hosts', function(error, repository) {
+ git.Repo.open('/private/etc/hosts', function(error, repository) {
test.equals(error.message, "The `.git` file at '/private/etc/hosts' is malformed");
// Test valid repository
|
fixed broken test on linux: /etc/hosts -> /private/etc/hosts
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.