diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/commerce-service/src/main/java/com/liferay/commerce/model/impl/CommerceOrderImpl.java b/commerce-service/src/main/java/com/liferay/commerce/model/impl/CommerceOrderImpl.java
index <HASH>..<HASH> 100644
--- a/commerce-service/src/main/java/com/liferay/commerce/model/impl/CommerceOrderImpl.java
+++ b/commerce-service/src/main/java/com/liferay/commerce/model/impl/CommerceOrderImpl.java
@@ -269,6 +269,17 @@ public class CommerceOrderImpl extends CommerceOrderBaseImpl {
}
@Override
+ public boolean isSubscription() {
+ if (getOrderStatus() ==
+ CommerceOrderConstants.ORDER_STATUS_SUBSCRIPTION) {
+
+ return true;
+ }
+
+ return false;
+ }
+
+ @Override
public void setShippingDiscounts(
CommerceDiscountValue commerceDiscountValue) {
|
COMMERCE-<I> Added new method to commerce order implementation
|
diff --git a/src/frontend/org/voltdb/planner/StatementPartitioning.java b/src/frontend/org/voltdb/planner/StatementPartitioning.java
index <HASH>..<HASH> 100644
--- a/src/frontend/org/voltdb/planner/StatementPartitioning.java
+++ b/src/frontend/org/voltdb/planner/StatementPartitioning.java
@@ -535,7 +535,7 @@ public class StatementPartitioning implements Cloneable{
m_countOfIndependentlyPartitionedTables = m_countOfPartitionedTables;
}
-
+
public void resetAnalysisState() {
m_countOfIndependentlyPartitionedTables = -1;
m_countOfPartitionedTables = -1;
diff --git a/src/frontend/org/voltdb/plannodes/DeletePlanNode.java b/src/frontend/org/voltdb/plannodes/DeletePlanNode.java
index <HASH>..<HASH> 100644
--- a/src/frontend/org/voltdb/plannodes/DeletePlanNode.java
+++ b/src/frontend/org/voltdb/plannodes/DeletePlanNode.java
@@ -67,7 +67,7 @@ public class DeletePlanNode extends AbstractOperationPlanNode {
}
return "DELETE " + m_targetTableName;
}
-
+
@Override
public boolean isOrderDeterministic() {
assert(m_children != null);
|
Fix trailing whitespace left from earlier changes
|
diff --git a/src/mako/file/FileSystem.php b/src/mako/file/FileSystem.php
index <HASH>..<HASH> 100644
--- a/src/mako/file/FileSystem.php
+++ b/src/mako/file/FileSystem.php
@@ -131,25 +131,30 @@ class FileSystem
}
/**
- * Returns TRUE if a directory is empty and FALSE if not.
+ * Returns TRUE if a file or directory is empty and FALSE if not.
*
* @access public
* @param string $path Path to directory
* @return boolean
*/
- public function isDirectoryEmpty($path)
+ public function isEmpty($path)
{
- $files = scandir($path);
-
- foreach($files as $file)
+ if(is_dir($path))
{
- if($file !== '.' && $file !== '..')
+ $files = scandir($path);
+
+ foreach($files as $file)
{
- return false;
+ if($file !== '.' && $file !== '..')
+ {
+ return false;
+ }
}
+
+ return true;
}
- return true;
+ return filesize($path) === 0;
}
/**
|
Renamed isDirectoryEmpty to isEmpty
Will now work on both files and directories
|
diff --git a/modules/relative-urls.php b/modules/relative-urls.php
index <HASH>..<HASH> 100755
--- a/modules/relative-urls.php
+++ b/modules/relative-urls.php
@@ -92,7 +92,7 @@ if ( ! class_exists(__NAMESPACE__ . '\\RelativeUrls') ) {
public static function content_return_absolute_url_filter( $content ) {
// This might be issue in really big sites so save results to transient using hash
- $letter_count = count($content);
+ $letter_count = strlen($content);
$hash = crc32($content);
$transient_key = 'seravo_feed_' . $letter_count . '_' . $hash;
|
Use strlen() instead of count() when manipulating strings (Closes: #<I>)
The function count() should only be used with arrays, objects and alike.
|
diff --git a/falafel/mappers/chkconfig.py b/falafel/mappers/chkconfig.py
index <HASH>..<HASH> 100644
--- a/falafel/mappers/chkconfig.py
+++ b/falafel/mappers/chkconfig.py
@@ -4,6 +4,7 @@ chkconfig - command
"""
from collections import namedtuple
from .. import Mapper, mapper
+import re
@mapper('chkconfig')
@@ -54,16 +55,22 @@ class ChkConfig(Mapper):
Args:
content (context.content): Mapper context content
"""
- valid_states = {':on', ':off'}
+
+ on_state = re.compile(r':\s*on(?:\s+|$)')
+ off_state = re.compile(r':\s*off(?:\s+|$)')
+
+ valid_states = [on_state, off_state]
for line in content:
- if any(state in line for state in valid_states):
- service = line.split()[0].strip()
- enabled = ':on' in line # Store boolean value
+ if any(state.search(line) for state in valid_states):
+ service = line.split()[0].strip(' \t:')
+ enabled = on_state.search(line) is not None
self.services[service] = enabled
self.parsed_lines[service] = line
states = []
for level in line.split()[1:]:
+ if len(level.split(':')) < 2:
+ continue
num, state = level.split(':')
states.append(self.LevelState(num.strip(), state.strip()))
self.level_states[service] = states
|
Add support for xinetd-based services
|
diff --git a/tinytag/tinytag.py b/tinytag/tinytag.py
index <HASH>..<HASH> 100644
--- a/tinytag/tinytag.py
+++ b/tinytag/tinytag.py
@@ -449,6 +449,7 @@ class ID3(TinyTag):
'TPE2': 'albumartist', 'TCOM': 'composer',
'WXXX': 'extra.url',
'TXXX': 'extra.text',
+ 'TKEY': 'extra.initial_key',
}
IMAGE_FRAME_IDS = {'APIC', 'PIC'}
PARSABLE_FRAME_IDS = set(FRAME_ID_TO_FIELD.keys()).union(IMAGE_FRAME_IDS)
|
added support for TKEY id3 meta data (Initial Key) as part of the `extra` field #<I>
|
diff --git a/pub/index.php b/pub/index.php
index <HASH>..<HASH> 100644
--- a/pub/index.php
+++ b/pub/index.php
@@ -9,5 +9,4 @@ require_once '../vendor/autoload.php';
$request = HttpRequest::fromGlobalState(file_get_contents('php://input'));
$website = new SampleWebFront($request);
-$website->registerFactory(new SampleFactory());
$website->run();
diff --git a/src/SampleWebFront.php b/src/SampleWebFront.php
index <HASH>..<HASH> 100644
--- a/src/SampleWebFront.php
+++ b/src/SampleWebFront.php
@@ -17,6 +17,7 @@ class SampleWebFront extends WebFront
protected function registerFactories(MasterFactory $masterFactory)
{
$masterFactory->register(new CommonFactory());
+ $masterFactory->register(new SampleFactory());
$masterFactory->register(new FrontendFactory($this->getRequest()));
}
|
Issue #<I>: Register SampleFactory in SampleWebFront
|
diff --git a/mtglib/__init__.py b/mtglib/__init__.py
index <HASH>..<HASH> 100644
--- a/mtglib/__init__.py
+++ b/mtglib/__init__.py
@@ -1,2 +1,2 @@
-__version__ = '1.3.3'
+__version__ = '1.4.0'
__author__ = 'Cameron Higby-Naquin'
|
Increment minor version for release.
|
diff --git a/NavigationReactNative/src/android/app/src/main/java/com/navigation/reactnative/NavigationStackView.java b/NavigationReactNative/src/android/app/src/main/java/com/navigation/reactnative/NavigationStackView.java
index <HASH>..<HASH> 100644
--- a/NavigationReactNative/src/android/app/src/main/java/com/navigation/reactnative/NavigationStackView.java
+++ b/NavigationReactNative/src/android/app/src/main/java/com/navigation/reactnative/NavigationStackView.java
@@ -163,6 +163,16 @@ public class NavigationStackView extends ViewGroup {
}
currentActivity.overridePendingTransition(enter, exit);
}
+ if (crumb == currentCrumb) {
+ Intent intent = new Intent(getContext(), SceneActivity.getActivity(crumb));
+ intent.putExtra(SceneActivity.CRUMB, crumb);
+ sceneItems.get(crumb).intent = intent;
+ int enter = this.getAnimationResourceId(this.enterAnim, this.activityOpenEnterAnimationId);
+ int exit = this.getAnimationResourceId(this.exitAnim, this.activityOpenExitAnimationId);
+ currentActivity.finish();
+ currentActivity.startActivity(intent);
+ currentActivity.overridePendingTransition(enter, exit);
+ }
oldCrumb = sceneItems.size() - 1;
}
|
Finished and started if crumbs equal
It only comes in here when replacing the current view and changing State
|
diff --git a/lib/server.js b/lib/server.js
index <HASH>..<HASH> 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -74,9 +74,9 @@ Server.prototype.server = function () {
if (logging) app.use(morgan(logging));
app.use(compression());
app.use(errorhandler());
- app.get('/', this.handleRender.bind(this));
app.get('/build/*', this.handleBuild.bind(this));
app.use('/build', serveStatic(this.root()));
+ app.get('*', this.handleRender.bind(this));
return app;
};
diff --git a/test/server.js b/test/server.js
index <HASH>..<HASH> 100644
--- a/test/server.js
+++ b/test/server.js
@@ -27,6 +27,13 @@ describe('Web Server', function () {
.end(done);
});
+ it('should render the root even for alternate paths', function (done) {
+ request(app)
+ .get('/hello/world')
+ .expect(200, read(fixture('simple/out.html'), 'utf8'))
+ .end(done);
+ });
+
it('should render the expected css', function (done) {
request(app)
.get('/build/index.css')
|
allowing any path to serve the root (for spa-like apps)
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -35,7 +35,7 @@ module.exports = function(opts) {
width: res.info.width,
height: res.info.height,
data: [
- 'url(data:image/svg+xml;utf8,',
+ 'url(data:image/svg+xml;charset=utf8,',
encodeURIComponent(res.data),
')'
].join(''),
|
Data charset format fix for IE
Adding charset= before utf8 makes the SVG data URIs work in Internet Explorer
|
diff --git a/demos/chat/chat.js b/demos/chat/chat.js
index <HASH>..<HASH> 100644
--- a/demos/chat/chat.js
+++ b/demos/chat/chat.js
@@ -118,8 +118,9 @@ irc.onerror = function(command) {
// 433 ERR_NICKNAMEINUSE
nickname += '_'
irc.nick(nickname)
- self.onUsernameTaken();
+ irc.join(CHANNEL)
}
+}
irc.onresponse = function(command) {
|
fixed parsing error in chat demo; actually join channel when nickname was taken
|
diff --git a/go/teams/delete_test.go b/go/teams/delete_test.go
index <HASH>..<HASH> 100644
--- a/go/teams/delete_test.go
+++ b/go/teams/delete_test.go
@@ -23,7 +23,7 @@ func TestDeleteRoot(t *testing.T) {
_, err := GetTeamByNameForTest(context.Background(), tc.G, teamname, false, false)
require.Error(t, err, "no error getting deleted team")
- require.IsType(t, TeamDoesNotExistError{}, err)
+ require.True(t, IsTeamReadError(err))
}
func TestDeleteSubteamAdmin(t *testing.T) {
|
Fix teams test (#<I>)
|
diff --git a/salt/output/highstate.py b/salt/output/highstate.py
index <HASH>..<HASH> 100644
--- a/salt/output/highstate.py
+++ b/salt/output/highstate.py
@@ -146,8 +146,8 @@ def output(data):
# Append result counts to end of output
colorfmt = '{0}{1}{2[ENDC]}'
rlabel = {True: 'Succeeded', False: 'Failed', None: 'Not Run'}
- count_max_len = max([len(str(x)) for x in rcounts.values()])
- label_max_len = max([len(x) for x in rlabel.values()])
+ count_max_len = max([len(str(x)) for x in rcounts.values()] or [0])
+ label_max_len = max([len(x) for x in rlabel.values()] or [0])
line_max_len = label_max_len + count_max_len + 2 # +2 for ': '
hstrs.append(
colorfmt.format(
|
Don't fail if there's nothing to feed to `max()`.
|
diff --git a/containers.go b/containers.go
index <HASH>..<HASH> 100644
--- a/containers.go
+++ b/containers.go
@@ -15,7 +15,14 @@ func getContainers(config string) Containers {
if len(config) > 0 {
return unmarshal([]byte(config))
}
- return readCranefile("Cranefile")
+ if _, err := os.Stat("crane.json"); err == nil {
+ return readCranefile("crane.json")
+ }
+ if _, err := os.Stat("Cranefile"); err == nil {
+ printNotice("Using a Cranefile is deprecated. Please use crane.json instead.\n")
+ return readCranefile("Cranefile")
+ }
+ panic("No crane.json found!")
}
func readCranefile(filename string) Containers {
|
Use crane.json going forward and deprecate Cranefile usage
Closes #4.
|
diff --git a/lib/bibformat_migration_kit.py b/lib/bibformat_migration_kit.py
index <HASH>..<HASH> 100644
--- a/lib/bibformat_migration_kit.py
+++ b/lib/bibformat_migration_kit.py
@@ -130,9 +130,9 @@ def migrate_behaviours():
# The conditions on which we will iterate will maybe need to be split
# in many conditions, as the new format does not support conditions with
# multiple arguments
+ add_default_case = True
for cond in behaviour_conditions:
previous_tag = ""
- add_default_case = True
evaluation_order = cond[0]
e_conditions = extract_cond(cond[1])
|
Fixed add_default_case variable initialization location, thanks to
Ferran Jorba.
|
diff --git a/src/main/java/com/googlecode/rocoto/simpleconfig/DefaultPropertiesReader.java b/src/main/java/com/googlecode/rocoto/simpleconfig/DefaultPropertiesReader.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/googlecode/rocoto/simpleconfig/DefaultPropertiesReader.java
+++ b/src/main/java/com/googlecode/rocoto/simpleconfig/DefaultPropertiesReader.java
@@ -30,6 +30,7 @@ import java.util.Properties;
*
* @author Simone Tripodi
* @version $Id$
+ * @since 3.2
*/
final class DefaultPropertiesReader implements PropertiesReader {
|
added missing @since javadoc tag
|
diff --git a/apis/connection.js b/apis/connection.js
index <HASH>..<HASH> 100644
--- a/apis/connection.js
+++ b/apis/connection.js
@@ -15,6 +15,9 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+var MIN_MODBUSRTU_FRAMESZ = 5;
+var MIN_MODBUSASCII_FRAMESZ = 11;
+
/**
* Adds connection shorthand API to a Modbus objext
*
@@ -65,6 +68,8 @@ var addConnctionAPI = function(Modbus) {
}
// disable auto open, as we handle the open
options.autoOpen = false;
+ // set vmin to smallest modbus packet size
+ options.platformOptions = { vmin: MIN_MODBUSRTU_FRAMESZ, vtime: 0 };
// create the SerialPort
var SerialPort = require("serialport");
@@ -196,6 +201,8 @@ var addConnctionAPI = function(Modbus) {
next = options;
options = {};
}
+ // set vmin to smallest modbus packet size
+ options.platformOptions = { vmin: MIN_MODBUSASCII_FRAMESZ, vtime: 0 };
// create the ASCII SerialPort
var SerialPortAscii = require("../ports/asciiport");
|
added vmin support for ascii and RTU
|
diff --git a/lib/listen/change.rb b/lib/listen/change.rb
index <HASH>..<HASH> 100644
--- a/lib/listen/change.rb
+++ b/lib/listen/change.rb
@@ -17,14 +17,23 @@ module Listen
unless cookie
# TODO: remove silencing here (it's done later)
- return if _silencer.silenced?(path, options[:type])
+ if _silencer.silenced?(path, options[:type])
+ _log :debug, "(silenced): #{path.inspect}"
+ return
+ end
end
+ _log :debug, "got change: #{[path, options].inspect}"
+
if change
_notify_listener(change, path, cookie ? { cookie: cookie } : {})
else
send("_#{options[:type].downcase}_change", path, options)
end
+ rescue
+ _log :error, '................CHANGE CRASHED.................'
+ STDERR.puts ".. #{$!.inspect}:#{[email protected]("\n")}"
+ raise
end
private
@@ -47,5 +56,9 @@ module Listen
def _silencer
listener.registry[:silencer]
end
+
+ def _log(type, message)
+ Celluloid.logger.send(type, message)
+ end
end
end
|
add extra debugging (Change)
|
diff --git a/lib/camel_patrol/middleware.rb b/lib/camel_patrol/middleware.rb
index <HASH>..<HASH> 100644
--- a/lib/camel_patrol/middleware.rb
+++ b/lib/camel_patrol/middleware.rb
@@ -17,14 +17,17 @@ module CamelPatrol
def underscore_params(env)
if ::Rails::VERSION::MAJOR < 5
env["action_dispatch.request.request_parameters"].deep_transform_keys!(&:underscore)
- else
- request_body = JSON.parse(env["rack.input"].read)
- request_body.deep_transform_keys!(&:underscore)
- req = StringIO.new(request_body.to_json)
+ return
+ end
- env["rack.input"] = req
- env["CONTENT_LENGTH"] = req.length
+ if !(request_body = safe_json_parse(env["rack.input"].read))
+ return
end
+
+ request_body.deep_transform_keys!(&:underscore)
+ req = StringIO.new(request_body.to_json)
+ env["rack.input"] = req
+ env["CONTENT_LENGTH"] = req.length
end
def camelize_response(response)
|
Abort translation on parse errors
For requests, we should abort translating key format if a parsing error
occurs due to invalid json. Let the request continue untouched, similar
to the scenario when content-type header is missing
It shouldn't be this middleware's responcibility to deal with invalid
json. The app server can handle these scenarios on a case by case basis
<URL>
|
diff --git a/Factory/MailMotorFactory.php b/Factory/MailMotorFactory.php
index <HASH>..<HASH> 100644
--- a/Factory/MailMotorFactory.php
+++ b/Factory/MailMotorFactory.php
@@ -15,12 +15,12 @@ class MailMotorFactory
/** @var Container */
protected $container;
- /** @var string */
+ /** @var string|null */
protected $mailEngine;
public function __construct(
Container $container,
- string $mailEngine
+ ?string $mailEngine
) {
$this->container = $container;
$this->setMailEngine($mailEngine);
@@ -31,7 +31,7 @@ class MailMotorFactory
return $this->container->get('mailmotor.' . $this->mailEngine . '.subscriber.gateway');
}
- protected function setMailEngine(string $mailEngine): void
+ protected function setMailEngine(?string $mailEngine): void
{
if ($mailEngine == null) {
$mailEngine = 'not_implemented';
|
Fix error when the mail engine is not set
|
diff --git a/lib/Doctrine/DBAL/Statement.php b/lib/Doctrine/DBAL/Statement.php
index <HASH>..<HASH> 100644
--- a/lib/Doctrine/DBAL/Statement.php
+++ b/lib/Doctrine/DBAL/Statement.php
@@ -129,7 +129,7 @@ class Statement implements \IteratorAggregate, DriverStatement
*/
public function execute($params = null)
{
- if(is_array($params)) {
+ if (is_array($params)) {
$this->params = $params;
}
|
fixed missing space between if and open parenthesis
|
diff --git a/src/extract_slides.js b/src/extract_slides.js
index <HASH>..<HASH> 100644
--- a/src/extract_slides.js
+++ b/src/extract_slides.js
@@ -266,13 +266,13 @@ inlineTokenRules['paragraph_close'] = function(token, env) {
inlineTokenRules['fence'] = function(token, env) {
- startStyle({fontFamily: 'Courier New, monospace'}, env);
- if(token.info) {
- const htmlTokens = low.highlight(token.info, token.content);
+ startStyle({fontFamily: 'Courier New'}, env);
+ const language = token.info ? token.info.trim() : undefined;
+ if(language) {
+ const htmlTokens = low.highlight(language, token.content);
for(let token of htmlTokens.value) {
processHtmlToken(token, env);
}
-
} else {
// For code blocks, replace line feeds with vertical tabs to keep
// the block as a single paragraph. This avoid the extra vertical
|
Fix font family for code blocks, trim language to avoid invalid language errors when trailing whitespace present
|
diff --git a/salt/modules/boto_cloudtrail.py b/salt/modules/boto_cloudtrail.py
index <HASH>..<HASH> 100644
--- a/salt/modules/boto_cloudtrail.py
+++ b/salt/modules/boto_cloudtrail.py
@@ -488,7 +488,8 @@ def list_tags(Name,
try:
conn = _get_conn(region=region, key=key, keyid=keyid, profile=profile)
rid = _get_trail_arn(Name,
- region=None, key=None, keyid=None, profile=None)
+ region=region, key=key, keyid=keyid,
+ profile=profile)
ret = conn.list_tags(ResourceIdList=[rid])
tlist = ret.get('ResourceTagList', []).pop().get('TagsList')
tagdict = {}
|
Fix cut-and-paste error or whatever it was
|
diff --git a/pkg/maps/ctmap/ctmap.go b/pkg/maps/ctmap/ctmap.go
index <HASH>..<HASH> 100644
--- a/pkg/maps/ctmap/ctmap.go
+++ b/pkg/maps/ctmap/ctmap.go
@@ -393,7 +393,7 @@ func DeleteIfUpgradeNeeded(e CtEndpoint) {
continue
}
if oldMap.CheckAndUpgrade(&newMap.Map.MapInfo) {
- scopedLog.Info("CT Map upgraded, expect brief disruption of ongoing connections")
+ scopedLog.Warning("CT Map upgraded, expect brief disruption of ongoing connections")
}
oldMap.Close()
}
|
ctmap: Warn if CT map was upgraded as it results in disruption
Related: #<I>
|
diff --git a/test/db/mysql/simple_test.rb b/test/db/mysql/simple_test.rb
index <HASH>..<HASH> 100644
--- a/test/db/mysql/simple_test.rb
+++ b/test/db/mysql/simple_test.rb
@@ -136,15 +136,15 @@ class MySQLSimpleTest < Test::Unit::TestCase
t.integer :value
end
connection.create_table :bs do |t|
- t.references :b, index: true
+ t.references :a, :index => true, :foreign_key => false
end
- assert_nothing_raised do
- connection.add_foreign_key :bs, :as
- end
+ #assert_nothing_raised do
+ connection.add_foreign_key :bs, :as
+ #end
- connection.drop_table :as rescue nil
- connection.drop_table :bs rescue nil
+ connection.drop_table :bs
+ connection.drop_table :as
end if ar_version("4.2")
def test_find_in_other_schema_with_include
|
adjust foreign key test introduced in #<I> (was failing with MRI under AR <I>)
|
diff --git a/src/littleparsers.js b/src/littleparsers.js
index <HASH>..<HASH> 100644
--- a/src/littleparsers.js
+++ b/src/littleparsers.js
@@ -173,8 +173,9 @@
LittleParsers.prototype.variable = function () {
var _this = this;
return this.cacheDo("variable", function () {
- var v = _this.regex(/^[a-zA-Z_$][a-zA-Z0-9_$]*/);
+ var v = _this.regex(/^[a-zA-Z_$@][a-zA-Z0-9_$]*/);
if (v === 'self') return 'this';
+ if (v[0] === '@') return 'this.'+v.substring(1); //@foo -> this.foo
return v;
});
};
|
"@foo" compiles into "this.foo"
|
diff --git a/lib/MwbExporter/Formatter/Doctrine2/Annotation/Model/Table.php b/lib/MwbExporter/Formatter/Doctrine2/Annotation/Model/Table.php
index <HASH>..<HASH> 100644
--- a/lib/MwbExporter/Formatter/Doctrine2/Annotation/Model/Table.php
+++ b/lib/MwbExporter/Formatter/Doctrine2/Annotation/Model/Table.php
@@ -205,7 +205,7 @@ class Table extends BaseTable
public function writeTable(WriterInterface $writer)
{
- if (!$this->isExternal() && !$this->isManyToMany()) {
+ if (!$this->isExternal()) {
$namespace = $this->getEntityNamespace();
if ($repositoryNamespace = $this->getDocument()->getConfig()->get(Formatter::CFG_REPOSITORY_NAMESPACE)) {
$repositoryNamespace .= '\\';
@@ -251,15 +251,9 @@ class Table extends BaseTable
;
return self::WRITE_OK;
- } else {
- switch (true) {
- case $this->isManyToMany():
- return self::WRITE_M2M;
-
- case $this->isExternal():
- return self::WRITE_EXTERNAL;
- }
}
+
+ return self::WRITE_EXTERNAL;
}
public function writeUsedClasses(WriterInterface $writer)
|
Doctrine Annotation: always generate M2M table entity.
|
diff --git a/etrago/appl.py b/etrago/appl.py
index <HASH>..<HASH> 100644
--- a/etrago/appl.py
+++ b/etrago/appl.py
@@ -154,6 +154,7 @@ def etrago(args):
minimize_loading : bool
False,
+ ...
k_mean_clustering : bool
False,
|
changed RTD see #<I>
|
diff --git a/network.js b/network.js
index <HASH>..<HASH> 100644
--- a/network.js
+++ b/network.js
@@ -2702,14 +2702,16 @@ function startAcceptingConnections(){
}
var bStatsCheckUnderWay = true;
db.query(
- "SELECT \n\
+ /* "SELECT \n\
SUM(CASE WHEN event='invalid' THEN 1 ELSE 0 END) AS count_invalid, \n\
SUM(CASE WHEN event='new_good' THEN 1 ELSE 0 END) AS count_new_good \n\
- FROM peer_events WHERE peer_host=? AND event_date>"+db.addTime("-1 HOUR"), [ws.host],
+ FROM peer_events WHERE peer_host=? AND event_date>"+db.addTime("-1 HOUR"),*/
+ "SELECT 1 FROM peer_events WHERE peer_host=? AND event_date>"+db.addTime("-1 HOUR")+" AND event='invalid' LIMIT 1",
+ [ws.host],
function(rows){
bStatsCheckUnderWay = false;
- var stats = rows[0];
- if (stats.count_invalid){
+ // var stats = rows[0];
+ if (rows.length > 0){
console.log("rejecting new client "+ws.host+" because of bad stats");
return ws.terminate();
}
|
faster check of stats of incoming peer
|
diff --git a/c7n/mu.py b/c7n/mu.py
index <HASH>..<HASH> 100644
--- a/c7n/mu.py
+++ b/c7n/mu.py
@@ -1237,7 +1237,14 @@ class ConfigRule(object):
if isinstance(func, PolicyLambda):
manager = func.policy.get_resource_manager()
- config_type = manager.get_model().config_type
+ if hasattr(manager.get_model(), 'config_type'):
+ config_type = manager.get_model().config_type
+ else:
+ raise Exception("You may have attempted to deploy a config "
+ "based lambda function with an unsupported config type. "
+ "The most recent AWS config types are here: http://docs.aws"
+ ".amazon.com/config/latest/developerguide/resource"
+ "-config-reference.html.")
params['Scope'] = {
'ComplianceResourceTypes': [config_type]}
else:
|
mu - runtime validate aws config support for resource type before provisioning (#<I>)
|
diff --git a/lib/hb-helpers.js b/lib/hb-helpers.js
index <HASH>..<HASH> 100644
--- a/lib/hb-helpers.js
+++ b/lib/hb-helpers.js
@@ -132,7 +132,9 @@ module.exports.registerHelpers = function registerHelpers() {
if (Array.isArray(run))
return run[0][whichView].images.waterfall;
else
- return run[whichView].images.waterfall;
+ if (run)
+ return run[whichView].images.waterfall;
+ else return;
});
|
don't break if we don't have any runs
|
diff --git a/org.jenetics/src/main/java/org/jenetics/internal/util/Args.java b/org.jenetics/src/main/java/org/jenetics/internal/util/Args.java
index <HASH>..<HASH> 100644
--- a/org.jenetics/src/main/java/org/jenetics/internal/util/Args.java
+++ b/org.jenetics/src/main/java/org/jenetics/internal/util/Args.java
@@ -86,7 +86,7 @@ public class Args {
*/
public Optional<Double> doubleArg(final String name) {
return arg(name)
- .flatMap(s -> parse(s, Double::new));
+ .flatMap(s -> parse(s, Double::valueOf));
}
private static <T> Optional<T> parse(
|
#<I>: Constructor 'Double(String)' has been deprecated in Java 9.
Using 'Double.valueOf' instead.
|
diff --git a/src/javascript/image/Image.js b/src/javascript/image/Image.js
index <HASH>..<HASH> 100644
--- a/src/javascript/image/Image.js
+++ b/src/javascript/image/Image.js
@@ -481,7 +481,7 @@ define("moxie/image/Image", [
}
if (Env.can('use_data_uri_of', dataUrl.length)) {
- el.innerHTML = '<img src="' + dataUrl + '" width="' + img.width + '" height="' + img.height + '" />';
+ el.innerHTML = '<img src="' + dataUrl + '" width="' + img.width + '" height="' + img.height + '" alt="" />';
img.destroy();
self.trigger('embedded');
} else {
|
Image: fulfill basic xhtml requirement for img tag
|
diff --git a/js/bitstamp.js b/js/bitstamp.js
index <HASH>..<HASH> 100644
--- a/js/bitstamp.js
+++ b/js/bitstamp.js
@@ -840,14 +840,15 @@ module.exports = class bitstamp extends Exchange {
feeCurrency = market['quote'];
symbol = market['symbol'];
}
- let timestamp = this.safeString2 (trade, 'date', 'datetime');
- if (timestamp !== undefined) {
- if (timestamp.indexOf (' ') >= 0) {
+ const datetimeString = this.safeString2 (trade, 'date', 'datetime');
+ let timestamp = undefined;
+ if (datetimeString !== undefined) {
+ if (datetimeString.indexOf (' ') >= 0) {
// iso8601
- timestamp = this.parse8601 (timestamp);
+ timestamp = this.parse8601 (datetimeString);
} else {
// string unix epoch in seconds
- timestamp = parseInt (timestamp);
+ timestamp = parseInt (datetimeString);
timestamp = timestamp * 1000;
}
}
|
btistamp parseTrade timestamp minor edits
|
diff --git a/scripts/sass-render/index.js b/scripts/sass-render/index.js
index <HASH>..<HASH> 100644
--- a/scripts/sass-render/index.js
+++ b/scripts/sass-render/index.js
@@ -37,7 +37,13 @@ async function sassToCss(sassFile) {
},
outputStyle: 'compressed',
});
- return result.css.toString();
+
+ // Strip any Byte Order Marking from output CSS
+ let cssStr = result.css.toString();
+ if (cssStr.charCodeAt(0) === 0xFEFF) {
+ cssStr = cssStr.substr(1);
+ }
+ return cssStr;
}
async function sassRender(sourceFile, templateFile, outputFile) {
|
fix(select): Strip byte order mark in CSS compilation
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -126,7 +126,7 @@ build.sub_commands.insert(0, ('build_proto', None))
INSTALL_REQUIRES = [
'contextlib2>=0.5.1,<1.0',
- 'enum34>=1.1.2,<2.0',
+ 'enum34>=1.1.2,<2.0;python_version<"3.4"',
'future>=0.16.0',
'mutablerecords>=0.4.1,<2.0',
'oauth2client>=1.5.2,<2.0',
|
install enum<I> for certain python version (#<I>)
|
diff --git a/lib/AssetGraph.js b/lib/AssetGraph.js
index <HASH>..<HASH> 100644
--- a/lib/AssetGraph.js
+++ b/lib/AssetGraph.js
@@ -406,10 +406,10 @@ AssetGraph.prototype = {
var nextTransform = transforms[nextStepNo],
startTime = new Date();
nextStepNo += 1;
- nextTransform(that, function () {
+ nextTransform(that, error.logAndExit(function () {
// console.log(nextTransform.name + ': ' + (new Date() - startTime));
executeNextStep();
- });
+ }));
}
}
executeNextStep();
|
AssetGraph.transform: Report and die if an error occurs during a transformation.
|
diff --git a/ovirtlago/virt.py b/ovirtlago/virt.py
index <HASH>..<HASH> 100644
--- a/ovirtlago/virt.py
+++ b/ovirtlago/virt.py
@@ -22,6 +22,7 @@ import warnings
import ovirtsdk.api
import lago
+import lago.config
import lago.vm
from ovirtsdk.infrastructure.errors import (RequestError, ConnectionError)
@@ -45,6 +46,8 @@ class OvirtVirtEnv(lago.virt.VirtEnv):
'ovirt-host'
)
provider_name = 'ovirt-' + role
+ else:
+ provider_name = lago.config.get('default_vm_provider', 'default')
if provider_name == 'ovirt-engine':
if self._engine_vm is not None:
|
ovirtlago: use the vm-provider if it's there
Change-Id: Ic<I>b<I>d<I>ab<I>f<I>fb<I>a<I>f<I>cd
|
diff --git a/src/js/utils.js b/src/js/utils.js
index <HASH>..<HASH> 100644
--- a/src/js/utils.js
+++ b/src/js/utils.js
@@ -79,8 +79,18 @@ fbUtils.attrString = function(attrs) {
*/
fbUtils.safeAttr = function(name, value) {
name = fbUtils.safeAttrName(name);
+ let valString;
- let valString = fbUtils.escapeAttr(value);
+ if (value) {
+ if (Array.isArray(value)) {
+ valString = fbUtils.escapeAttr(value.join(' '))
+ } else {
+ if (typeof(value) === 'boolean') {
+ value = value.toString();
+ }
+ valString = fbUtils.escapeAttr(value.replace(',', ' ').trim());
+ }
+ }
value = value ? `="${valString}"` : '';
return {
|
Hotfix: typeUserEvents, attribute array converted to comma separated list (#<I>)
|
diff --git a/padaos.py b/padaos.py
index <HASH>..<HASH> 100644
--- a/padaos.py
+++ b/padaos.py
@@ -61,7 +61,7 @@ class IntentContainer:
(r'(\\[^\w ])', r'\1?'),
# === Force 1+ Space Between Words ===
- (r'(?<=\w)(\\\s|\s)+(?=\w)', r'\\W+'),
+ (r'(?<=\w)(\\\s|\s)+', r'\\W+'),
# === Force 0+ Space Between Everything Else ===
(r'\s+', r'\\W*'),
@@ -121,6 +121,7 @@ class IntentContainer:
}
def calc_intents(self, query):
+ query = ' ' + query + ' '
if self.must_compile:
self.compile()
for intent_name, regexes in self.intents.items():
|
Fix words not requiring any space in between
|
diff --git a/spillway/renderers.py b/spillway/renderers.py
index <HASH>..<HASH> 100644
--- a/spillway/renderers.py
+++ b/spillway/renderers.py
@@ -227,10 +227,12 @@ class MapnikRenderer(BaseRenderer):
object.draw(self.map)
except AttributeError:
pass
- bbox = renderer_context.get('bbox')
+ bbox = renderer_context.get('bbox') if renderer_context else None
if bbox:
bbox.transform(self.map.srs)
self.map.zoom_to_box(mapnik.Box2d(*bbox.extent))
+ else:
+ self.map.zoom_all()
img = mapnik.Image(self.map.width, self.map.height)
mapnik.render(self.map, img)
return img.tostring(self.format)
|
Zoom to all layers without a bbox present
|
diff --git a/gbdxtools/s3.py b/gbdxtools/s3.py
index <HASH>..<HASH> 100644
--- a/gbdxtools/s3.py
+++ b/gbdxtools/s3.py
@@ -87,7 +87,10 @@ class S3(object):
location = location.strip('/')
self.logger.debug('Downloading contents')
- for s3key in s3conn.list_objects(Bucket=bucket, Prefix=(prefix+'/'+location))['Contents']:
+ objects = s3conn.list_objects(Bucket=bucket, Prefix=(prefix+'/'+location))
+ if 'Contents' not in objects:
+ raise ValueError('Download target {}/{}/{} was not found.'.format(bucket, prefix, location))
+ for s3key in objects['Contents']:
key = s3key['Key']
# skip directory keys
|
Check to make sure the download target exists
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@ setup(
version='0.3.7',
description='Blanc Basic Pages for Django',
long_description=readme,
- url='https://github.com/blancltd/blanc-basic-pages',
+ url='https://github.com/developersociety/blanc-basic-pages',
maintainer='Blanc Ltd',
maintainer_email='[email protected]',
platforms=['any'],
|
Update GitHub repos from blancltd to developersociety
|
diff --git a/sc2gameLobby/ipAddresses.py b/sc2gameLobby/ipAddresses.py
index <HASH>..<HASH> 100644
--- a/sc2gameLobby/ipAddresses.py
+++ b/sc2gameLobby/ipAddresses.py
@@ -53,7 +53,7 @@ def getPublicIPaddress(timeout=c.DEFAULT_TIMEOUT):
"""visible on public internet"""
start = time.time()
my_public_ip = None
- e = None
+ e = Exception
while my_public_ip == None:
if time.time() - start > timeout:
break
|
- added robustness in case a connection to the internet is lost.
|
diff --git a/bungiesearch/managers.py b/bungiesearch/managers.py
index <HASH>..<HASH> 100644
--- a/bungiesearch/managers.py
+++ b/bungiesearch/managers.py
@@ -25,8 +25,12 @@ class BungiesearchManager(Manager):
from bungiesearch import Bungiesearch
return Bungiesearch(raw_results=True).index(index).doc_type(doc_type)
- def __init__(self, **kwargs):
- super(BungiesearchManager, self).__init__(**kwargs)
+ def contribute_to_class(self, cls, name):
+ '''
+ Sets up the signal processor. Since self.model is not available
+ in the constructor, we perform this operation here.
+ '''
+ super(BungiesearchManager, self).contribute_to_class(cls, name)
from . import Bungiesearch
from .signals import get_signal_processor
|
Add contribute_to_class in place of __init__ in manage.py
|
diff --git a/ruby/server/lib/roma/command/mh_command_receiver.rb b/ruby/server/lib/roma/command/mh_command_receiver.rb
index <HASH>..<HASH> 100644
--- a/ruby/server/lib/roma/command/mh_command_receiver.rb
+++ b/ruby/server/lib/roma/command/mh_command_receiver.rb
@@ -48,7 +48,7 @@ module Roma
return "SERVER_ERROR #{hname} already exists."
end
st = Roma::Config::STORAGE_CLASS.new
- st.storage_path = "#{@stats.ap_str}/#{hname}"
+ st.storage_path = "#{Roma::Config::STORAGE_PATH}/#{@stats.ap_str}/#{hname}"
st.vn_list = @rttable.vnodes
st.divnum = Roma::Config::STORAGE_DIVNUM
st.option = Roma::Config::STORAGE_OPTION
@@ -91,7 +91,7 @@ module Roma
st = @storages[hname]
@storages.delete(hname)
st.closedb
- rm_rf("#{@stats.ap_str}/#{hname}")
+ rm_rf("#{Roma::Config::STORAGE_PATH}/#{@stats.ap_str}/#{hname}")
@log.info("deletehash #{hname}")
return "DELETED"
rescue =>e
|
bugfix:multihash concerning the file path was corrected.
|
diff --git a/teams/admin.py b/teams/admin.py
index <HASH>..<HASH> 100644
--- a/teams/admin.py
+++ b/teams/admin.py
@@ -5,14 +5,30 @@ import reversion
from .models import Team, Membership
+def members_count(obj):
+ return obj.memberships.count()
+members_count.short_description = "Members Count"
+
+
admin.site.register(
Team,
- list_display=["name", "member_access", "manager_access", "creator"],
+ list_display=["name", "member_access", "manager_access", members_count, "creator"],
+ fields=[
+ "name",
+ "slug",
+ "avatar",
+ "description",
+ "member_access",
+ "manager_access",
+ "creator"
+ ],
prepopulated_fields={"slug": ("name",)},
+ raw_id_fields=["creator"]
)
class MembershipAdmin(reversion.VersionAdmin):
+ raw_id_fields = ["user"]
list_display = ["team", "user", "state", "role"]
list_filter = ["team"]
search_fields = ["user__username"]
|
Fix up admin to be a bit more useful
|
diff --git a/translation_server/admin.py b/translation_server/admin.py
index <HASH>..<HASH> 100644
--- a/translation_server/admin.py
+++ b/translation_server/admin.py
@@ -37,7 +37,11 @@ class CustomModelAdminMixin(object):
@admin.register(TranslationType)
class TranslationTypeAdmin(CustomModelAdminMixin, TabbedTranslationAdmin):
- pass
+ def get_queryset(self, request):
+ qs = super(TranslationTypeAdmin, self).get_queryset(request)
+ if request.user.is_superuser:
+ return qs
+ return qs.exclude(tag__startswith='DTS')
@admin.register(Translation)
@@ -63,3 +67,9 @@ class TranslationAdmin(CustomModelAdminMixin, TabbedTranslationAdmin):
js_dir + '/admin-translation.js',
)
+ def get_queryset(self, request):
+ qs = super(TranslationAdmin, self).get_queryset(request)
+ # if request.user.is_superuser:
+ # return qs
+ return qs.exclude(tag__startswith='DTS')
+
|
Removed "DTS" translations and translation tags from admin
|
diff --git a/src/sap.ui.integration/src/sap/ui/integration/util/ManifestResolver.js b/src/sap.ui.integration/src/sap/ui/integration/util/ManifestResolver.js
index <HASH>..<HASH> 100644
--- a/src/sap.ui.integration/src/sap/ui/integration/util/ManifestResolver.js
+++ b/src/sap.ui.integration/src/sap/ui/integration/util/ManifestResolver.js
@@ -91,7 +91,6 @@ sap.ui.define([
Utils.setNestedPropertyValue(oManifest, sManifestPath, oSubConfig);
});
- oCard.destroy();
return JSON.stringify(oManifest);
};
|
[INTERNAL] Integration Cards: Do not destroy card during manifest resolving
- card shouldn't be destroyed during manifest resolving
since it must be destroyed by the one who created it
Change-Id: I3a3f<I>f2db<I>ac<I>f<I>bf<I>d<I>f0
|
diff --git a/Kwf/Model/Proxy/Rowset.php b/Kwf/Model/Proxy/Rowset.php
index <HASH>..<HASH> 100644
--- a/Kwf/Model/Proxy/Rowset.php
+++ b/Kwf/Model/Proxy/Rowset.php
@@ -48,6 +48,7 @@ class Kwf_Model_Proxy_Rowset implements Kwf_Model_Rowset_Interface
{
return $this->_rowset->count();
}
+
public function seek($position)
{
$this->_rowset->seek($position);
@@ -61,7 +62,8 @@ class Kwf_Model_Proxy_Rowset implements Kwf_Model_Rowset_Interface
public function offsetGet($offset)
{
- return $this->_rowset->offsetGet($offset);
+ $row = $this->_rowset->offsetGet($offset);
+ return $this->_model->getRowByProxiedRow($row);
}
public function offsetSet($offset, $value)
|
Fix problem with index-access to specific row in rowset
If accessing a row via index it didn't returned the proxied row
resulting in missing expected functionality.
|
diff --git a/server_test.go b/server_test.go
index <HASH>..<HASH> 100644
--- a/server_test.go
+++ b/server_test.go
@@ -107,6 +107,7 @@ func generateConfig(forwardAddr string) Config {
TraceAddress: fmt.Sprintf("127.0.0.1:%d", tracePort),
TraceAPIAddress: forwardAddr,
TraceMaxLengthBytes: 4096,
+ SsfBufferSize: 32,
}
}
|
Set SsfBufferSize to <I> in tests
|
diff --git a/sdl/render.go b/sdl/render.go
index <HASH>..<HASH> 100644
--- a/sdl/render.go
+++ b/sdl/render.go
@@ -191,6 +191,9 @@ static int SDLCALL SDL_GetTextureScaleMode(SDL_Texture * texture, SDL_ScaleMode
}
static int SDL_LockTextureToSurface(SDL_Texture *texture, const SDL_Rect *rect, SDL_Surface **surface)
+{
+ return -1;
+}
#endif
|
sdl/render: fix broken build on older SDL2
|
diff --git a/datajoint/schema.py b/datajoint/schema.py
index <HASH>..<HASH> 100644
--- a/datajoint/schema.py
+++ b/datajoint/schema.py
@@ -193,7 +193,7 @@ class Schema:
# add table definition to the doc string
if isinstance(table_class.definition, str):
- table_class.__doc__ = ((table_class.__doc__ or "") + "\n\nTable definition:\n"
+ table_class.__doc__ = ((table_class.__doc__ or "") + "\nTable definition:\n\n"
+ table_class.describe(printout=False, context=context))
# fill values in Lookup tables from their contents property
|
minor improvement in display of table doc strings
|
diff --git a/FlowCal/mef.py b/FlowCal/mef.py
index <HASH>..<HASH> 100644
--- a/FlowCal/mef.py
+++ b/FlowCal/mef.py
@@ -333,9 +333,9 @@ def fit_beads_autofluorescence(fl_rfi, fl_mef):
-----
The following model is used to describe bead fluorescence::
- m*log(fl_mef[i]) + b = log(fl_mef_auto + fl_mef[i])
+ m*log(fl_rfi[i]) + b = log(fl_mef_auto + fl_mef[i])
- where ``fl_mef[i]`` is the fluorescence of bead subpopulation ``i`` in
+ where ``fl_rfi[i]`` is the fluorescence of bead subpopulation ``i`` in
RFI units and ``fl_mef[i]`` is the corresponding fluorescence in MEF
units. The model includes 3 parameters: ``m`` (slope), ``b``
(intercept), and ``fl_mef_auto`` (bead autofluorescence). The last term
|
Corrected typo in mef.fit_beads_autofluorescence's docstring.
|
diff --git a/src/gl/texture.js b/src/gl/texture.js
index <HASH>..<HASH> 100644
--- a/src/gl/texture.js
+++ b/src/gl/texture.js
@@ -137,7 +137,19 @@ export default class Texture {
let image = new Image();
image.onload = () => {
try {
- this.setElement(image, options);
+ // For data URL images, first draw the image to a separate canvas element. Workaround for
+ // obscure bug seen with small (<28px) SVG images encoded as data URLs in Chrome and Safari.
+ if (this.url.slice(0, 5) === 'data:') {
+ const canvas = document.createElement('canvas');
+ const ctx = canvas.getContext('2d');
+ canvas.width = image.width;
+ canvas.height = image.height;
+ ctx.drawImage(image, 0, 0);
+ this.setElement(canvas, options);
+ }
+ else {
+ this.setElement(image, options);
+ }
}
catch (e) {
this.loaded = false;
|
workaround for obscure bug seen with small (<<I>px) SVG images encoded as data URLs in Chrome and Safari
|
diff --git a/can/io/sqlite.py b/can/io/sqlite.py
index <HASH>..<HASH> 100644
--- a/can/io/sqlite.py
+++ b/can/io/sqlite.py
@@ -25,7 +25,7 @@ if sys.version_info > (3,):
buffer = memoryview
-@deprecated(version='2.1', reason="Use the name SqliteReader instead")
+@deprecated(reason="Use the name SqliteReader instead. (Replaced in v2.1)")
class SqlReader:
"""
Reads recorded CAN messages from a simple SQL database.
|
removed the version attribute from the deprecated decorator
|
diff --git a/lib/mangopay/client.rb b/lib/mangopay/client.rb
index <HASH>..<HASH> 100644
--- a/lib/mangopay/client.rb
+++ b/lib/mangopay/client.rb
@@ -1,5 +1,17 @@
module MangoPay
class Client < Resource
- include MangoPay::HTTPCalls::Create
+ def self.create(params)
+ uri = URI(MangoPay.configuration.root_url + '/api/clients/')
+ res = Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
+ puts uri.request_uri
+ request = Net::HTTP::Post.new(uri.request_uri, {
+ 'user_agent' => "MangoPay V1 RubyBindings/#{MangoPay::VERSION}",
+ 'Content-Type' => 'application/json'
+ })
+ request.body = MangoPay::JSON.dump(params)
+ http.request request
+ end
+ MangoPay::JSON.load(res.body)
+ end
end
end
|
Now use an outside method to create the client account
|
diff --git a/demo/app.js b/demo/app.js
index <HASH>..<HASH> 100644
--- a/demo/app.js
+++ b/demo/app.js
@@ -46,7 +46,7 @@ Abba.InputsView.prototype = {
return {
label: $row.find('.label-input').val(),
numSuccesses: parseInt($row.find('.num-successes-input').val()),
- numSamples: parseInt($row.find('.num-samples-input').val()),
+ numSamples: parseInt($row.find('.num-samples-input').val())
};
},
@@ -154,7 +154,7 @@ Abba.Presenter.prototype = {
var baseline = variations.shift();
return {
baseline: baseline,
- variations: variations,
+ variations: variations
};
},
@@ -188,4 +188,4 @@ Abba.Presenter.prototype = {
};
return Abba;
-}(Abba || {}, jQuery, Hash));
\ No newline at end of file
+}(Abba || {}, jQuery, Hash));
|
Fix some trailing commas for IE
|
diff --git a/salt/config.py b/salt/config.py
index <HASH>..<HASH> 100644
--- a/salt/config.py
+++ b/salt/config.py
@@ -61,6 +61,7 @@ VALID_OPTS = {
'master_sign_key_name': str,
'master_sign_pubkey': bool,
'verify_master_pubkey_sign': bool,
+ 'always_verify_signature': bool,
'master_pubkey_signature': str,
'master_use_pubkey_signature': bool,
'syndic_finger': str,
@@ -260,6 +261,7 @@ DEFAULT_MINION_OPTS = {
'master_shuffle': False,
'master_alive_interval': 0,
'verify_master_pubkey_sign': False,
+ 'always_verify_signature': False,
'master_sign_key_name': 'master_sign',
'syndic_finger': '',
'user': 'root',
|
add switch to always verify the masters pubkey
for the paranoid among us, this makes it possible to always verify
the masters auth-replies, even if the public key has not changed
|
diff --git a/drivers/overlay/overlay.go b/drivers/overlay/overlay.go
index <HASH>..<HASH> 100644
--- a/drivers/overlay/overlay.go
+++ b/drivers/overlay/overlay.go
@@ -620,7 +620,7 @@ func supportsOverlay(home string, homeMagic graphdriver.FsMagic, rootUID, rootGI
if len(flags) < unix.Getpagesize() {
err := unix.Mount("overlay", mergedDir, "overlay", 0, flags)
if err == nil {
- logrus.Errorf("overlay test mount with multiple lowers failed, but succeeded with a single lower")
+ logrus.StandardLogger().Logf(logLevel, "overlay test mount with multiple lowers failed, but succeeded with a single lower")
return supportsDType, errors.Wrap(graphdriver.ErrNotSupported, "kernel too old to provide multiple lowers feature for overlay")
}
logrus.Debugf("overlay test mount with a single lower failed %v", err)
|
Log expected rootless overlay mount failures as debug level
Most linux kernels do not support overlay mounts in rootless mode,
we should not be reporting this as an error, but drop it to debug
level.
Fixes: <URL>
|
diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/CachingHiveMetastore.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/CachingHiveMetastore.java
index <HASH>..<HASH> 100644
--- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/CachingHiveMetastore.java
+++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/metastore/CachingHiveMetastore.java
@@ -670,7 +670,11 @@ public class CachingHiveMetastore
HivePartitionName hivePartitionName = hivePartitionName(databaseName, tableName, partitionNameWithVersion.getPartitionName());
KeyAndContext<HivePartitionName> partitionNameKey = getCachingKey(metastoreContext, hivePartitionName);
Optional<Partition> partition = partitionCache.getIfPresent(partitionNameKey);
- if (partition != null && partition.isPresent()) {
+ if (partition == null || !partition.isPresent()) {
+ partitionCache.invalidate(partitionNameKey);
+ partitionStatisticsCache.invalidate(partitionNameKey);
+ }
+ else {
Optional<Long> partitionVersion = partition.get().getPartitionVersion();
if (!partitionVersion.isPresent() || !partitionVersion.equals(partitionNameWithVersion.getPartitionVersion())) {
partitionCache.invalidate(partitionNameKey);
|
Invalidate cache if partition is not present
Invalidating the partition cache if partition object is not present.
|
diff --git a/test/test_client.py b/test/test_client.py
index <HASH>..<HASH> 100644
--- a/test/test_client.py
+++ b/test/test_client.py
@@ -157,12 +157,6 @@ class TestClient(IntegrationTest, TestRequestMixin):
# No error.
connected(MongoClient())
- def assertIsInstance(self, obj, cls, msg=None):
- """Backport from Python 2.7."""
- if not isinstance(obj, cls):
- standardMsg = '%r is not an instance of %r' % (obj, cls)
- self.fail(self._formatMessage(msg, standardMsg))
-
def test_init_disconnected(self):
c = rs_or_single_client(connect=False)
|
Remove "assertIsInstance" backport.
No longer required since we use unittest2 on Python <I>, and the method is
in the standard library for Python <I>+.
|
diff --git a/test/glimpse/views/git_test.rb b/test/glimpse/views/git_test.rb
index <HASH>..<HASH> 100644
--- a/test/glimpse/views/git_test.rb
+++ b/test/glimpse/views/git_test.rb
@@ -1,13 +1,33 @@
require 'test_helper'
describe Glimpse::Views::Git do
- before do
- @git = Glimpse::Views::Git.new(:nwo => 'github/test', :sha => '123')
- end
-
describe "compare url" do
+ before do
+ @git = Glimpse::Views::Git.new(:nwo => 'github/test', :sha => '123')
+ end
+
it "should return the full url" do
assert_equal 'https://github.com/github/test/compare/master...123', @git.compare_url
end
end
+
+ describe "sha" do
+ before do
+ @git = Glimpse::Views::Git.new(:sha => '123')
+ end
+
+ it "should return correct sha" do
+ assert_equal '123', @git.sha
+ end
+ end
+
+ describe "branch name" do
+ before do
+ @git = Glimpse::Views::Git.new(:sha => '123', :branch_name => 'glimpse')
+ end
+
+ it "should return correct branch name" do
+ assert_equal 'glimpse', @git.branch_name
+ end
+ end
end
|
Add some Glimpse::Views::Git tests
|
diff --git a/client/webpack.config.js b/client/webpack.config.js
index <HASH>..<HASH> 100644
--- a/client/webpack.config.js
+++ b/client/webpack.config.js
@@ -386,6 +386,10 @@ const webpackConfig = {
release: `calypso_${ process.env.COMMIT_SHA }`,
include: filePaths.path,
urlPrefix: `~${ filePaths.publicPath }`,
+ errorHandler: ( err, invokeErr, compilation ) => {
+ // Sentry should _never_ fail the webpack build, so only emit warnings here:
+ compilation.warnings.push( 'Sentry CLI Plugin: ' + err.message );
+ },
} ),
].filter( Boolean ),
externals: [ 'keytar' ],
|
Never fail webpack build from sentry (#<I>)
|
diff --git a/testing/test_detail_page.py b/testing/test_detail_page.py
index <HASH>..<HASH> 100644
--- a/testing/test_detail_page.py
+++ b/testing/test_detail_page.py
@@ -14,7 +14,7 @@ from k2catalogue import detail_object
])
def test_detail_url(input, expected):
epic_object = mock.Mock(epic_id=input)
- url_root = 'http://deneb.astro.warwick.ac.uk/phrlbj/k2varcat/objects/{}'
+ url_root = 'http://deneb.astro.warwick.ac.uk/phrlbj/k2varcat/objects/{0}'
assert detail_object.DetailObject(epic_object).url == url_root.format(
expected)
|
Update format placeholder to be <I> compatible
|
diff --git a/tests/Redisearch/IndexTest.php b/tests/Redisearch/IndexTest.php
index <HASH>..<HASH> 100644
--- a/tests/Redisearch/IndexTest.php
+++ b/tests/Redisearch/IndexTest.php
@@ -301,7 +301,7 @@ class ClientTest extends TestCase
$this->assertEquals($expectedDocumentCount, count($result->getDocuments()));
}
- private function makeDocuments($count = 30000): array
+ private function makeDocuments($count = 3000): array
{
$documents = [];
foreach (range(1, $count) as $id) {
|
Decrease number of docs for batch indexing tests
|
diff --git a/rollup.config.js b/rollup.config.js
index <HASH>..<HASH> 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -1,6 +1,7 @@
import vue from 'rollup-plugin-vue';
import babel from 'rollup-plugin-babel';
import resolve from 'rollup-plugin-node-resolve';
+import uglify from 'rollup-plugin-uglify';
export default {
entry: './src/index.js',
@@ -8,7 +9,8 @@ export default {
plugins: [
resolve(),
vue({compileTemplate: true}),
- babel()
+ babel(),
+ uglify()
],
format: 'umd',
moduleName: 'vueYandexMaps'
|
minify main dist js
|
diff --git a/src/org/zaproxy/zap/extension/alert/AlertTreeModel.java b/src/org/zaproxy/zap/extension/alert/AlertTreeModel.java
index <HASH>..<HASH> 100644
--- a/src/org/zaproxy/zap/extension/alert/AlertTreeModel.java
+++ b/src/org/zaproxy/zap/extension/alert/AlertTreeModel.java
@@ -219,7 +219,9 @@ class AlertTreeModel extends DefaultTreeModel {
// Parent has no other children, remove it also
this.removeNodeFromParent(parent);
nodeStructureChanged((AlertNode) this.getRoot());
- }
+ } else if (parent.getUserObject() == node.getUserObject()) {
+ parent.setUserObject(parent.getChildAt(0).getUserObject());
+ }
}
}
|
Issue <I> - NullPointerException while selecting a node in the "Alerts" tab after deleting a message
Changed AlertTreeModel to set another alert to parent's leaf if it contains the alert of the deleted leaf.
|
diff --git a/commands/command.go b/commands/command.go
index <HASH>..<HASH> 100644
--- a/commands/command.go
+++ b/commands/command.go
@@ -103,11 +103,12 @@ func (c *Command) Call(req Request) Response {
if err != nil {
// if returned error is a commands.Error, use its error code
// otherwise, just default the code to ErrNormal
- var e Error
- e, ok := err.(Error)
- if ok {
+ switch e := err.(type) {
+ case *Error:
res.SetError(e, e.Code)
- } else {
+ case Error:
+ res.SetError(e, e.Code)
+ default:
res.SetError(err, ErrNormal)
}
return res
|
fix(commands/err)
I didn't know there were dragons here.
When casting errors we've gotta be careful. Apparently both values and
pointers satisfy the error interface. Type checking for one doesn't
catch the other.
cc @whyrusleeping @mappum @jbenet
License: MIT
|
diff --git a/pandoc_tablenos.py b/pandoc_tablenos.py
index <HASH>..<HASH> 100755
--- a/pandoc_tablenos.py
+++ b/pandoc_tablenos.py
@@ -112,8 +112,11 @@ def attach_attrs_table(key, value, fmt, meta):
else:
assert len(value) == 6
assert value[1]['t'] == 'Caption'
- assert value[1]['c'][1][0]['t'] == 'Plain'
- caption = value[1]['c'][1][0]['c']
+ if value[1]['c'][1]:
+ assert value[1]['c'][1][0]['t'] == 'Plain'
+ caption = value[1]['c'][1][0]['c']
+ else:
+ return # There is no caption
# Set n to the index where the attributes start
n = 0
@@ -158,7 +161,10 @@ def _process_table(value, fmt):
if version(PANDOCVERSION) < version('2.10'):
table['caption'] = value[1]
else:
- table['caption'] = value[1]['c'][1][0]['c']
+ if value[1]['c'][1]:
+ table['caption'] = value[1]['c'][1][0]['c']
+ else:
+ table['caption'] = []
# Bail out if the label does not conform to expectations
if not LABEL_PATTERN.match(attrs.id):
|
Fixed processing of uncaptioned tables with pandoc <I>. (pandoc-fignos Issue #<I>)
|
diff --git a/debug/init.js b/debug/init.js
index <HASH>..<HASH> 100644
--- a/debug/init.js
+++ b/debug/init.js
@@ -197,6 +197,7 @@ $(function(){
});
});
+/*
$container2.cy({
elements: {
nodes: [ { data: { id: 'n0' } }, { data: { id: 'n1' } } ],
@@ -207,7 +208,7 @@ $(function(){
window.cy2 = this;
}
});
-
+*/
$("#remove-elements-button").click(function(){
var n = number("nodes");
var e = number("edges");
|
disable the container 2
yue can reenable this on his local copy for debugging
|
diff --git a/stellar_base/operation.py b/stellar_base/operation.py
index <HASH>..<HASH> 100644
--- a/stellar_base/operation.py
+++ b/stellar_base/operation.py
@@ -544,6 +544,7 @@ class AllowTrust(Operation):
raise NotImplementedError(
"Operation of asset_type={} is not implemented"
".".format(asset_type.type))
+ asset_code = asset_code.rstrip('\x00')
return cls(
source=source,
|
fix(Operation.AllowTrust): AllowTrust.from_xdr_object should return asset_code properly.
|
diff --git a/wallace/custom.py b/wallace/custom.py
index <HASH>..<HASH> 100644
--- a/wallace/custom.py
+++ b/wallace/custom.py
@@ -114,11 +114,11 @@ def api_agent_create():
# Generate the right kind of newcomer.
try:
assert(issubclass(exp.agent_type_generator, models.Node))
- agent_type_generator = lambda: exp.agent_type_generator
+ agent_type_generator = lambda network=net: exp.agent_type_generator
except:
- agent_type_generator = agent_type_generator
+ agent_type_generator = exp.agent_type_generator
- newcomer_type = agent_type_generator()
+ newcomer_type = agent_type_generator(network=net)
newcomer = newcomer_type(participant_uuid=participant_uuid)
session.add(newcomer)
session.commit()
@@ -153,6 +153,7 @@ def api_agent_create():
def api_transmission(transmission_uuid):
exp = experiment(session)
+ session.commit()
if request.method == 'GET':
|
Update custom.py to work with Rogers
|
diff --git a/tests/unit/states/cron_test.py b/tests/unit/states/cron_test.py
index <HASH>..<HASH> 100644
--- a/tests/unit/states/cron_test.py
+++ b/tests/unit/states/cron_test.py
@@ -214,7 +214,7 @@ class CronTestCase(TestCase):
cron.present(
name='foo',
hour='1',
- comment='Second crontab\nmulti-line-comment\n',
+ comment='Second crontab\nmulti-line comment\n',
identifier='2',
user='root')
self.assertEqual(
|
cron: fix a typo in the tests
|
diff --git a/ImageCacheProvider.js b/ImageCacheProvider.js
index <HASH>..<HASH> 100644
--- a/ImageCacheProvider.js
+++ b/ImageCacheProvider.js
@@ -36,11 +36,18 @@ function getQueryForCacheKey(url, useQueryParamsInCacheKey) {
function generateCacheKey(url, options) {
const parsedUrl = new URL(url, null, true);
- const parts = parsedUrl.pathname.split('.');
+
+ const pathParts = parsedUrl.pathname.split('/');
+
+ // last path part is the file name
+ const fileName = pathParts.pop();
+ const filePath = pathParts.join('/');
+
+ const parts = fileName.split('.');
// TODO - try to figure out the file type or let the user provide it, for now use jpg as default
const type = parts.length > 1 ? parts.pop() : 'jpg';
- const pathname = parts.join('.');
- const cacheable = pathname + getQueryForCacheKey(parsedUrl, options.useQueryParamsInCacheKey);
+
+ const cacheable = filePath + fileName + type + getQueryForCacheKey(parsedUrl, options.useQueryParamsInCacheKey);
return SHA1(cacheable) + '.' + type;
}
|
better resolve type of files from url without typename and with dots in them
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -61,7 +61,7 @@ ElasticsearchStream.prototype._write = function (entry, encoding, callback) {
};
var self = this;
- client.create(options, function (err, resp) {
+ client.index(options, function (err, resp) {
if (err) {
self.emit('error', err);
}
|
Use index instead of create, for ES 5
|
diff --git a/pygsp/filters/filter.py b/pygsp/filters/filter.py
index <HASH>..<HASH> 100644
--- a/pygsp/filters/filter.py
+++ b/pygsp/filters/filter.py
@@ -1,5 +1,7 @@
# -*- coding: utf-8 -*-
+from __future__ import division
+
from math import log
from copy import deepcopy
|
filters: float division for python 2
|
diff --git a/lib/perpetuity/mapper.rb b/lib/perpetuity/mapper.rb
index <HASH>..<HASH> 100644
--- a/lib/perpetuity/mapper.rb
+++ b/lib/perpetuity/mapper.rb
@@ -60,7 +60,6 @@ module Perpetuity
end
def insert
- raise "#{object} is invalid and cannot be persisted." if object.respond_to?(:valid?) and !object.valid?
raise "#{object} is invalid and cannot be persisted." unless validations.valid?(object)
serializable_attributes = {}
serializable_attributes[:id] = object.instance_eval(&self.class.id) unless self.class.id.nil?
diff --git a/spec/mapper_spec.rb b/spec/mapper_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/mapper_spec.rb
+++ b/spec/mapper_spec.rb
@@ -56,12 +56,6 @@ describe Perpetuity::Mapper do
BookMapper.insert book
BookMapper.first.id.should == 'my-title'
end
-
- it "checks for object validity before persisting" do
- invalid_article = Article.new(title=nil)
- invalid_article.stub(valid?: nil)
- expect { ArticleMapper.insert(invalid_article) }.to raise_error
- end
end
describe "deletion" do
|
Remove check for an object's `valid?` method
Having an object tell the ORM whether or not it is valid places
persistence concerns within the business objects, which is not what we
want to do.
|
diff --git a/src/main/java/org/fit/layout/tools/ParamsPanel.java b/src/main/java/org/fit/layout/tools/ParamsPanel.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/fit/layout/tools/ParamsPanel.java
+++ b/src/main/java/org/fit/layout/tools/ParamsPanel.java
@@ -197,11 +197,14 @@ public class ParamsPanel extends JPanel implements ChangeListener, DocumentListe
public void reloadParams()
{
- boolean a = autosave;
- autosave = false;
- this.params = ServiceManager.getServiceParams(op);
- setParams(this.params);
- autosave = a;
+ if (op != null)
+ {
+ boolean a = autosave;
+ autosave = false;
+ this.params = ServiceManager.getServiceParams(op);
+ setParams(this.params);
+ autosave = a;
+ }
}
//======================================================================================
|
Fix param panel reloading when no operation is bound
|
diff --git a/bcbio/srna/group.py b/bcbio/srna/group.py
index <HASH>..<HASH> 100644
--- a/bcbio/srna/group.py
+++ b/bcbio/srna/group.py
@@ -5,10 +5,13 @@ import shutil
from collections import namedtuple
import pysam
-from seqcluster import prepare_data as prepare
-from seqcluster import make_clusters as main_cluster
-from seqcluster.libs.inputs import parse_ma_file
-from seqcluster.libs import parse
+try:
+ from seqcluster import prepare_data as prepare
+ from seqcluster import make_clusters as main_cluster
+ from seqcluster.libs.inputs import parse_ma_file
+ from seqcluster.libs import parse
+except ImportError:
+ pass
from bcbio.utils import file_exists, safe_makedir
from bcbio.provenance import do
diff --git a/bcbio/srna/sample.py b/bcbio/srna/sample.py
index <HASH>..<HASH> 100644
--- a/bcbio/srna/sample.py
+++ b/bcbio/srna/sample.py
@@ -3,7 +3,10 @@ import sys
import os.path as op
import shutil
from collections import Counter
-from seqcluster.libs.fastq import collapse, write_output
+try:
+ from seqcluster.libs.fastq import collapse, write_output
+except ImportError:
+ pass
from bcbio.utils import (splitext_plus, file_exists, append_stem, replace_directory)
from bcbio.provenance import do
|
Make seqcluster requirement soft (cc @lpantano)
- Do not require seqcluster if not running the small RNA pipeline.
- Preparation for adding seqcluster as a soft dependency of bcbio
and checking issues with circular requirements.
|
diff --git a/python_modules/libraries/dagster-pyspark/dagster_pyspark/__init__.py b/python_modules/libraries/dagster-pyspark/dagster_pyspark/__init__.py
index <HASH>..<HASH> 100644
--- a/python_modules/libraries/dagster-pyspark/dagster_pyspark/__init__.py
+++ b/python_modules/libraries/dagster-pyspark/dagster_pyspark/__init__.py
@@ -5,3 +5,8 @@ from .types import DataFrame
from .version import __version__
check_dagster_package_version('dagster-pyspark', __version__)
+
+__all__ = [
+ 'DataFrame',
+ 'pyspark_resource',
+]
|
set __all__ for dagster-pyspark
Test Plan: bk
Reviewers: nate
Reviewed By: nate
Differential Revision: <URL>
|
diff --git a/mod/data/lib.php b/mod/data/lib.php
index <HASH>..<HASH> 100755
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -1453,7 +1453,7 @@ function data_print_comments($data, $record, $page=0, $mform=false) {
if (!$mform and !$editor) {
echo '<div class="newcomment" style="text-align:center">';
- echo '<a href="view.php?d='.$data->id.'&page='.$page.'&mode=single&addcomment=1">'.get_string('addcomment', 'data').'</a>';
+ echo '<a href="view.php?d='.$data->id.'&rid='.$record->id.'&mode=single&addcomment=1">'.get_string('addcomment', 'data').'</a>';
echo '</div>';
} else {
if (!$mform) {
|
"DATA/MDL-<I>, use rid instead page to comment a record, merged from <I>"
|
diff --git a/tests/test_gnupg.py b/tests/test_gnupg.py
index <HASH>..<HASH> 100644
--- a/tests/test_gnupg.py
+++ b/tests/test_gnupg.py
@@ -201,7 +201,6 @@ class GPGTestCase(unittest.TestCase):
else:
log.warn("Can't delete homedir: '%s' not a directory"
% self.homedir)
- log.warn("%s%s%s" % (os.linesep, str("=" * 70), os.linesep))
def test_parsers_fix_unsafe(self):
"""Test that unsafe inputs are quoted out and then ignored."""
|
Remove the log.warn line that printed dividers between unittest runs.
|
diff --git a/test/spec/modules/aduptechBidAdapter_spec.js b/test/spec/modules/aduptechBidAdapter_spec.js
index <HASH>..<HASH> 100644
--- a/test/spec/modules/aduptechBidAdapter_spec.js
+++ b/test/spec/modules/aduptechBidAdapter_spec.js
@@ -532,8 +532,8 @@ describe('AduptechBidAdapter', () => {
const bidderRequest = {
auctionId: 'auctionId123',
refererInfo: {
- canonicalUrl: 'http://crazy.canonical.url',
- referer: 'http://crazy.referer.url'
+ page: 'http://crazy.canonical.url',
+ ref: 'http://crazy.referer.url'
},
gdprConsent: {
consentString: 'consentString123',
@@ -572,8 +572,8 @@ describe('AduptechBidAdapter', () => {
method: ENDPOINT_METHOD,
data: {
auctionId: bidderRequest.auctionId,
- pageUrl: bidderRequest.refererInfo.canonicalUrl,
- referrer: bidderRequest.refererInfo.referer,
+ pageUrl: bidderRequest.refererInfo.page,
+ referrer: bidderRequest.refererInfo.ref,
gdpr: {
consentString: bidderRequest.gdprConsent.consentString,
consentRequired: bidderRequest.gdprConsent.gdprApplies
|
Aduptech bid adapter: fix failing test (#<I>)
|
diff --git a/actionview/test/template/sanitize_helper_test.rb b/actionview/test/template/sanitize_helper_test.rb
index <HASH>..<HASH> 100644
--- a/actionview/test/template/sanitize_helper_test.rb
+++ b/actionview/test/template/sanitize_helper_test.rb
@@ -1,7 +1,7 @@
require 'abstract_unit'
-# The exhaustive tests are in test/template/html-scanner/sanitizer_test.rb
-# This tests the that the helpers hook up correctly to the sanitizer classes.
+# The exhaustive tests are in test/controller/html/sanitizer_test.rb.
+# This tests that the helpers hook up correctly to the sanitizer classes.
class SanitizeHelperTest < ActionView::TestCase
tests ActionView::Helpers::SanitizeHelper
@@ -49,7 +49,7 @@ class SanitizeHelperTest < ActionView::TestCase
stripped = strip_tags(blank)
assert_equal blank, stripped
end
-
+
# Actual: "something "
assert_equal "something <img onerror=alert(1337)", ERB::Util.html_escape(strip_tags("something <img onerror=alert(1337)"))
end
|
Fixed: spelling mistake in SanitizeHelperTest.
|
diff --git a/js/cbrowser.js b/js/cbrowser.js
index <HASH>..<HASH> 100644
--- a/js/cbrowser.js
+++ b/js/cbrowser.js
@@ -1733,7 +1733,7 @@ Browser.prototype.addViewListener = function(handler, opts) {
Browser.prototype.notifyLocation = function() {
var nvs = Math.max(1, this.viewStart|0);
var nve = this.viewEnd|0;
- if (this.currentSeqMax && nve > this.currentSeqMax)
+ if (this.currentSeqMax > 0 && nve > this.currentSeqMax)
nve = this.currentSeqMax;
for (var lli = 0; lli < this.viewListeners.length; ++lli) {
|
Fix reported coordinaes when currentSeqMax isn't set.
|
diff --git a/releaf-i18n/app/controllers/releaf/translations_controller.rb b/releaf-i18n/app/controllers/releaf/translations_controller.rb
index <HASH>..<HASH> 100644
--- a/releaf-i18n/app/controllers/releaf/translations_controller.rb
+++ b/releaf-i18n/app/controllers/releaf/translations_controller.rb
@@ -84,7 +84,7 @@ module Releaf
relation = relation.joins(sql % ([locale] * 4))
end
- relation.select(columns_for_select)
+ relation.select(columns_for_select).order(:key)
end
# overwrite leaf base class
|
TranslationsController: order translations by key
|
diff --git a/config/test/ConfigPanel.php b/config/test/ConfigPanel.php
index <HASH>..<HASH> 100644
--- a/config/test/ConfigPanel.php
+++ b/config/test/ConfigPanel.php
@@ -1,7 +1,7 @@
<?php
-$config['db']['dbname'] = 'framework_test';
-$config['db']['user'] = 'thulium_1';
-$config['db']['pass'] = 'a';
+$config['db']['dbname'] = 'ouzo_test';
+$config['db']['user'] = 'postgres';
+$config['db']['pass'] = '';
$config['db']['driver'] = 'pgsql';
$config['db']['host'] = '127.0.0.1';
$config['db']['port'] = '5432';
|
Updated ConfigPanel.php to be compatibile with travis settings.
|
diff --git a/src/router-configuration.js b/src/router-configuration.js
index <HASH>..<HASH> 100644
--- a/src/router-configuration.js
+++ b/src/router-configuration.js
@@ -30,6 +30,9 @@ export class RouterConfiguration {
* @chainable
*/
addPipelineStep(name: string, step: Function|PipelineStep): RouterConfiguration {
+ if (step === null || step === undefined) {
+ throw new Error('Pipeline step cannot be null or undefined.');
+ }
this.pipelineSteps.push({name, step});
return this;
}
|
fix(router-configuration): throw early on invalid pipeline steps
|
diff --git a/lib/rollbar/exception_reporter.rb b/lib/rollbar/exception_reporter.rb
index <HASH>..<HASH> 100644
--- a/lib/rollbar/exception_reporter.rb
+++ b/lib/rollbar/exception_reporter.rb
@@ -1,7 +1,8 @@
module Rollbar
module ExceptionReporter
def report_exception_to_rollbar(env, exception)
- Rollbar.log_debug "[Rollbar] Reporting exception: #{exception.try(:message)}"
+ exception_message = exception.respond_to?(:message) ? exception.message : 'No Exception Message'
+ Rollbar.log_debug "[Rollbar] Reporting exception: #{exception_message}"
exception_data = Rollbar.log(Rollbar.configuration.uncaught_exception_level, exception)
|
replace usage of #try with #respond_to?
|
diff --git a/src/rasterstats/io.py b/src/rasterstats/io.py
index <HASH>..<HASH> 100644
--- a/src/rasterstats/io.py
+++ b/src/rasterstats/io.py
@@ -183,7 +183,8 @@ def boundless_array(arr, window, nodata, masked=False):
window_shape = (wr_stop - wr_start, wc_stop - wc_start)
# create an array of nodata values
- out = np.ones(shape=window_shape) * nodata
+ out = np.empty(shape=window_shape)
+ out[:] = nodata
# Fill with data where overlapping
nr_start = olr_start - wr_start
|
Do not create array with ones, and then multiply value by nodata. Instead, create un-initialized array and set array values to nodata. This cuts the amount of memory-copy operations in half and thus, halves the operation time
|
diff --git a/lib/bel/completion_rule.rb b/lib/bel/completion_rule.rb
index <HASH>..<HASH> 100644
--- a/lib/bel/completion_rule.rb
+++ b/lib/bel/completion_rule.rb
@@ -69,6 +69,7 @@ module BEL
})
end
+ # add the active_token length if we do not need to delete it
if active_token and actions.empty?
position_start += active_token.value.length
end
|
comment why we add length to start when no delete
|
diff --git a/lib/webrtc/call.js b/lib/webrtc/call.js
index <HASH>..<HASH> 100644
--- a/lib/webrtc/call.js
+++ b/lib/webrtc/call.js
@@ -128,7 +128,7 @@ MatrixCall.prototype._initWithInvite = function(event) {
this.state = 'ringing';
this.direction = 'inbound';
- // firefox and Safari's RTCPeerConnection doesn't add streams until it
+ // firefox and OpenWebRTC's RTCPeerConnection doesn't add streams until it
// starts getting media on them so we need to figure out whether a video
// channel has been offered by ourselves.
if (this.msg.offer.sdp.indexOf('m=video') > -1) {
|
s/Safari/OpenWebRTC/
|
diff --git a/core/src/main/java/org/mapfish/print/processor/jasper/MergeDataSourceProcessor.java b/core/src/main/java/org/mapfish/print/processor/jasper/MergeDataSourceProcessor.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/org/mapfish/print/processor/jasper/MergeDataSourceProcessor.java
+++ b/core/src/main/java/org/mapfish/print/processor/jasper/MergeDataSourceProcessor.java
@@ -19,6 +19,7 @@
package org.mapfish.print.processor.jasper;
+import com.google.common.annotations.Beta;
import com.google.common.collect.BiMap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -61,6 +62,7 @@ import javax.annotation.Nullable;
*
* @author Jesse on 9/6/2014.
*/
+@Beta
public final class MergeDataSourceProcessor extends AbstractProcessor<MergeDataSourceProcessor.In, MergeDataSourceProcessor.Out>
implements CustomDependencies {
private List<Source> sources = Lists.newArrayList();
|
Mark MergeDataSourceProcessor as @Beta because I am not sure it is needed, it might be a work around for my ignorance of Jasper Reports
|
diff --git a/packages/grpc-native-core/test/channel_test.js b/packages/grpc-native-core/test/channel_test.js
index <HASH>..<HASH> 100644
--- a/packages/grpc-native-core/test/channel_test.js
+++ b/packages/grpc-native-core/test/channel_test.js
@@ -132,7 +132,8 @@ describe('channel', function() {
grpc.connectivityState.IDLE);
});
});
- describe('watchConnectivityState', function() {
+ // This suite test appears to be triggering grpc/grpc#12932; skipping for now
+ describe.skip('watchConnectivityState', function() {
var channel;
beforeEach(function() {
channel = new grpc.Channel('localhost', insecureCreds, {});
|
Skip a test suite that appears to be triggering a core assertion failure
|
diff --git a/lib/clone-wars/version.rb b/lib/clone-wars/version.rb
index <HASH>..<HASH> 100644
--- a/lib/clone-wars/version.rb
+++ b/lib/clone-wars/version.rb
@@ -1,5 +1,5 @@
# encoding: utf-8
module CloneWars # :nodoc:
- VERSION = "0.0.3"
+ VERSION = "0.1.0"
end
|
Version bumping minor to a <I>
|
diff --git a/pyramid_webassets/tests/test_webassets.py b/pyramid_webassets/tests/test_webassets.py
index <HASH>..<HASH> 100644
--- a/pyramid_webassets/tests/test_webassets.py
+++ b/pyramid_webassets/tests/test_webassets.py
@@ -183,7 +183,7 @@ class TestWebAssets(unittest.TestCase):
with self.assertRaises(Exception) as cm:
get_webassets_env_from_settings(settings, prefix='webassets')
- assert cm.exception.message == "You need to provide webassets.base_dir in your configuration"
+ assert cm.exception.message == "You need to provide webassets.base_dir in your configuration"
def test_includeme(self):
from pyramid_webassets import includeme
@@ -395,7 +395,7 @@ class TestAssetSpecs(TempDirHelper, unittest.TestCase):
with self.assertRaises(BundleError) as cm:
bundle.urls(self.env)
- assert cm.exception.args[0].message == 'No module named rabbits'
+ assert cm.exception.args[0].message == 'No module named rabbits'
def test_asset_spec_no_static_view(self):
from webassets import Bundle
|
Fixed two asserts in test when raising an exception
They were inside the with, so they were never executed. (Thanks to the cov plugin for this one)
|
diff --git a/buildprocess/configureWebpack.js b/buildprocess/configureWebpack.js
index <HASH>..<HASH> 100644
--- a/buildprocess/configureWebpack.js
+++ b/buildprocess/configureWebpack.js
@@ -104,7 +104,7 @@ function configureWebpack(terriaJSBasePath, config, devMode, hot, MiniCssExtract
loader: 'babel-loader',
options: {
cacheDirectory: true,
- sourceMaps: !!devMode,
+ sourceMaps: true,
presets: [
[
'@babel/preset-env',
|
babel-loader to always generate source-maps
|
diff --git a/bit/wallet.py b/bit/wallet.py
index <HASH>..<HASH> 100644
--- a/bit/wallet.py
+++ b/bit/wallet.py
@@ -958,7 +958,7 @@ class MultiSig:
else:
return unspent.script == script
- def sign(self, data):
+ def sign(self, data): # pragma: no cover
"""Signs some data which can be verified later by others using
the public key.
@@ -1261,7 +1261,7 @@ class MultiSigTestnet:
else:
return unspent.script == script
- def sign(self, data):
+ def sign(self, data): # pragma: no cover
"""Signs some data which can be verified later by others using
the public key.
|
Removes code coverage for function `~MultiSig.sign()`
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.