diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/core/src/main/java/com/orientechnologies/orient/core/db/ODatabaseRecordWrapperAbstract.java b/core/src/main/java/com/orientechnologies/orient/core/db/ODatabaseRecordWrapperAbstract.java
index <HASH>..<HASH> 100755
--- a/core/src/main/java/com/orientechnologies/orient/core/db/ODatabaseRecordWrapperAbstract.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/db/ODatabaseRecordWrapperAbstract.java
@@ -151,6 +151,10 @@ public abstract class ODatabaseRecordWrapperAbstract<DB extends ODatabaseRecord>
return underlying.getUser();
}
+ public void setUser(OUser user) {
+ underlying.setUser(user);
+ }
+
public OMetadata getMetadata() {
return underlying.getMetadata();
}
|
Update core/src/main/java/com/orientechnologies/orient/core/db/ODatabaseRecordWrapperAbstract.java
Allow set user back to current database instance
|
diff --git a/src/selection.js b/src/selection.js
index <HASH>..<HASH> 100644
--- a/src/selection.js
+++ b/src/selection.js
@@ -75,7 +75,7 @@ export default class FeatureSelection {
// Any pending selection requests
pendingRequests() {
- return this.requests;
+ return Object.keys(this.requests).length && this.requests;
}
clearPendingRequests() {
|
only return pending selection list when more than zero
|
diff --git a/src/Twig/EasyAdminTwigExtension.php b/src/Twig/EasyAdminTwigExtension.php
index <HASH>..<HASH> 100644
--- a/src/Twig/EasyAdminTwigExtension.php
+++ b/src/Twig/EasyAdminTwigExtension.php
@@ -262,7 +262,7 @@ class EasyAdminTwigExtension extends \Twig_Extension
} elseif (null !== $primaryKeyValue) {
$templateParameters['value'] = sprintf('%s #%s', $targetEntityConfig['name'], $primaryKeyValue);
} else {
- $templateParameters['value'] = $this->getClassShortName($templateParameters['field_options']['targetEntity']);
+ $templateParameters['value'] = null;
}
// if the associated entity is managed by EasyAdmin, and the "show"
|
display NONE label on null associations
This will fix #<I> and #<I>
|
diff --git a/src/Adyen/Client.php b/src/Adyen/Client.php
index <HASH>..<HASH> 100644
--- a/src/Adyen/Client.php
+++ b/src/Adyen/Client.php
@@ -104,6 +104,16 @@ class Client
$this->_config->set('endpoint', $url);
}
+ /**
+ * Set directory lookup URL
+ *
+ * @param $url
+ */
+ public function setDirectoryLookupUrl($url)
+ {
+ $this->_config->set('endpointDirectorylookup', $url);
+ }
+
public function setMerchantAccount($merchantAccount)
{
$this->_config->set('merchantAccount', $merchantAccount);
@@ -217,4 +227,4 @@ class Client
return $logger;
}
-}
\ No newline at end of file
+}
|
Added a method to set the directory lookup URL.
|
diff --git a/Dailymotion.php b/Dailymotion.php
index <HASH>..<HASH> 100644
--- a/Dailymotion.php
+++ b/Dailymotion.php
@@ -612,6 +612,7 @@ class Dailymotion
CURLOPT_CONNECTTIMEOUT => $this->connectionTimeout,
CURLOPT_TIMEOUT => $this->timeout,
CURLOPT_PROXY => $this->proxy,
+ CURLOPT_SSLVERSION => 3, // See http://bit.ly/I1OYCn
CURLOPT_USERAGENT => sprintf('Dailymotion-PHP/%s (PHP %s; %s)', self::VERSION, PHP_VERSION, php_sapi_name()),
CURLOPT_HEADER => true,
CURLOPT_RETURNTRANSFER => true,
|
Force SSL version to workaround SSL timeout with some PHP installations
|
diff --git a/lib/ronin/extensions/regexp.rb b/lib/ronin/extensions/regexp.rb
index <HASH>..<HASH> 100644
--- a/lib/ronin/extensions/regexp.rb
+++ b/lib/ronin/extensions/regexp.rb
@@ -28,10 +28,10 @@ class Regexp
MAC = /[0-9a-fA-F]{2}(?::[0-9a-fA-F]{2}){5}/
# A regular expression for matching IPv4 Addresses.
- IPv4 = /#{OCTET}(?:\.#{OCTET}){3}/
+ IPv4 = /#{OCTET}(?:\.#{OCTET}){3}(?:\/\d{1,2})?/
# A regular expression for matching IPv6 Addresses.
- IPv6 = /::ffff:#{IPv4}|(?:::)?[0-9a-f]{1,4}(::?[0-9a-f]{1,4}){,7}(?:::)?/
+ IPv6 = /::ffff:#{IPv4}|(?:::)?[0-9a-f]{1,4}(::?[0-9a-f]{1,4}){,7}(?:::)?(?:\/\d{1,3})?/
# A regular expression for matching IP Addresses.
IP = /#{IPv4}|#{IPv6}/
|
Also match the netmasks of the IPv4 and IPv6 addresses.
|
diff --git a/src/java/voldemort/cluster/failuredetector/AbstractFailureDetector.java b/src/java/voldemort/cluster/failuredetector/AbstractFailureDetector.java
index <HASH>..<HASH> 100644
--- a/src/java/voldemort/cluster/failuredetector/AbstractFailureDetector.java
+++ b/src/java/voldemort/cluster/failuredetector/AbstractFailureDetector.java
@@ -216,8 +216,8 @@ public abstract class AbstractFailureDetector implements FailureDetector {
if(nodeStatus == null) {
logger.warn("creating new node status for node " + node + " for failure detector.");
- nodeStatusMap.put(node, createNodeStatus(node, failureDetectorConfig.getTime()
- .getMilliseconds()));
+ nodeStatus = createNodeStatus(node, failureDetectorConfig.getTime().getMilliseconds());
+ nodeStatusMap.put(node, nodeStatus);
}
return nodeStatus;
|
Returning the new NodeStatus() object if previous nodeStatus was null.
|
diff --git a/security/api/src/main/java/org/jboss/as/security/api/ConnectionSecurityContext.java b/security/api/src/main/java/org/jboss/as/security/api/ConnectionSecurityContext.java
index <HASH>..<HASH> 100644
--- a/security/api/src/main/java/org/jboss/as/security/api/ConnectionSecurityContext.java
+++ b/security/api/src/main/java/org/jboss/as/security/api/ConnectionSecurityContext.java
@@ -72,7 +72,7 @@ public class ConnectionSecurityContext {
if (localIdentity != null) {
final Principal principal = localIdentity.getPrincipal();
final String realm = principal instanceof RealmPrincipal ? ((RealmPrincipal) principal).getRealm() : null;
- principals.add(new RealmUser(realm, principal.getName()));
+ principals.add(realm == null ? new RealmUser(principal.getName()) : new RealmUser(realm, principal.getName()));
for (String role : localIdentity.getRoles()) {
principals.add(new RealmGroup(role));
principals.add(new RealmRole(role));
|
WFLY-<I>: prevent IllegalStateException while creation of RealmUser without realm
|
diff --git a/app/helpers/wafflemix/application_helper.rb b/app/helpers/wafflemix/application_helper.rb
index <HASH>..<HASH> 100644
--- a/app/helpers/wafflemix/application_helper.rb
+++ b/app/helpers/wafflemix/application_helper.rb
@@ -14,7 +14,7 @@ module Wafflemix
icon_bar += content_tag(:span, '', :class => 'icon-bar')
icon_bar.html_safe
end
- container_content += link_to('WaffleMix', main_app.root_path, :class => 'brand')
+ container_content += link_to('WaffleMix', root_path, :class => 'brand')
container_content += content_tag(:div, '', :class => 'nav-collapse collapse') do
content_tag(:ul, :class => 'nav') do
top_nav_links.html_safe
|
Root path is now set in main app.
|
diff --git a/js/src/forum/addComposerAutocomplete.js b/js/src/forum/addComposerAutocomplete.js
index <HASH>..<HASH> 100644
--- a/js/src/forum/addComposerAutocomplete.js
+++ b/js/src/forum/addComposerAutocomplete.js
@@ -46,7 +46,7 @@ export default function addComposerAutocomplete() {
$textarea
.after($container)
- .on('click keyup', function(e) {
+ .on('click keyup input', function(e) {
// Up, down, enter, tab, escape, left, right.
if ([9, 13, 27, 40, 38, 37, 39].indexOf(e.which) !== -1) return;
|
Trigger mention autocomplete on any kind of input
|
diff --git a/src/shared/get-support.js b/src/shared/get-support.js
index <HASH>..<HASH> 100644
--- a/src/shared/get-support.js
+++ b/src/shared/get-support.js
@@ -7,7 +7,7 @@ function calcSupport() {
const document = getDocument();
return {
- smoothScroll: 'scrollBehavior' in document.documentElement.style,
+ smoothScroll: document.documentElement && 'scrollBehavior' in document.documentElement.style,
touch: !!(
'ontouchstart' in window ||
|
fix(core): double check for documentElement in smoothScroll detection
|
diff --git a/src/Codesleeve/AssetPipeline/Filters/JSTFilter.php b/src/Codesleeve/AssetPipeline/Filters/JSTFilter.php
index <HASH>..<HASH> 100644
--- a/src/Codesleeve/AssetPipeline/Filters/JSTFilter.php
+++ b/src/Codesleeve/AssetPipeline/Filters/JSTFilter.php
@@ -41,7 +41,9 @@ class JSTFilter implements FilterInterface
{
$base = $asset->getSourceRoot();
- $file = pathinfo($asset->getSourcePath())['filename'];
+ $file = pathinfo($asset->getSourcePath());
+ $file = $file['filename'];
+
$file = str_replace('\\', '/', $file);
$path = '';
|
seperating 1 line into 2 lines for backwards compatibility (maybe...)
|
diff --git a/packages/ember-htmlbars/lib/main.js b/packages/ember-htmlbars/lib/main.js
index <HASH>..<HASH> 100644
--- a/packages/ember-htmlbars/lib/main.js
+++ b/packages/ember-htmlbars/lib/main.js
@@ -12,7 +12,6 @@ import makeBoundHelper from "ember-htmlbars/system/make_bound_helper";
import {
registerHelper,
- helper,
default as helpers
} from "ember-htmlbars/helpers";
import { viewHelper } from "ember-htmlbars/helpers/view";
|
[BUGFIX beta] Remove vestigial `helper` import in ember-htmlbars
* Resolves JSHint error
|
diff --git a/lib/oxygen.js b/lib/oxygen.js
index <HASH>..<HASH> 100644
--- a/lib/oxygen.js
+++ b/lib/oxygen.js
@@ -236,8 +236,8 @@ module.exports.Runner = function () {
} else if (msg.level === 'WARN') {
logger.warn(msg.msg);
}
-
- if (msg.issuer === DEFAULT_ISSUER) {
+
+ if (msg.src === DEFAULT_ISSUER) {
ee.emit('log-add', msg.level, msg.msg, msg.time);
}
} else if (msg.event && msg.event === 'init-success') {
|
Fix log-add event not being emited
|
diff --git a/apiserver/facades/client/application/application.go b/apiserver/facades/client/application/application.go
index <HASH>..<HASH> 100644
--- a/apiserver/facades/client/application/application.go
+++ b/apiserver/facades/client/application/application.go
@@ -2148,7 +2148,8 @@ func (api *APIBase) setApplicationConfig(arg params.ApplicationConfigSet) error
}
// We need a guard on the API server-side for direct API callers such as
- // python-libjuju. Always default to the master branch.
+ // python-libjuju, and for older clients.
+ // Always default to the master branch.
if arg.Generation == "" {
arg.Generation = model.GenerationMaster
}
@@ -2223,7 +2224,8 @@ func (api *APIBase) unsetApplicationConfig(arg params.ApplicationUnset) error {
if len(charmSettings) > 0 {
// We need a guard on the API server-side for direct API callers such as
- // python-libjuju. Always default to the master branch.
+ // python-libjuju, and for older clients.
+ // Always default to the master branch.
if arg.BranchName == "" {
arg.BranchName = model.GenerationMaster
}
|
Adds comment detail to application API server for defaulting config branch name.
|
diff --git a/lib/gclitest/testCli.js b/lib/gclitest/testCli.js
index <HASH>..<HASH> 100644
--- a/lib/gclitest/testCli.js
+++ b/lib/gclitest/testCli.js
@@ -130,7 +130,7 @@ exports.testTsv = function() {
test.is( 'VVVVI', statuses);
test.is(Status.ERROR, status);
test.is(0, assignC.paramIndex);
- test.is(2, assignC.getPredictions().length);
+ test.ok(assignC.getPredictions().length >= 2);
test.is(commands.option1, assignC.getPredictions()[0].value);
test.is(commands.option2, assignC.getPredictions()[1].value);
test.is('tsv', requ.commandAssignment.getValue().name);
@@ -141,7 +141,7 @@ exports.testTsv = function() {
test.is( 'VVVVIIIIII', statuses);
test.is(Status.ERROR, status);
test.is(0, assignC.paramIndex);
- test.is(2, assignC.getPredictions().length);
+ test.ok(assignC.getPredictions().length >= 2);
test.is(commands.option1, assignC.getPredictions()[0].value);
test.is(commands.option2, assignC.getPredictions()[1].value);
test.is('tsv', requ.commandAssignment.getValue().name);
|
Bug <I> (fuzzy): Tests for match counts need to be broader
|
diff --git a/sos/report/plugins/auditd.py b/sos/report/plugins/auditd.py
index <HASH>..<HASH> 100644
--- a/sos/report/plugins/auditd.py
+++ b/sos/report/plugins/auditd.py
@@ -21,7 +21,8 @@ class Auditd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
def setup(self):
self.add_copy_spec([
"/etc/audit/auditd.conf",
- "/etc/audit/audit.rules"
+ "/etc/audit/audit.rules",
+ "/etc/audit/plugins.d/"
])
self.add_cmd_output([
"ausearch --input-logs -m avc,user_avc -ts today",
|
[auditd] Get auditd plugins.d contents
Resolves: #<I>
|
diff --git a/Classes/Utility/DatabaseUtility.php b/Classes/Utility/DatabaseUtility.php
index <HASH>..<HASH> 100644
--- a/Classes/Utility/DatabaseUtility.php
+++ b/Classes/Utility/DatabaseUtility.php
@@ -312,35 +312,11 @@ class DatabaseUtility
return $ret;
}
- /**
- * Sanitize field for sql usage
- *
- * @param string $field SQL relation attribute
- *
- * @return string
- */
- public static function sanitizeSqlField($field)
- {
- return preg_replace('/[^_a-zA-Z0-9\.]/', '', $field);
- }
-
###########################################################################
# Helper functions
###########################################################################
/**
- * Sanitize table for sql usage
- *
- * @param string $table SQL Table
- *
- * @return string
- */
- public static function sanitizeSqlTable($table)
- {
- return preg_replace('/[^_a-zA-Z0-9]/', '', $table);
- }
-
- /**
* Add condition to query
*
* @param array|string $condition Condition
|
[TASK] no need to sanitize user input to process table / attribute names.
It would not be safe anyways. If ever user input for table or attribute names needs to be processed, an exact match would be much safer. Therefore, there's nothing to sanitize.
Fixes #<I>
|
diff --git a/ez_setup.py b/ez_setup.py
index <HASH>..<HASH> 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@ try:
except ImportError:
USER_SITE = None
-DEFAULT_VERSION = "18.0"
+DEFAULT_VERSION = "18.1"
DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
DEFAULT_SAVE_DIR = os.curdir
diff --git a/setuptools/version.py b/setuptools/version.py
index <HASH>..<HASH> 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '18.0'
+__version__ = '18.1'
|
Bumped to <I> in preparation for next release.
|
diff --git a/oa-oauth/lib/omniauth/strategies/netflix.rb b/oa-oauth/lib/omniauth/strategies/netflix.rb
index <HASH>..<HASH> 100644
--- a/oa-oauth/lib/omniauth/strategies/netflix.rb
+++ b/oa-oauth/lib/omniauth/strategies/netflix.rb
@@ -53,6 +53,7 @@ module OmniAuth
'nickname' => user['nickname'],
'first_name' => user['first_name'],
'last_name' => user['last_name'],
+ 'name' => "#{user['first_name']} #{user['last_name']}"
}
end
|
NetFlix Auth Hash Schema must contain a required
['user_info']['name'] entry.
|
diff --git a/scapy/asn1fields.py b/scapy/asn1fields.py
index <HASH>..<HASH> 100644
--- a/scapy/asn1fields.py
+++ b/scapy/asn1fields.py
@@ -282,7 +282,7 @@ class ASN1F_SEQUENCE_OF(ASN1F_SEQUENCE):
class ASN1F_PACKET(ASN1F_field):
holds_packets = 1
def __init__(self, name, default, cls):
- ASN1_field.__init__(self, name, default)
+ ASN1F_field.__init__(self, name, default)
self.cls = cls
def i2m(self, pkt, x):
if x is None:
|
typo in scapy/asn1fields.py
|
diff --git a/src/TextBox.js b/src/TextBox.js
index <HASH>..<HASH> 100644
--- a/src/TextBox.js
+++ b/src/TextBox.js
@@ -268,6 +268,7 @@ export default class TextBox extends BaseClass {
const rtl = detectRTL();
update
+ .order()
.style("pointer-events", d => this._pointerEvents(d.data, d.i))
.each(function(d) {
|
fixes re-ordering of TextBox DOM elements on redraw
|
diff --git a/django_tenants/postgresql_backend/base.py b/django_tenants/postgresql_backend/base.py
index <HASH>..<HASH> 100644
--- a/django_tenants/postgresql_backend/base.py
+++ b/django_tenants/postgresql_backend/base.py
@@ -165,3 +165,6 @@ class FakeTenant:
def __init__(self, schema_name, tenant_type=None):
self.schema_name = schema_name
self.tenant_type = tenant_type
+
+ def get_tenant_type(self):
+ return self.tenant_type
|
Fixed a problem with FakeTenant
|
diff --git a/routing/chainview/neutrino.go b/routing/chainview/neutrino.go
index <HASH>..<HASH> 100644
--- a/routing/chainview/neutrino.go
+++ b/routing/chainview/neutrino.go
@@ -236,7 +236,7 @@ func (c *CfFilteredChainView) FilterBlock(blockHash *chainhash.Hash) (*FilteredB
// Next, using the block, hash, we'll fetch the compact filter for this
// block. We only require the regular filter as we're just looking for
// outpoint that have been spent.
- filter, err := c.p2pNode.GetCFilter(*blockHash, false)
+ filter, err := c.p2pNode.GetCFilter(*blockHash, wire.GCSFilterRegular)
if err != nil {
return nil, err
}
|
routing/chainview: update neutrino driver to comply with BIP
|
diff --git a/lib/launchy/cli.rb b/lib/launchy/cli.rb
index <HASH>..<HASH> 100644
--- a/lib/launchy/cli.rb
+++ b/lib/launchy/cli.rb
@@ -65,13 +65,11 @@ module Launchy
def good_run( argv, env )
if parse( argv, env ) then
- Launchy.open( argv.shift, options )
+ Launchy.open( argv.shift, options ) { |u, o, e| error_output( e ) }
return true
else
return false
end
- rescue StandardError => e
- error_output( e )
end
def error_output( error )
|
Have the commandline program use the new block feature.
|
diff --git a/lib/handlers/session.js b/lib/handlers/session.js
index <HASH>..<HASH> 100644
--- a/lib/handlers/session.js
+++ b/lib/handlers/session.js
@@ -9,6 +9,9 @@ var errors = require('../errors');
var Observable = utils.Observable;
var passport = require('passport');
+var sendy = require('../addons/sendy');
+
+
module.exports = Observable.extend({
constructor: function SessionHandler(sandbox) {
Observable.apply(this, arguments);
@@ -143,6 +146,12 @@ module.exports = Observable.extend({
key = req.param('key', '').trim(),
_this = this;
+ var subscribed = req.param('subscribed');
+ if (subscribed !== undefined) {
+ subscribed = subscribed === 'true' ? true : false;
+ sendy.setSubscribed(email, !!subscribed);
+ }
+
if ('name' in req.params && req.user.name !== req.param('name')) {
return this.respond(req, res, 400, {
ok: false,
|
Check for subscribed param and set accordingly on routeSetHome
|
diff --git a/core/src/main/java/com/linecorp/armeria/server/Server.java b/core/src/main/java/com/linecorp/armeria/server/Server.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/com/linecorp/armeria/server/Server.java
+++ b/core/src/main/java/com/linecorp/armeria/server/Server.java
@@ -204,7 +204,7 @@ public final class Server implements AutoCloseable {
final MeterRegistry meterRegistry = config().meterRegistry();
meterRegistry.gauge("armeria.server.pendingResponses", gracefulShutdownSupport,
GracefulShutdownSupport::pendingResponses);
- meterRegistry.gauge("armeria.server.numConnections", connectionLimitingHandler,
+ meterRegistry.gauge("armeria.server.connections", connectionLimitingHandler,
ConnectionLimitingHandler::numConnections);
}
|
Rename 'armeria.server.numConnections` to `armeria.server.connections` (#<I>)
Motivation:
`numConnections` violates the Prometheus naming convention
Modifications:
- Rename 'armeria.server.numConnections` to `armeria.server.connections`
Result:
Consistency
|
diff --git a/lib/csvlint/validate.rb b/lib/csvlint/validate.rb
index <HASH>..<HASH> 100644
--- a/lib/csvlint/validate.rb
+++ b/lib/csvlint/validate.rb
@@ -193,7 +193,7 @@ module Csvlint
end
@header_processed = true
build_info_messages(:assumed_header, :structure) if assumed_header
-
+
@link_headers = @headers["link"].split(",") rescue nil
@link_headers.each do |link_header|
match = LINK_HEADER_REGEXP.match(link_header)
@@ -443,7 +443,7 @@ module Csvlint
end
rescue Errno::ENOENT
rescue OpenURI::HTTPError, URI::BadURIError
- rescue=> e
+ rescue => e
STDERR.puts e.class
STDERR.puts e.message
STDERR.puts e.backtrace
|
whitespace fix because linter
cosmetic, no change in execution
|
diff --git a/join/_core.py b/join/_core.py
index <HASH>..<HASH> 100644
--- a/join/_core.py
+++ b/join/_core.py
@@ -42,7 +42,7 @@ def join(left, right, how='inner', key=None, left_key=None, right_key=None,
"right": _right_join,
"inner": _inner_join,
"outer": _outer_join,
- }.get(how)
+ }[how]
except KeyError:
raise ValueError("Invalid value for how: {}, must be left, right, "
"inner, or outer.".format(str(how)))
|
fixed join method lookup to not use ".get()"
This is so that KeyError is thrown if an unrecognized join method name is provided.
|
diff --git a/Library/Compiler.php b/Library/Compiler.php
index <HASH>..<HASH> 100755
--- a/Library/Compiler.php
+++ b/Library/Compiler.php
@@ -428,14 +428,16 @@ class Compiler
}
}
- /**
- * Load additional extension prototypes
- */
- foreach (new DirectoryIterator(ZEPHIRPATH . 'prototypes') as $file) {
- if (!$file->isDir()) {
- $extension = str_replace('.php', '', $file);
- if (!extension_loaded($extension)) {
- require $file->getRealPath();
+ if (is_dir(ZEPHIRPATH . 'prototypes') && is_readable(ZEPHIRPATH . 'prototypes')) {
+ /**
+ * Load additional extension prototypes
+ */
+ foreach (new DirectoryIterator(ZEPHIRPATH . 'prototypes') as $file) {
+ if (!$file->isDir()) {
+ $extension = str_replace('.php', '', $file);
+ if (!extension_loaded($extension)) {
+ require $file->getRealPath();
+ }
}
}
}
|
refs #NA Check prototypes folder before interator it
|
diff --git a/spring-session/src/test/java/org/springframework/session/web/http/SessionRepositoryFilterTests.java b/spring-session/src/test/java/org/springframework/session/web/http/SessionRepositoryFilterTests.java
index <HASH>..<HASH> 100644
--- a/spring-session/src/test/java/org/springframework/session/web/http/SessionRepositoryFilterTests.java
+++ b/spring-session/src/test/java/org/springframework/session/web/http/SessionRepositoryFilterTests.java
@@ -35,6 +35,7 @@ import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionContext;
+import org.assertj.core.data.Offset;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -150,8 +151,8 @@ public class SessionRepositoryFilterTests {
@Override
public void doFilter(HttpServletRequest wrappedRequest) {
long lastAccessed = wrappedRequest.getSession().getLastAccessedTime();
- assertThat(lastAccessed)
- .isEqualTo(wrappedRequest.getSession().getCreationTime());
+ assertThat(lastAccessed).isCloseTo(
+ wrappedRequest.getSession().getCreationTime(), Offset.offset(5L));
SessionRepositoryFilterTests.this.request.setAttribute(ACCESS_ATTR,
lastAccessed);
}
|
Fix SessionRepositoryFilterTests doFilterLastAccessedTime assertion
Relax the assertion so that it is not exact to avoid timing issues.
Fixes gh-<I>
|
diff --git a/lib/class/inode_file.js b/lib/class/inode_file.js
index <HASH>..<HASH> 100644
--- a/lib/class/inode_file.js
+++ b/lib/class/inode_file.js
@@ -60,6 +60,7 @@ File.setStatic(function from(obj) {
size : obj.size
};
+ file.name = obj.name;
file.type = obj.type;
file.hash = obj.hash;
}
|
Get file name from object if it's present
|
diff --git a/src/components/Response.php b/src/components/Response.php
index <HASH>..<HASH> 100644
--- a/src/components/Response.php
+++ b/src/components/Response.php
@@ -25,4 +25,14 @@ class Response extends \yii\web\Response
parent::sendContent();
}
+
+ public function refresh($anchor = '')
+ {
+ $request = Yii::$app->request;
+ if ($request->getIsAjax()) {
+ return $this->redirect($request->getReferrer() . $anchor);
+ }
+
+ return parent::refresh($anchor);
+ }
}
|
Fix. Ignore ajax request urls when redirect from hiam (#<I>)
|
diff --git a/src/test/java/org/op4j/AssortedTests.java b/src/test/java/org/op4j/AssortedTests.java
index <HASH>..<HASH> 100644
--- a/src/test/java/org/op4j/AssortedTests.java
+++ b/src/test/java/org/op4j/AssortedTests.java
@@ -1813,5 +1813,24 @@ public class AssortedTests extends TestCase {
Op.on(set).exec(FnSet.ofCalendar().count())
.get().intValue());
}
+
+ @Test
+ public void test68() throws Exception {
+ assertEquals("asd",
+ Op.on("<>asd<>").exec(FnString.substringBetween("<>"))
+ .get());
+
+ assertEquals("",
+ Op.on("<>asd<>").exec(FnString.substringBefore("<>"))
+ .get());
+
+ assertEquals("<>asd",
+ Op.on("<>asd<>").exec(FnString.substringBeforeLast("<>"))
+ .get());
+
+ assertEquals("as",
+ Op.on("<>asd<>").exec(FnString.substringBetween(">", "d"))
+ .get());
+ }
}
|
substringbefore, after and between added
git-svn-id: <URL>
|
diff --git a/taipan/collections/dicts.py b/taipan/collections/dicts.py
index <HASH>..<HASH> 100644
--- a/taipan/collections/dicts.py
+++ b/taipan/collections/dicts.py
@@ -126,6 +126,9 @@ def peekitem(dict_):
raise KeyError("peekitem(): dictionary is empty")
return next(iteritems(dict_))
+# TODO(xion): peekkey and peekvalue
+
+# TODO(xion): make the ``from_`` argument keyword-only in select() and omit()
def select(keys, from_, strict=False):
"""Selects a subset of given dictionary, including only the specified keys.
|
Add a few TODOs to .collections.dicts
|
diff --git a/tests/bindings/modalBindingBehaviors.js b/tests/bindings/modalBindingBehaviors.js
index <HASH>..<HASH> 100644
--- a/tests/bindings/modalBindingBehaviors.js
+++ b/tests/bindings/modalBindingBehaviors.js
@@ -179,4 +179,18 @@
expect(this.testElement).toContainElement('.modal-header #test');
});
+
+ it('Should render modal-dialog element with passed css classes', function () {
+ var vm = {
+ value: {
+ dialogCss: 'test-class',
+ header: { name: 'test-template' },
+ body: { name: 'test-template' },
+ }
+ };
+
+ ko.applyBindings(vm, this.testElement[0]);
+
+ expect(this.testElement).toContainElement('.modal-dialog.test-class');
+ });
});
\ No newline at end of file
|
Added test case for dialogCss property for modal binding
|
diff --git a/sheet_test.go b/sheet_test.go
index <HASH>..<HASH> 100644
--- a/sheet_test.go
+++ b/sheet_test.go
@@ -160,7 +160,8 @@ func (s *SheetSuite) TestMarshalSheetWithMultipleCells(c *C) {
cell = row.AddCell()
cell.Value = "A cell (with value 2)!"
refTable := NewSharedStringRefTable()
- xSheet := sheet.makeXLSXSheet(refTable)
+ styles := &xlsxStyles{}
+ xSheet := sheet.makeXLSXSheet(refTable, styles)
output := bytes.NewBufferString(xml.Header)
body, err := xml.MarshalIndent(xSheet, " ", " ")
@@ -177,10 +178,10 @@ func (s *SheetSuite) TestMarshalSheetWithMultipleCells(c *C) {
</cols>
<sheetData>
<row r="1">
- <c r="A1" t="s">
+ <c r="A1" s="0" t="s">
<v>0</v>
</c>
- <c r="B1" t="s">
+ <c r="B1" s="1" t="s">
<v>1</v>
</c>
</row>
|
Resolve failing tests from merge.
|
diff --git a/lib/httplog/http_log.rb b/lib/httplog/http_log.rb
index <HASH>..<HASH> 100644
--- a/lib/httplog/http_log.rb
+++ b/lib/httplog/http_log.rb
@@ -40,7 +40,7 @@ module HttpLog
url.to_s.match(options[:url_whitelist_pattern])
end
- def log(msg)
+ def log(msg, encoding='UTF-8')
# This builds a hash {0=>:DEBUG, 1=>:INFO, 2=>:WARN, 3=>:ERROR, 4=>:FATAL, 5=>:UNKNOWN}.
# Courtesy of the delayed_job gem in this commit:
# https://github.com/collectiveidea/delayed_job/commit/e7f5aa1ed806e61251bdb77daf25864eeb3aff59
@@ -92,7 +92,7 @@ module HttpLog
gz = Zlib::GzipReader.new( sio )
log("Response: (deflated)\n#{gz.read}")
else
- log("Response:\n#{body}")
+ log("Response:\n#{body}", encoding)
end
end
end
|
actually passing encoding to the log method. doh
|
diff --git a/salt/modules/ebuild.py b/salt/modules/ebuild.py
index <HASH>..<HASH> 100644
--- a/salt/modules/ebuild.py
+++ b/salt/modules/ebuild.py
@@ -17,6 +17,7 @@ import re
import salt.utils
# Import third party libs
+HAS_PORTAGE = False
try:
import portage
HAS_PORTAGE = True
@@ -30,8 +31,7 @@ except ImportError:
import portage
HAS_PORTAGE = True
except ImportError:
- HAS_PORTAGE = False
-
+ pass
log = logging.getLogger(__name__)
|
Bring `HAS_PORTAGE` to global scope, wrongly removed(by me).
|
diff --git a/pyout/tests/test_tabular.py b/pyout/tests/test_tabular.py
index <HASH>..<HASH> 100644
--- a/pyout/tests/test_tabular.py
+++ b/pyout/tests/test_tabular.py
@@ -257,10 +257,10 @@ def test_tabular_write_multicolor():
assert_eq_repr(out.stdout, expected)
-def test_tabular_write_empty_string_nostyle():
+def test_tabular_write_all_whitespace_nostyle():
out = Tabular(style={"name": {"color": "green"}})
- out({"name": ""})
- assert_eq_repr(out.stdout, "\n")
+ out({"name": " "})
+ assert_eq_repr(out.stdout, " \n")
def test_tabular_write_style_flanking():
|
tests: Update "don't style empty string" check
With the next commit, render() won't be called with zero-width values.
Pass a value with spaces to trigger the "all whitespace" code path in
TermProcessors.render(). Also rename the test to make it clear that
the tested behavior isn't strictly limited to empty strings.
|
diff --git a/toolkits/golang.go b/toolkits/golang.go
index <HASH>..<HASH> 100644
--- a/toolkits/golang.go
+++ b/toolkits/golang.go
@@ -25,7 +25,7 @@ import (
)
const (
- minGoVersionForToolkit = "1.7.3"
+ minGoVersionForToolkit = "1.7.4"
)
// === Base Toolkit struct ===
|
Go <I> (#<I>)
|
diff --git a/lib/guard/rspec/runner.rb b/lib/guard/rspec/runner.rb
index <HASH>..<HASH> 100644
--- a/lib/guard/rspec/runner.rb
+++ b/lib/guard/rspec/runner.rb
@@ -50,7 +50,6 @@ module Guard
def failure_exit_code_supported?
@failure_exit_code_supported ||= begin
cmd_parts = []
- cmd_parts << environment_variables
cmd_parts << "bundle exec" if bundle_exec?
cmd_parts << rspec_executable
cmd_parts << "--help"
@@ -103,8 +102,8 @@ module Guard
def rspec_command(paths, options)
cmd_parts = []
- cmd_parts << "rvm #{@options[:rvm].join(',')} exec" if @options[:rvm].respond_to?(:join)
cmd_parts << environment_variables
+ cmd_parts << "rvm #{@options[:rvm].join(',')} exec" if @options[:rvm].respond_to?(:join)
cmd_parts << "bundle exec" if bundle_exec?
cmd_parts << rspec_executable
cmd_parts << rspec_arguments(paths, options)
|
export environment before rvm exec
|
diff --git a/http-client/src/main/java/io/micronaut/http/client/interceptor/HttpClientIntroductionAdvice.java b/http-client/src/main/java/io/micronaut/http/client/interceptor/HttpClientIntroductionAdvice.java
index <HASH>..<HASH> 100644
--- a/http-client/src/main/java/io/micronaut/http/client/interceptor/HttpClientIntroductionAdvice.java
+++ b/http-client/src/main/java/io/micronaut/http/client/interceptor/HttpClientIntroductionAdvice.java
@@ -185,9 +185,11 @@ public class HttpClientIntroductionAdvice implements MethodInterceptor<Object, O
String headerValue = header.value();
headers.put(headerName, headerValue);
}
- } else {
- Header header = context.getAnnotation(Header.class);
- headers.put(header.name(), header.value());
+ }
+
+ Header headerAnnotation = context.getAnnotation(Header.class);
+ if (headerAnnotation != null) {
+ headers.put(headerAnnotation.name(), headerAnnotation.value());
}
List<NettyCookie> cookies = new ArrayList<>();
|
Handle header only if the Header annotation is present
|
diff --git a/PhpAmqpLib/Connection/AbstractConnection.php b/PhpAmqpLib/Connection/AbstractConnection.php
index <HASH>..<HASH> 100644
--- a/PhpAmqpLib/Connection/AbstractConnection.php
+++ b/PhpAmqpLib/Connection/AbstractConnection.php
@@ -268,7 +268,7 @@ class AbstractConnection extends AbstractChannel
// Try to close the AMQP connection
$this->safeClose();
// Reconnect the socket/stream then AMQP
- $this->getIO()->reconnect();
+ $this->getIO()->close();
$this->setIsConnected(false); // getIO can initiate the connection setting via LazyConnection, set it here to be sure
$this->connect();
}
diff --git a/PhpAmqpLib/Wire/IO/AbstractIO.php b/PhpAmqpLib/Wire/IO/AbstractIO.php
index <HASH>..<HASH> 100644
--- a/PhpAmqpLib/Wire/IO/AbstractIO.php
+++ b/PhpAmqpLib/Wire/IO/AbstractIO.php
@@ -117,17 +117,6 @@ abstract class AbstractIO
abstract public function connect();
/**
- * Reconnects the socket
- * @return void
- * @throws \PhpAmqpLib\Exception\AMQPIOException
- */
- public function reconnect()
- {
- $this->close();
- $this->connect();
- }
-
- /**
* @return resource
*/
abstract public function getSocket();
|
Remove AbstractIO reconnect as it is only used, incorrectly, in one place
Fixes #<I>
|
diff --git a/tests/test_distro.py b/tests/test_distro.py
index <HASH>..<HASH> 100644
--- a/tests/test_distro.py
+++ b/tests/test_distro.py
@@ -99,20 +99,18 @@ class TestCli:
import json
root_dir = os.path.join(RESOURCES, 'cli', 'fedora30')
command = [sys.executable, '-m', 'distro', '-j', '--root-dir', root_dir]
- desired_output = '''
- {
- "codename": "",
- "id": "fedora",
- "like": "",
- "version": "30",
- "version_parts": {
- "build_number": "",
- "major": "30",
- "minor": ""
+ desired_output = {
+ 'codename': '',
+ 'id': 'fedora',
+ 'like': '',
+ 'version': '30',
+ 'version_parts': {
+ 'build_number': '',
+ 'major': '30',
+ 'minor': '',
}
}
- '''
- desired_output = json.loads(desired_output)
+
results = json.loads(self._run(command))
assert desired_output == results
|
Prefer mapping to JSON string as test expectation
This is easier to read and maintain and more resilient to formatting
changes.
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -108,6 +108,7 @@ JSHinter.prototype.testGenerator = function(relativePath, passed, errors) {
return "QUnit.module('JSHint - " + path.dirname(relativePath) + "');\n" +
"QUnit.test('" + relativePath + " should pass jshint', function(assert) { \n" +
+ " assert.expect(1);\n" +
" assert.ok(" + !!passed + ", '" + relativePath + " should pass jshint." + errors + "'); \n" +
"});\n"
};
|
Add assert.expect to generated tests
|
diff --git a/app/controllers/navigation.js b/app/controllers/navigation.js
index <HASH>..<HASH> 100644
--- a/app/controllers/navigation.js
+++ b/app/controllers/navigation.js
@@ -5,6 +5,7 @@ import ProgressDialog from 'hospitalrun/mixins/progress-dialog';
import UserSession from 'hospitalrun/mixins/user-session';
import Navigation from 'hospitalrun/mixins/navigation';
export default Ember.Controller.extend(HospitalRunVersion, ModalHelper, ProgressDialog, UserSession, Navigation, {
+ ajax: Ember.inject.service(),
application: Ember.inject.controller(),
allowSearch: false,
config: Ember.inject.service(),
@@ -18,9 +19,8 @@ export default Ember.Controller.extend(HospitalRunVersion, ModalHelper, Progress
actions: {
about: function() {
- let config = this.get('config'),
- version = this.get('version');
- config.getConfigValue('site_information', '').then((siteInfo) => {
+ let version = this.get('version');
+ this.get('ajax').request('/serverinfo').then((siteInfo) => {
let message = `Version: ${version}`;
if (!Ember.isEmpty(siteInfo)) {
message += ` Site Info: ${siteInfo}`;
|
Changed to pull site/sever information from server config
|
diff --git a/class.contextio.php b/class.contextio.php
index <HASH>..<HASH> 100755
--- a/class.contextio.php
+++ b/class.contextio.php
@@ -296,7 +296,7 @@ class ContextIO {
}
public function addUser($params) {
- $params = $this->_filterParams($params, array('email','first_name','last_name','type','server','username','provider_consumer_key','provider_token','provider_token_secret','service_level','password','use_ssl','port','raw_file_list','expunge_on_deleted_flag'), array('email'));
+ $params = $this->_filterParams($params, array('email','first_name','last_name','type','server','username','provider_consumer_key','provider_token','provider_token_secret','service_level','password','use_ssl','port','raw_file_list','expunge_on_deleted_flag', 'migrate_account_id'), array('email'));
if ($params === false) {
throw new InvalidArgumentException("params array contains invalid parameters or misses required parameters");
}
|
added migrate_account_id as a valid param on post->users.
|
diff --git a/lib/cli.js b/lib/cli.js
index <HASH>..<HASH> 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -105,14 +105,15 @@ function run() {
return done()
function done() {
- info('listening on '+port)
+ info('listening on http://localhost:' + port + '/')
+
return serve(
cwd
, browserify
, browserify_args
, entry_points
, parsed.live
- , log
+ , log
).listen(port)
}
|
expose a clickable URL for those terminals supporting it.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
setup(
name='django-genes',
- version='0.6',
+ version='0.7',
packages=find_packages(),
include_package_data=True,
license='LICENSE.txt',
|
Bumping django-genes package version # to reflect the addition of auto-complete search.
|
diff --git a/lib/user_stream/version.rb b/lib/user_stream/version.rb
index <HASH>..<HASH> 100644
--- a/lib/user_stream/version.rb
+++ b/lib/user_stream/version.rb
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
module UserStream
- VERSION = "1.2.4"
+ VERSION = "1.3.0"
end
|
Version bump to <I>.
|
diff --git a/lib/xdr/struct.rb b/lib/xdr/struct.rb
index <HASH>..<HASH> 100644
--- a/lib/xdr/struct.rb
+++ b/lib/xdr/struct.rb
@@ -9,7 +9,7 @@ class XDR::Struct
attribute_method_prefix 'read_'
attribute_method_suffix 'write_'
-
+
class_attribute :fields
self.fields = ActiveSupport::OrderedHash.new
@@ -68,6 +68,14 @@ class XDR::Struct
other.attributes == self.attributes
end
+ def eql? (other)
+ return false unless other.is_a?(self.class)
+ other.attributes.eql? self.attributes
+ end
+
+ def hash
+ [self.class, self.attribues].hash
+ end
def read_attribute(attr)
@attributes[attr]
diff --git a/lib/xdr/union.rb b/lib/xdr/union.rb
index <HASH>..<HASH> 100644
--- a/lib/xdr/union.rb
+++ b/lib/xdr/union.rb
@@ -114,6 +114,16 @@ class XDR::Union
other.value == self.value
end
+ def eql?(other)
+ return false unless other.is_a?(self.class)
+ return false unless other.switch.eql? self.switch
+ other.value.eql? self.value
+ end
+
+ def hash
+ [self.class, self.switch, self.value].hash
+ end
+
private
def valid_for_arm_type(value, arm)
arm_type = arms[@arm]
|
Add eql? and hash implementations for struct and union
Allows for `uniq` to behave as expected
|
diff --git a/lib/jammit/compressor.rb b/lib/jammit/compressor.rb
index <HASH>..<HASH> 100644
--- a/lib/jammit/compressor.rb
+++ b/lib/jammit/compressor.rb
@@ -22,7 +22,7 @@ module Jammit
# Font extensions for which we allow embedding:
EMBED_EXTS = EMBED_MIME_TYPES.keys
- EMBED_FONTS = ['.ttf', '.otf']
+ EMBED_FONTS = ['.ttf', '.otf', '.woff']
# (32k - padding) maximum length for data-uri assets (an IE8 limitation).
MAX_IMAGE_SIZE = 32700
|
allow .woff fonts to be embedded.
|
diff --git a/bin/ember-template-lint.js b/bin/ember-template-lint.js
index <HASH>..<HASH> 100755
--- a/bin/ember-template-lint.js
+++ b/bin/ember-template-lint.js
@@ -193,7 +193,8 @@ async function run() {
let resultsAccumulator = [];
for (let relativeFilePath of filesToLint) {
- let resolvedFilePath = path.resolve(relativeFilePath);
+ // on Windows the attempt to resolve the '/dev/stdin' doesn't return '/dev/stdin', hence explicit check
+ let resolvedFilePath = relativeFilePath === STDIN ? STDIN : path.resolve(relativeFilePath);
let filePath = resolvedFilePath === STDIN ? options.filename || '' : relativeFilePath;
let moduleId = filePath.slice(0, -4);
let messages = await lintFile(linter, filePath, resolvedFilePath, moduleId, options.fix);
|
fix ENOENT: no such file or directory, open 'D:\dev\stdin' error on Windows
|
diff --git a/spec/factories/socializer_ties.rb b/spec/factories/socializer_ties.rb
index <HASH>..<HASH> 100644
--- a/spec/factories/socializer_ties.rb
+++ b/spec/factories/socializer_ties.rb
@@ -2,5 +2,6 @@
FactoryGirl.define do
factory :socializer_tie, class: Socializer::Tie do
+ association :activity_contact, factory: :socializer_activity_object_person
end
end
diff --git a/spec/models/socializer/tie_spec.rb b/spec/models/socializer/tie_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/models/socializer/tie_spec.rb
+++ b/spec/models/socializer/tie_spec.rb
@@ -17,6 +17,7 @@ module Socializer
it { is_expected.to belong_to(:activity_contact) }
end
- it { is_expected.to respond_to(:contact) }
+ # TODO: Test return values
+ it { expect(tie.contact).to be_kind_of(Socializer::Person) }
end
end
|
check the return type for contact
add the activity_contact association to the factory
|
diff --git a/code/PollAdmin.php b/code/PollAdmin.php
index <HASH>..<HASH> 100644
--- a/code/PollAdmin.php
+++ b/code/PollAdmin.php
@@ -6,7 +6,6 @@ class PollAdmin extends ModelAdmin {
private static $url_segment = 'polls';
private static $menu_title = 'Polls';
private static $menu_icon = 'silverstripe-polls/images/poll.png';
- private static $menu_priority = -0.48;
public function getList() {
$list = parent::getList();
|
removing menu priority, developer should use yml config file
|
diff --git a/install/lib/class.installer.php b/install/lib/class.installer.php
index <HASH>..<HASH> 100644
--- a/install/lib/class.installer.php
+++ b/install/lib/class.installer.php
@@ -1,6 +1,7 @@
<?php
require_once(CORE . '/class.administration.php');
+ require_once(TOOLKIT . '/class.cryptography.php');
require_once(TOOLKIT . '/class.lang.php');
require_once(INSTALL . '/lib/class.installerpage.php');
@@ -434,7 +435,7 @@
Symphony::Database()->insert(array(
'id' => 1,
'username' => Symphony::Database()->cleanValue($fields['user']['username']),
- 'password' => sha1(Symphony::Database()->cleanValue($fields['user']['password'])),
+ 'password' => Cryptography::hash(Symphony::Database()->cleanValue($fields['user']['password'])),
'first_name' => Symphony::Database()->cleanValue($fields['user']['firstname']),
'last_name' => Symphony::Database()->cleanValue($fields['user']['lastname']),
'email' => Symphony::Database()->cleanValue($fields['user']['email']),
|
Installer uses Cryptography::hash() instead of sha1() during installation
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ METADATA = dict(
SETUPTOOLS_METADATA = dict(
- install_requires = ['setuptools', 'requests'],
+ install_requires = ['setuptools', 'requests', 'numpy', 'matplotlib'],
include_package_data = True
)
@@ -47,8 +47,8 @@ def Main():
METADATA.update(SETUPTOOLS_METADATA)
setuptools.setup(**METADATA)
except ImportError:
- print "Could not import setuptools, using distutils"
- print "NOTE: You will need to install dependencies manualy"
+ print("Could not import setuptools, using distutils")
+ print("NOTE: You will need to install dependencies manualy")
import distutils.core
distutils.core.setup(**METADATA)
|
working towards python3 compatibility re #<I>
|
diff --git a/perseuspy/__init__.py b/perseuspy/__init__.py
index <HASH>..<HASH> 100644
--- a/perseuspy/__init__.py
+++ b/perseuspy/__init__.py
@@ -68,6 +68,8 @@ def read_perseus(path_or_file, type_map = perseus_to_dtype, **kwargs):
"""
annotations = read_annotations(path_or_file, separator, type_map)
column_index = create_column_index(annotations)
+ if 'usecols' in kwargs:
+ column_index = column_index[kwargs['usecols']]
if 'Type' in annotations:
dtype = {name : t for name, t in zip(annotations['Column Name'], annotations['Type'])}
if 'dtype' in kwargs:
|
handle 'usecols' kwarg in read.perseus
|
diff --git a/lib/vagrant/bundler.rb b/lib/vagrant/bundler.rb
index <HASH>..<HASH> 100644
--- a/lib/vagrant/bundler.rb
+++ b/lib/vagrant/bundler.rb
@@ -146,7 +146,7 @@ module Vagrant
'local_source' => plugin_source
}
}
- internal_install(plugin_info, {})
+ internal_install(plugin_info, {}, local_install: true)
plugin_source.spec
end
@@ -224,8 +224,10 @@ module Vagrant
def internal_install(plugins, update, **extra)
- update = {} unless update.is_a?(Hash)
+ # Only clear Gem sources if not performing local install
+ Gem.sources.clear if !extra[:local_install]
+ update = {} unless update.is_a?(Hash)
installer_set = Gem::Resolver::InstallerSet.new(:both)
# Generate all required plugin deps
|
Only install from defined sources unless install is local
|
diff --git a/tests/SetterTests.php b/tests/SetterTests.php
index <HASH>..<HASH> 100644
--- a/tests/SetterTests.php
+++ b/tests/SetterTests.php
@@ -43,8 +43,9 @@ class SetterTests extends TestCase
{
$stub = new ModelBaseServiceStub();
- $stub->service = new BaseServiceStub();
- $this->assertInstanceOf(BaseServiceStub::class, $stub->service);
+ $service = new BaseServiceStub();
+ $stub->service = $service;
+ $this->assertSame($service, $stub->service);
}
public function testSetUnknown(): void
|
test - setter - improve inspection
|
diff --git a/parse.go b/parse.go
index <HASH>..<HASH> 100644
--- a/parse.go
+++ b/parse.go
@@ -93,17 +93,6 @@ func (p *parser) readByte() byte {
return b
}
-func (p *parser) discByte(b byte) {
- if p.nextErr != nil {
- p.errPass(p.nextErr)
- return
- }
- if _, err := p.br.Discard(1); err != nil {
- p.errPass(err)
- }
- p.npos = moveWith(p.npos, b)
-}
-
func moveWith(pos Pos, b byte) Pos {
if b == '\n' {
pos.Line++
@@ -137,7 +126,7 @@ func (p *parser) willRead(b byte) bool {
func (p *parser) readOnly(b byte) bool {
if p.willRead(b) {
- p.discByte(b)
+ p.readByte()
return true
}
return false
@@ -854,7 +843,7 @@ func (p *parser) arithmEnd(left Pos) Pos {
if !p.peekArithmEnd() {
p.matchingErr(left, DLPAREN, DRPAREN)
}
- p.discByte(')')
+ p.readByte()
p.popStop()
p.next()
return p.lpos
|
parse: replace discByte(byte)
Now that this is no longer in any critical paths, it's unnecessary.
|
diff --git a/src/java/org/apache/cassandra/utils/StreamingHistogram.java b/src/java/org/apache/cassandra/utils/StreamingHistogram.java
index <HASH>..<HASH> 100644
--- a/src/java/org/apache/cassandra/utils/StreamingHistogram.java
+++ b/src/java/org/apache/cassandra/utils/StreamingHistogram.java
@@ -127,10 +127,10 @@ public class StreamingHistogram
}
/**
- * Calculates estimated number of points in interval [-∞,b].
+ * Calculates estimated number of points in interval [-inf,b].
*
* @param b upper bound of a interval to calculate sum
- * @return estimated number of points in a interval [-∞,b].
+ * @return estimated number of points in a interval [-inf,b].
*/
public double sum(double b)
{
|
Avoid special characters which might confuse ant.
|
diff --git a/tests/test_api.py b/tests/test_api.py
index <HASH>..<HASH> 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -46,13 +46,8 @@ class TestAPI(object):
dataless_uuid = "ed9e7ddd-3e97-452d-9e34-fee5d432258e"
dallinger.data.register(dataless_uuid, "https://bogus-url.com/something")
- try:
+ with pytest.raises(RuntimeError):
data = exp.collect(dataless_uuid, recruiter="bots")
- except RuntimeError:
- # This is expected for an already registered UUID with no accessible data
- pass
- else:
- pytest.fail("Did not raise RuntimeError for existing UUID")
# In debug mode an unknown UUID fails
unknown_uuid = "c85d5086-2fa7-4baf-9103-e142b9170cca"
|
Use pytest.raises() consistently
|
diff --git a/examples/dendrogram.py b/examples/dendrogram.py
index <HASH>..<HASH> 100644
--- a/examples/dendrogram.py
+++ b/examples/dendrogram.py
@@ -31,7 +31,7 @@
from neurom.view import common
from neurom.analysis.morphmath import segment_length
-from neurom.core.tree import isegment
+from neurom.core.tree import isegment, val_iter
from matplotlib.collections import LineCollection
@@ -53,7 +53,7 @@ def get_transformed_position(segment, segments_dict, y_length):
(x0, y0), line_type = segments_dict[start_node_id]
# increase horizontal dendrogram length by segment length
- x1 = x0 + segment_length(segment)
+ x1 = x0 + segment_length(list(val_iter(segment)))
# if the parent node is visited for the first time
# the dendrogram segment is drawn from below. If it
|
fix for segment length function in dendrogram example
|
diff --git a/torchvision/transforms/functional.py b/torchvision/transforms/functional.py
index <HASH>..<HASH> 100644
--- a/torchvision/transforms/functional.py
+++ b/torchvision/transforms/functional.py
@@ -85,14 +85,8 @@ def to_tensor(pic):
img = 255 * torch.from_numpy(np.array(pic, np.uint8, copy=False))
else:
img = torch.ByteTensor(torch.ByteStorage.from_buffer(pic.tobytes()))
- # PIL image mode: L, LA, P, I, F, RGB, YCbCr, RGBA, CMYK
- if pic.mode == 'YCbCr':
- nchannel = 3
- elif pic.mode == 'I;16':
- nchannel = 1
- else:
- nchannel = len(pic.mode)
- img = img.view(pic.size[1], pic.size[0], nchannel)
+
+ img = img.view(pic.size[1], pic.size[0], len(pic.getbands()))
# put it from HWC to CHW format
# yikes, this transpose takes 80% of the loading time/CPU
img = img.transpose(0, 1).transpose(0, 2).contiguous()
|
generalize number of bands calculation in to_tensor (#<I>)
|
diff --git a/atomic_reactor/plugins/exit_koji_promote.py b/atomic_reactor/plugins/exit_koji_promote.py
index <HASH>..<HASH> 100644
--- a/atomic_reactor/plugins/exit_koji_promote.py
+++ b/atomic_reactor/plugins/exit_koji_promote.py
@@ -513,7 +513,7 @@ class KojiPromotePlugin(ExitPlugin):
if not isinstance(source, GitSource):
raise RuntimeError('git source required')
- extra = {}
+ extra = {'image': {}}
koji_task_id = metadata.get('labels', {}).get('koji-task-id')
if koji_task_id is not None:
self.log.info("build configuration created by Koji Task ID %s",
|
koji_promote: seems like build.extra.image is required
It is not listed in the specification any more, but builds do
not display correctly without this.
|
diff --git a/admin_tools/menu/utils.py b/admin_tools/menu/utils.py
index <HASH>..<HASH> 100644
--- a/admin_tools/menu/utils.py
+++ b/admin_tools/menu/utils.py
@@ -5,14 +5,13 @@ Menu utilities.
import types
from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured
from django.utils.importlib import import_module
from django.core.urlresolvers import reverse
def _get_menu_cls(menu_cls, context):
if type(menu_cls) is types.DictType:
- curr_url = context.get('request').META['PATH_INFO']
+ curr_url = context.get('request').path
for key in menu_cls:
admin_site_mod, admin_site_inst = key.rsplit('.', 1)
admin_site_mod = import_module(admin_site_mod)
|
fixed admin path error when calculating menu class to use
|
diff --git a/forum/__init__.py b/forum/__init__.py
index <HASH>..<HASH> 100644
--- a/forum/__init__.py
+++ b/forum/__init__.py
@@ -1,2 +1,2 @@
"""A minimalistic Django forum app"""
-__version__ = '0.7.3'
+__version__ = '0.7.4'
diff --git a/forum/signals.py b/forum/signals.py
index <HASH>..<HASH> 100644
--- a/forum/signals.py
+++ b/forum/signals.py
@@ -19,12 +19,10 @@ def new_message_posted_receiver(sender, **kwargs):
'thread_instance': post_instance.thread,
'post_instance': post_instance,
}
- subject = ''.join(render_to_string('forum/threadwatch_email_subject.txt', context).splitlines())
- content = render_to_string('forum/threadwatch_email_content.txt', context)
+ subject = ''.join(render_to_string('forum/threadwatch/email_subject.txt', context).splitlines())
+ content = render_to_string('forum/threadwatch/email_content.txt', context)
for item in threadwatchs:
- #print "*", item, "for", item.owner
- # (subject, message, from_email, recipient_list)
emails_datas.append((
subject,
content,
|
Fix bad template names in threadwatch sending, close #<I>, bump to <I>
|
diff --git a/store.js b/store.js
index <HASH>..<HASH> 100644
--- a/store.js
+++ b/store.js
@@ -2,7 +2,8 @@ var store = (function(){
var api = {},
win = window,
doc = win.document,
- name = 'localStorage',
+ localStorageName = 'localStorage',
+ globalStorageName = 'globalStorage',
storage
api.set = function(key, value) {}
@@ -10,14 +11,14 @@ var store = (function(){
api.remove = function(key) {}
api.clear = function() {}
- if (win.localStorage) {
- storage = win.localStorage
+ if (localStorageName in win && win[localStorageName]) {
+ storage = win[localStorageName]
api.set = function(key, val) { storage[key] = val }
api.get = function(key) { return storage[key] }
api.remove = function(key) { delete storage[key] }
api.clear = function() { storage.clear() }
- } else if (win.globalStorage) {
- storage = win.globalStorage[win.location.hostname]
+ } else if (globalStorageName in win && win[globalStorageName]) {
+ storage = win[globalStorageName][win.location.hostname]
api.set = function(key, val) { storage[key] = val }
api.get = function(key) { return storage[key] && storage[key].value }
api.remove = function(key) { delete storage[key] }
|
Fix issue 2. Thanks Paul Irish for the suggested fix and relevant links.
See <URL>
|
diff --git a/src/main/java/org/zeromq/ZMQException.java b/src/main/java/org/zeromq/ZMQException.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/zeromq/ZMQException.java
+++ b/src/main/java/org/zeromq/ZMQException.java
@@ -43,6 +43,18 @@ public class ZMQException extends RuntimeException
code = errno;
}
+ public ZMQException(String message, int errno)
+ {
+ super(message);
+ code = errno;
+ }
+
+ public ZMQException(ZMQException cause)
+ {
+ super(cause.getMessage(), cause);
+ code = cause.code;
+ }
+
public int getErrorCode()
{
return code;
|
Added constructors to ZMQException
|
diff --git a/src/test/java/benchmark/Synchronized_Versus_ReentrantLock.java b/src/test/java/benchmark/Synchronized_Versus_ReentrantLock.java
index <HASH>..<HASH> 100644
--- a/src/test/java/benchmark/Synchronized_Versus_ReentrantLock.java
+++ b/src/test/java/benchmark/Synchronized_Versus_ReentrantLock.java
@@ -2,7 +2,6 @@ package benchmark;
import com.carrotsearch.junitbenchmarks.AbstractBenchmark;
-import com.sun.servicetag.SystemEnvironment;
import org.junit.Test;
import org.mapdb.CC;
diff --git a/src/test/java/org/mapdb/Gen.java b/src/test/java/org/mapdb/Gen.java
index <HASH>..<HASH> 100644
--- a/src/test/java/org/mapdb/Gen.java
+++ b/src/test/java/org/mapdb/Gen.java
@@ -61,7 +61,7 @@ public class Gen<T> implements TestRule {
try {
test.evaluate();
} catch (Throwable t) {
- errorCollector.addError(new AssertionError("For value: "
+ errorCollector.addError(new Error("For value: "
+ v, t));
}
}
|
Make it compilable on JDK6
|
diff --git a/Kwc/Abstract/Image/ImageFile.php b/Kwc/Abstract/Image/ImageFile.php
index <HASH>..<HASH> 100644
--- a/Kwc/Abstract/Image/ImageFile.php
+++ b/Kwc/Abstract/Image/ImageFile.php
@@ -11,7 +11,7 @@ class Kwc_Abstract_Image_ImageFile extends Kwf_Form_Field_File
public function load($row, $postData = array())
{
$ret = parent::load($row, $postData);
- $component = Kwf_Component_Data_Root::getInstance()->getComponentByDbId($row->component_id, array('ignoreVisible' => true));
+ $component = Kwf_Component_Data_Root::getInstance()->getComponentByDbId($row->component_id, array('ignoreVisible' => true, 'limit' => 1));
if ($component) { //component can be non-existent if it's in a not selected card
if (is_instance_of($component->componentClass, 'Kwc_Abstract_Image_Component')) {
$contentWidth = $component->getComponent()->getMaxContentWidth();
|
Fix Image Admin for components where multiple exist for one db id
|
diff --git a/css.js b/css.js
index <HASH>..<HASH> 100644
--- a/css.js
+++ b/css.js
@@ -1,4 +1,4 @@
-define(['./core/extend', './css/builder', './request'], function(extend, builder, request) {
+define(['./core/extend', './core/deferredUtils', './css/builder', './request'], function(extend, def, builder, request) {
'use strict';
var result = {},
ielt10 = (function () {
@@ -258,6 +258,21 @@ define(['./core/extend', './css/builder', './request'], function(extend, builder
result.style = buildStyleObject;
+ result.loadFromString = function (css, uniqueId) {
+ var packages;
+ if (isDojo) {
+ packages = window.dojoConfig.packages;
+ }
+ else {
+ packages = requirejs.s.contexts._.config.packages;
+ }
+ var defer = def.defer();
+ loadStyle(css, uniqueId, packages, '', true, function (styleObj) {
+ defer.resolve(styleObj);
+ });
+ return defer.promise;
+ };
+
result.load = function(id, require, load)
{
/* jshint unused: true */
|
css now can load from string
|
diff --git a/lib/notee/helpers/notee_helper.rb b/lib/notee/helpers/notee_helper.rb
index <HASH>..<HASH> 100644
--- a/lib/notee/helpers/notee_helper.rb
+++ b/lib/notee/helpers/notee_helper.rb
@@ -63,17 +63,6 @@ module Notee
@posts = Notee::Post.where(user_id: writer.id, status: Notee::STATUS[:published], is_deleted: false).order(published_at: :desc)
end
- def notee_categories
-
- notee_categories_arr = {}
-
- get_parent_categories_arr.each do |cate|
- post_count = get_category_posts_count(cate)
- notee_categories_arr.store(cate.name, [post_count, cate])
- end
-
- notee_categories_arr
- end
def notee_archives
posts = Notee::Post.select(:published_at).where(status: 1, is_deleted: false).order(created_at: :desc)
@@ -142,6 +131,8 @@ module Notee
count
end
+ private
+
def recursive_category_family_loop(category, count)
if category.children.present?
category.children.each do |child_cate|
|
delete notee_categories method
|
diff --git a/lib/dugway/store.rb b/lib/dugway/store.rb
index <HASH>..<HASH> 100644
--- a/lib/dugway/store.rb
+++ b/lib/dugway/store.rb
@@ -131,7 +131,12 @@ module Dugway
end
def lookup(permalink, array)
- array.find { |item| item['permalink'] == permalink }.try(:dup)
+ if item = array.find { |item| item['permalink'] == permalink }
+ # Create a deep copy
+ Marshal.load(Marshal.dump(item))
+ else
+ nil
+ end
end
def lookup_products(permalink, type)
|
Create a deep copy of lookup items. Fixes #<I>
|
diff --git a/src/Bot.php b/src/Bot.php
index <HASH>..<HASH> 100644
--- a/src/Bot.php
+++ b/src/Bot.php
@@ -227,7 +227,7 @@ class Bot
* and monitor those connections for events to forward to plugins.
*
* @param bool $autorun
- *
+ *
* @throws \RuntimeException if configuration is inconsistent with
* expected structure
*/
|
Removed whitespace at end of line
|
diff --git a/tensorpack/tfutils/distributions.py b/tensorpack/tfutils/distributions.py
index <HASH>..<HASH> 100644
--- a/tensorpack/tfutils/distributions.py
+++ b/tensorpack/tfutils/distributions.py
@@ -172,7 +172,7 @@ class CategoricalDistribution(Distribution):
def _loglikelihood(self, x, theta):
eps = 1e-8
- return tf.reduce_sum(tf.log(theta + eps) * x, reduction_indices=1)
+ return tf.reduce_sum(tf.log(theta + eps) * x, 1)
def _encoder_activation(self, dist_param):
return tf.nn.softmax(dist_param)
@@ -214,8 +214,7 @@ class GaussianDistribution(Distribution):
exponent = (x - mean) / (stddev + eps)
return tf.reduce_sum(
- - 0.5 * np.log(2 * np.pi) - tf.log(stddev + eps) - 0.5 * tf.square(exponent),
- reduction_indices=1
+ - 0.5 * np.log(2 * np.pi) - tf.log(stddev + eps) - 0.5 * tf.square(exponent), 1
)
def _encoder_activation(self, dist_param):
|
reduction_indices was deprecated in TF
|
diff --git a/decode.go b/decode.go
index <HASH>..<HASH> 100644
--- a/decode.go
+++ b/decode.go
@@ -362,7 +362,16 @@ func createNewOutInner(outInnerWasPointer bool, outInnerType reflect.Type) refle
func setInnerField(outInner *reflect.Value, outInnerWasPointer bool, index []int, value string, omitEmpty bool) error {
oi := *outInner
if outInnerWasPointer {
+ // initialize nil pointer
+ if oi.IsNil() {
+ setField(oi, "", omitEmpty)
+ }
oi = outInner.Elem()
}
+ // because pointers can be nil need to recurse one index at a time and perform nil check
+ if len(index) > 1 {
+ nextField := oi.Field(index[0])
+ return setInnerField(&nextField, nextField.Kind() == reflect.Ptr, index[1:], value, omitEmpty)
+ }
return setField(oi.FieldByIndex(index), value, omitEmpty)
}
|
initialize nil pointer values on decode for nested structs
|
diff --git a/lib/serverspec/type/x509_certificate.rb b/lib/serverspec/type/x509_certificate.rb
index <HASH>..<HASH> 100644
--- a/lib/serverspec/type/x509_certificate.rb
+++ b/lib/serverspec/type/x509_certificate.rb
@@ -84,9 +84,9 @@ module Serverspec::Type
# Normalize output between openssl versions.
def normalize_dn(dn)
- return subject unless subject.start_with?('/')
+ return dn unless dn.start_with?('/')
# normalize openssl >= 1.1 to < 1.1 output
- subject[1..-1].split('/').join(', ').gsub('=', ' = ')
+ dn[1..-1].split('/').join(', ').gsub('=', ' = ')
end
end
end
|
Fixed infinite loop in subject of x<I>_certificate
|
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
index <HASH>..<HASH> 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
@@ -29,6 +29,7 @@ import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Transaction;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
+import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
import java.lang.reflect.Constructor;
@@ -193,6 +194,11 @@ public class RemoteGraph implements Graph {
return RemoteFeatures.INSTANCE;
}
+ @Override
+ public String toString() {
+ return StringFactory.graphString(this, connection.toString());
+ }
+
public static class RemoteFeatures implements Features {
static RemoteFeatures INSTANCE = new RemoteFeatures();
|
Cleaned up the toString() on RemoteGraph.
|
diff --git a/openstack_dashboard/dashboards/project/dashboard.py b/openstack_dashboard/dashboards/project/dashboard.py
index <HASH>..<HASH> 100644
--- a/openstack_dashboard/dashboards/project/dashboard.py
+++ b/openstack_dashboard/dashboards/project/dashboard.py
@@ -45,22 +45,22 @@ class ObjectStorePanels(horizon.PanelGroup):
class OrchestrationPanels(horizon.PanelGroup):
- name = _("Orchestration")
slug = "orchestration"
+ name = _("Orchestration")
panels = ('stacks',
'stacks.resource_types',)
class DatabasePanels(horizon.PanelGroup):
- name = _("Database")
slug = "database"
+ name = _("Database")
panels = ('databases',
'database_backups',)
class DataProcessingPanels(horizon.PanelGroup):
- name = _("Data Processing")
slug = "data_processing"
+ name = _("Data Processing")
panels = ('data_processing.wizard',
'data_processing.clusters',
'data_processing.job_executions',
|
Sort the panel's variable in the dashboards.py
In the dashboards.py some PanelGroup's variable
use(slug,name.panels), and some use(name, slug, panels),
we can unit it, used as(slug,name.panels).
Change-Id: If<I>fcb<I>c<I>c<I>db8bceb4ed<I>c<I>
Closes-bug:#<I>
|
diff --git a/src/performance/captureHardNavigation.js b/src/performance/captureHardNavigation.js
index <HASH>..<HASH> 100644
--- a/src/performance/captureHardNavigation.js
+++ b/src/performance/captureHardNavigation.js
@@ -22,7 +22,7 @@ function isValidTrace (transaction, trace) {
module.exports = function captureHardNavigation (transaction) {
if (transaction.isHardNavigation && window.performance && window.performance.timing) {
- var baseTime = window.performance.timing.navigationStart
+ var baseTime = window.performance.timing.fetchStart
var timings = window.performance.timing
transaction._rootTrace._start = transaction._start = 0
|
fix: use fetchStart instead of navigationStart for the base time
|
diff --git a/src/drivers/chrome/js/driver.js b/src/drivers/chrome/js/driver.js
index <HASH>..<HASH> 100644
--- a/src/drivers/chrome/js/driver.js
+++ b/src/drivers/chrome/js/driver.js
@@ -55,7 +55,7 @@
for ( option in defaults ) {
localStorage[option] = defaults[option];
}
- } else if ( version !== localStorage['version'] && localStorage['upgradeMessage'] ) {
+ } else if ( version !== localStorage['version'] && parseInt(localStorage['upgradeMessage'], 10) ) {
upgraded = true;
}
|
Respect "Show upgrade message" option in Chrome
|
diff --git a/src/Composer/DependencyResolver/Solver.php b/src/Composer/DependencyResolver/Solver.php
index <HASH>..<HASH> 100644
--- a/src/Composer/DependencyResolver/Solver.php
+++ b/src/Composer/DependencyResolver/Solver.php
@@ -796,10 +796,10 @@ class Solver
continue 2; // next rule
}
} else {
- if ($this->decisions->decidedInstall(abs($literal))) {
+ if ($this->decisions->decidedInstall($literal)) {
continue 2; // next rule
}
- if ($this->decisions->undecided(abs($literal))) {
+ if ($this->decisions->undecided($literal)) {
$decisionQueue[] = $literal;
}
}
|
Remove unnecessary abs() calls
Literal cannot be negative at this point
|
diff --git a/src/foremast/utils/lookups.py b/src/foremast/utils/lookups.py
index <HASH>..<HASH> 100644
--- a/src/foremast/utils/lookups.py
+++ b/src/foremast/utils/lookups.py
@@ -102,8 +102,9 @@ class GitLookup():
"""
file_contents = ''
+ file_path = os.path.join(self.runway_dir, filename)
+
try:
- file_path = os.path.join(self.runway_dir, filename)
with open(file_path, 'rt') as lookup_file:
file_contents = lookup_file.read()
except FileNotFoundError:
|
refactor: Move safe assignment outside of try
See also: #<I>
|
diff --git a/index_edit.php b/index_edit.php
index <HASH>..<HASH> 100644
--- a/index_edit.php
+++ b/index_edit.php
@@ -89,6 +89,7 @@ if ($user_id) {
}
if ($action=='update') {
+ Zend_Session::writeClose();
foreach (array('main', 'side') as $location) {
if ($location=='main') {
$new_blocks=$main;
|
Changing home/my page blocks fails for some users
|
diff --git a/spec/hook_handler/hook_handler_hook_spec.rb b/spec/hook_handler/hook_handler_hook_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/hook_handler/hook_handler_hook_spec.rb
+++ b/spec/hook_handler/hook_handler_hook_spec.rb
@@ -97,4 +97,13 @@ describe EvalHook::HookHandler, "hook handler hooks" do
hh.evalhook("TestModule321::B")
end
+ it "should intercept global_variable access" do
+ hh = EvalHook::HookHandler.new
+
+ hh.should_receive(:handle_gvar).with(:$global_variable_test)
+
+ hh.evalhook("$global_variable_test")
+ end
+
+
end
\ No newline at end of file
|
added test for interception of global variable access (pass)
|
diff --git a/src/FilterRule/NumberFormat.php b/src/FilterRule/NumberFormat.php
index <HASH>..<HASH> 100644
--- a/src/FilterRule/NumberFormat.php
+++ b/src/FilterRule/NumberFormat.php
@@ -41,7 +41,7 @@ class NumberFormat extends FilterRule
*/
public function __construct($decimals, $decimalPoint, $thousandSeperator)
{
- $this->decimals = $decimals;
+ $this->decimals = intval($decimals);
$this->decimalPoint = $decimalPoint;
$this->thousandSeperator = $thousandSeperator;
}
|
#<I>: Added intval to cast the decimals-configuration to int
|
diff --git a/lib/houston/conversations.rb b/lib/houston/conversations.rb
index <HASH>..<HASH> 100644
--- a/lib/houston/conversations.rb
+++ b/lib/houston/conversations.rb
@@ -25,8 +25,12 @@ module Houston
listeners.hear(message).each do |match|
event = Houston::Conversations::Event.new(match)
- yield event if block_given?
- match.listener.call_async event
+
+ if block_given?
+ yield event, match.listener
+ else
+ match.listener.call_async event
+ end
# Invoke only one listener per message
return true
|
[refactor] Yielded listener as well to Houston::Conversations.hear and allowed client code to invoke it (4m)
|
diff --git a/pyqode/core/server.py b/pyqode/core/server.py
index <HASH>..<HASH> 100644
--- a/pyqode/core/server.py
+++ b/pyqode/core/server.py
@@ -111,6 +111,7 @@ class Server(object):
self._workQueue = []
if autoCloseOnQuit:
QtGui.QApplication.instance().aboutToQuit.connect(self.close)
+ self._lock = thread.allocate_lock()
def close(self):
"""
@@ -148,7 +149,6 @@ class Server(object):
logger.info("Connected to Code Completion Server on 127.0.0.1:%d" %
port)
self.__running = True
- self._lock = thread.allocate_lock()
thread.start_new_thread(self._threadFct, ())
except OSError:
logger.exception("Failed to connect to Code Completion Server on "
|
Fix issue with _lock not allocated
|
diff --git a/chance.js b/chance.js
index <HASH>..<HASH> 100644
--- a/chance.js
+++ b/chance.js
@@ -442,7 +442,7 @@
}
if (options.prefix) {
- name = this.prefix() + ' ' + name;
+ name = this.prefix(options) + ' ' + name;
}
return name;
|
Ensure gender option from name passed along to prefix, if provided
|
diff --git a/src/main/java/br/com/fixturefactory/ObjectFactory.java b/src/main/java/br/com/fixturefactory/ObjectFactory.java
index <HASH>..<HASH> 100755
--- a/src/main/java/br/com/fixturefactory/ObjectFactory.java
+++ b/src/main/java/br/com/fixturefactory/ObjectFactory.java
@@ -65,7 +65,7 @@ public class ObjectFactory {
for (Property property : rule.getProperties()) {
Class<?> fieldType = ReflectionUtils.invokeRecursiveType(result, property.getName());
- Object value = property.hasRelationFunction() || fieldType.getEnclosingClass() != null ?
+ Object value = property.hasRelationFunction() || ReflectionUtils.isInnerClass(fieldType) ?
property.getValue(result) : property.getValue();
|
fixing inner class verify on instatiate properties on ObjectFactory
|
diff --git a/src/Phug/Util/Util/TestCase.php b/src/Phug/Util/Util/TestCase.php
index <HASH>..<HASH> 100644
--- a/src/Phug/Util/Util/TestCase.php
+++ b/src/Phug/Util/Util/TestCase.php
@@ -54,8 +54,8 @@ class TestCase extends TestCaseTypeBase
protected function removeFile($file)
{
if (is_dir($file)) {
- $this->emptyDirectory($file);
- rmdir($file);
+ @$this->emptyDirectory($file);
+ @rmdir($file);
return;
}
|
Mute scandir failures in tests cleanup step
|
diff --git a/GradientFeatureAuditor.py b/GradientFeatureAuditor.py
index <HASH>..<HASH> 100644
--- a/GradientFeatureAuditor.py
+++ b/GradientFeatureAuditor.py
@@ -9,7 +9,7 @@ import time
import os
import json
-ENABLE_MULTIPROCESSING = False
+ENABLE_MULTIPROCESSING = True
SAVE_REPAIRED_DATA = True
SAVE_PREDICTION_DETAILS = True
|
Re-enabled GFA multiprocessing
|
diff --git a/epa/__init__.py b/epa/__init__.py
index <HASH>..<HASH> 100644
--- a/epa/__init__.py
+++ b/epa/__init__.py
@@ -1,6 +1,8 @@
#!/usr/bin/env python
import envirofacts
+import gics
+import pcs
import radinfo
-__all__ = [envirofacts, radinfo]
+__all__ = [envirofacts, gics, pcs, radinfo]
|
Added GICS and PCS to __init__.py file in EPA
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ setup(name='cbamf',
author='Matt Bierbaum, Brian Leahy, Alex Alemi',
version='0.1.1',
- packages=['cbamf', 'cbamf.mc', 'cbamf.comp', 'cbamf.psf', 'cbamf.viz', 'cbamf.priors', 'cbamf.test'],
+ packages=['cbamf', 'cbamf.mc', 'cbamf.comp', 'cbamf.psf', 'cbamf.viz', 'cbamf.priors', 'cbamf.test', 'cbamf.opt'],
install_requires=[
"numpy>=1.8.1",
"scipy>=0.14.0",
|
added cbamf.opt to setup.py
|
diff --git a/insteonplm/protocol.py b/insteonplm/protocol.py
index <HASH>..<HASH> 100755
--- a/insteonplm/protocol.py
+++ b/insteonplm/protocol.py
@@ -280,6 +280,11 @@ class PLM(asyncio.Protocol):
if code == b'\x6a':
self.log.info('ALL-Link database dump is complete')
self.devices.state = 'loaded'
+ for da in dir(self.devices):
+ if 'cat' in self.devices[da] and self.devices[da]['cat'] > 0:
+ self.log.debug('I already know the category for %s (%s)', da, hex(self.devices[da]['cat']))
+ else:
+ self.product_data_request(da)
else:
self.log.warn('Sent command %s was NOT successful! (acknak %d)', binascii.hexlify(sm), acknak)
|
Request product data for any catless device
If, after completing the ALL-Link Database dump, we see a device for which
there is no known category, request a followup product data requrest from that
device.
|
diff --git a/spring-boot-admin-server-ui/src/main/frontend/viewRegistry.js b/spring-boot-admin-server-ui/src/main/frontend/viewRegistry.js
index <HASH>..<HASH> 100644
--- a/spring-boot-admin-server-ui/src/main/frontend/viewRegistry.js
+++ b/spring-boot-admin-server-ui/src/main/frontend/viewRegistry.js
@@ -70,7 +70,7 @@ export default class ViewRegistry {
const children = this._toRoutes(views, v => v.parent === p.name);
return ({
path: p.path,
- name: children.length === 0 ? p.name : undefined,
+ name: p.name,
component: p.component,
props: p.props,
meta: {view: p},
|
Allow creation of custom nested routed components
Undefined name prevents creation of nested routed components, because the `router-link` in `sidebar` uses this name as target. Any (custom) instance view that is determined to have any children is therefore unclickable.
In fact I can't see any reason to have undefined name. Maybe there is some, but in such case I would like to know it to be able to design some workaround.
|
diff --git a/core/API/Proxy.php b/core/API/Proxy.php
index <HASH>..<HASH> 100644
--- a/core/API/Proxy.php
+++ b/core/API/Proxy.php
@@ -480,7 +480,7 @@ class Proxy extends Singleton
$hideLine = trim($hideLine);
$hideLine .= ' ';
- $token = strtok($hideLine, " ");
+ $token = trim(strtok($hideLine, " "), "\n");
$hide = false;
|
fix annotations which were broken in case there was no space after anotation and new line character
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.