diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/GifExceptionBundle.php b/GifExceptionBundle.php
index <HASH>..<HASH> 100644
--- a/GifExceptionBundle.php
+++ b/GifExceptionBundle.php
@@ -22,9 +22,4 @@ class GifExceptionBundle extends Bundle
$container->addCompilerPass($this->getContainerExtension());
}
-
- public function getParent()
- {
- return 'TwigBundle';
- }
}
|
Remove getParent call to TwigBundle
|
diff --git a/guice/webapp/src/main/java/com/peterphi/std/guice/web/rest/service/restcore/GuiceRestCoreServiceImpl.java b/guice/webapp/src/main/java/com/peterphi/std/guice/web/rest/service/restcore/GuiceRestCoreServiceImpl.java
index <HASH>..<HASH> 100644
--- a/guice/webapp/src/main/java/com/peterphi/std/guice/web/rest/service/restcore/GuiceRestCoreServiceImpl.java
+++ b/guice/webapp/src/main/java/com/peterphi/std/guice/web/rest/service/restcore/GuiceRestCoreServiceImpl.java
@@ -22,7 +22,7 @@ public class GuiceRestCoreServiceImpl implements GuiceRestCoreService
@Reconfigurable
@Inject(optional = true)
@Named(GuiceProperties.ALLOW_RESTART)
- boolean allowRestart = false;
+ public boolean allowRestart = false;
@Inject
GuiceConfig configuration;
|
Make allowRestart public as well as Reconfigurable
|
diff --git a/dependencyManager.js b/dependencyManager.js
index <HASH>..<HASH> 100644
--- a/dependencyManager.js
+++ b/dependencyManager.js
@@ -86,11 +86,11 @@ function getRequiredDeps(packageJson) {
}
const deps = {
- "@angular/compiler-cli": "~6.1.0-beta.3",
+ "@angular/compiler-cli": "~6.1.0-rc.0",
};
if (!dependsOn(packageJson, "@angular-devkit/build-angular")) {
- deps["@ngtools/webpack"] = "6.1.0-rc.0";
+ deps["@ngtools/webpack"] = "~6.1.0-rc.2";
}
return deps;
|
chore: compiler cli & ngtools/webpack to latest rc (#<I>)
We no longer need to hardcode @ngtools/webpack to <I>-rc<I> as <URL>
|
diff --git a/test/datepicker_test.js b/test/datepicker_test.js
index <HASH>..<HASH> 100644
--- a/test/datepicker_test.js
+++ b/test/datepicker_test.js
@@ -252,10 +252,10 @@ describe("DatePicker", () => {
TestUtils.Simulate.keyDown(data.nodeInput, getKey("ArrowLeft"));
TestUtils.Simulate.keyDown(data.nodeInput, getKey("ArrowLeft"));
- var day = TestUtils.findRenderedDOMComponentWithClass(
+ var day = TestUtils.scryRenderedDOMComponentsWithClass(
data.datePicker.calendar,
"react-datepicker__day--today"
- );
+ )[0];
TestUtils.Simulate.click(ReactDOM.findDOMNode(day));
TestUtils.Simulate.keyDown(data.nodeInput, getKey("ArrowDown"));
|
Changed selection of today to allow for multiple instances of today to be rendered (ie. in case today is the start of the month) (#<I>)
|
diff --git a/src/anyconfig/backend/xml.py b/src/anyconfig/backend/xml.py
index <HASH>..<HASH> 100644
--- a/src/anyconfig/backend/xml.py
+++ b/src/anyconfig/backend/xml.py
@@ -452,7 +452,8 @@ def etree_write(tree, stream):
:param tree: XML ElementTree object
:param stream: File or file-like object can write to
"""
- tree.write(stream, encoding='UTF-8', xml_declaration=True)
+ enc = "unicode" if anyconfig.compat.IS_PYTHON_3 else "utf-8"
+ tree.write(stream, encoding=enc, xml_declaration=True)
class Parser(anyconfig.backend.base.Parser,
|
fix: correct encoding arg for xml.etree.ElementTree.write
correct encoding arg for xml.etree.ElementTree.write in python 3 to
avoid the following exception raised on dump:
TypeError: write() argument must be str, not bytes
|
diff --git a/python/ray/_private/monitor.py b/python/ray/_private/monitor.py
index <HASH>..<HASH> 100644
--- a/python/ray/_private/monitor.py
+++ b/python/ray/_private/monitor.py
@@ -261,8 +261,9 @@ class Monitor:
redis_client, ray_constants.MONITOR_DIED_ERROR, message)
def _signal_handler(self, sig, frame):
- return self._handle_failure(f"Terminated with signal {sig}\n" +
- "".join(traceback.format_stack(frame)))
+ self._handle_failure(f"Terminated with signal {sig}\n" +
+ "".join(traceback.format_stack(frame)))
+ sys.exit(sig + 128)
def run(self):
# Register signal handlers for autoscaler termination.
|
[Core] Exit autoscaler with a non-zero exit code upon handling SIGINT/SIGTERM (#<I>)
|
diff --git a/lib/deas/version.rb b/lib/deas/version.rb
index <HASH>..<HASH> 100644
--- a/lib/deas/version.rb
+++ b/lib/deas/version.rb
@@ -1,3 +1,3 @@
module Deas
- VERSION = "0.29.0"
+ VERSION = "0.30.0"
end
|
version to <I>
* Remove render logic from the sinatra runner; switch to always using template source #<I>
* cache template name extensions at the template source #<I>
* rework template source api for querying about configured engines #<I>
* update test runner render args to conform to new render API #<I>
* add source render/partial methods to the view handler and runners #<I>
* template source: rename `default_template_source` engine option #<I>
/cc @jcredding
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -183,7 +183,8 @@ ext_modules = [
State_ext,
]
-if USE_CYTHON:
+# XXX Mega-kludge!
+if USE_CYTHON and sys.argv[1] == 'sdist':
from Cython.Build import cythonize
ext_modules = cythonize(ext_modules)
|
Cythonize only if we're doing sdist.
|
diff --git a/backend/__32bit.py b/backend/__32bit.py
index <HASH>..<HASH> 100644
--- a/backend/__32bit.py
+++ b/backend/__32bit.py
@@ -574,7 +574,8 @@ def _ne32(ins):
op1, op2 = tuple(ins.quad[2:])
output = _32bit_oper(op1, op2)
output.append('call __EQ32')
- output.append('cpl') # Negates the result
+ output.append('sub 1') # Carry if A = 0 (False)
+ output.append('sbc a, a') # Negates => A > B ?
output.append('push af')
REQUIRES.add('eq32.asm')
return output
|
bugfix: NEQ<I> should accept any integer
If the return value where not 0xFF for true (e.g. 1) in the
_EQ<I> routine, this one might fail. Negate the result correctly.
|
diff --git a/src/Definition/GraphQLServices.php b/src/Definition/GraphQLServices.php
index <HASH>..<HASH> 100644
--- a/src/Definition/GraphQLServices.php
+++ b/src/Definition/GraphQLServices.php
@@ -17,17 +17,17 @@ final class GraphQLServices
{
private array $services;
private TypeResolver $types;
- private QueryResolver $resolverResolver;
+ private QueryResolver $queryResolver;
private MutationResolver $mutationResolver;
public function __construct(
TypeResolver $typeResolver,
- QueryResolver $resolverResolver,
+ QueryResolver $queryResolver,
MutationResolver $mutationResolver,
array $services = []
) {
$this->types = $typeResolver;
- $this->resolverResolver = $resolverResolver;
+ $this->queryResolver = $queryResolver;
$this->mutationResolver = $mutationResolver;
$this->services = $services;
}
@@ -56,7 +56,7 @@ final class GraphQLServices
*/
public function query(string $alias, ...$args)
{
- return $this->resolverResolver->resolve([$alias, $args]);
+ return $this->queryResolver->resolve([$alias, $args]);
}
/**
|
Rename attribute in GraphQLServices class
|
diff --git a/components/display.py b/components/display.py
index <HASH>..<HASH> 100644
--- a/components/display.py
+++ b/components/display.py
@@ -13,14 +13,16 @@
origin source code licensed under MIT License
"""
-
+import sys
import time
+import logging
try:
import pygame
except ImportError:
# Maybe Dragon would not be emulated ;)
pygame = None
+log = logging.getLogger("DragonPy.Display")
class Display(object):
@@ -111,6 +113,10 @@ class Display(object):
]
def __init__(self):
+ if pygame is None:
+ log.critical("Pygame is not installed!")
+ sys.exit(1)
+
self.screen = pygame.display.set_mode((560, 384))
pygame.display.set_caption("DragonPy")
self.mix = False
|
exit if Pygame is not installed
|
diff --git a/lib/chewy/rspec/update_index.rb b/lib/chewy/rspec/update_index.rb
index <HASH>..<HASH> 100644
--- a/lib/chewy/rspec/update_index.rb
+++ b/lib/chewy/rspec/update_index.rb
@@ -18,7 +18,7 @@ require 'i18n/core_ext/hash'
# Combined matcher chain methods:
#
# specify { expect { user1.destroy!; user2.save! } }
-# .to update_index(UsersIndex:User).and_reindex(user2).and_delete(user1)
+# .to update_index(UsersIndex:User).and_reindex(user2).and_delete(user1) }
#
RSpec::Matchers.define :update_index do |type_name, options = {}|
|
Fix minor code typo in a comment
|
diff --git a/src/Domain/Model/Deployment.php b/src/Domain/Model/Deployment.php
index <HASH>..<HASH> 100644
--- a/src/Domain/Model/Deployment.php
+++ b/src/Domain/Model/Deployment.php
@@ -99,14 +99,7 @@ class Deployment implements LoggerAwareInterface, ContainerAwareInterface
{
$this->name = $name;
$this->status = DeploymentStatus::UNKNOWN();
-
- $time = date('YmdHis', time());
-
- if ($time === false) {
- throw new UnexpectedValueException('Could not create valid releaseIdentifier');
- }
-
- $this->releaseIdentifier = $time;
+ $this->releaseIdentifier = date('YmdHis');
$this->setDeploymentLockIdentifier($deploymentLockIdentifier);
}
|
[BUGFIX] Fix phpstan error
Strict comparison using === between numeric-string and false will always evaluate to false.
|
diff --git a/lib/sippy_cup/scenario.rb b/lib/sippy_cup/scenario.rb
index <HASH>..<HASH> 100644
--- a/lib/sippy_cup/scenario.rb
+++ b/lib/sippy_cup/scenario.rb
@@ -122,11 +122,11 @@ module SippyCup
# @param [Hash] opts A set of options to modify the message
# @option opts [Integer] :retrans
# @option opts [String] :headers Extra headers to place into the INVITE
+ #
def invite(opts = {})
opts[:retrans] ||= 500
rtp_string = @rtcp_port ? "m=audio #{@rtcp_port.to_i - 1} RTP/AVP 0 101\na=rtcp:#{@rtcp_port}\n" : "m=audio [media_port] RTP/AVP 0 101\n"
headers = opts.delete :headers
- rtp_string = @rtcp_port ? "m=audio #{@rtcp_port.to_i - 1} RTP/AVP 0 101\na=rtcp:#{@rtcp_port}\n" : "m=audio [media_port] RTP/AVP 0 101\n"
# FIXME: The DTMF mapping (101) is hard-coded. It would be better if we could
# get this from the DTMF payload generator
msg = <<-INVITE
|
Fix duplicate line and doc newline issue
|
diff --git a/flask_appbuilder/security/manager.py b/flask_appbuilder/security/manager.py
index <HASH>..<HASH> 100644
--- a/flask_appbuilder/security/manager.py
+++ b/flask_appbuilder/security/manager.py
@@ -691,7 +691,6 @@ class BaseSecurityManager(AbstractSecurityManager):
# User does not exist, create one if auto user registration.
if user is None and self.auth_user_registration:
- log.info(LOGMSG_WAR_SEC_LOGIN_FAILED.format(username))
user = self.add_user(
# All we have is REMOTE_USER, so we set
# the other fields to blank.
|
Remove erroneous log message during auto user registration with AUTH_REMOTE_USER
|
diff --git a/lib/Doctrine/Common/Cache/PhpFileCache.php b/lib/Doctrine/Common/Cache/PhpFileCache.php
index <HASH>..<HASH> 100644
--- a/lib/Doctrine/Common/Cache/PhpFileCache.php
+++ b/lib/Doctrine/Common/Cache/PhpFileCache.php
@@ -64,6 +64,10 @@ class PhpFileCache extends FileCache
if ( ! is_file($filename)) {
return false;
}
+
+ if ( ! is_readable($filename)) {
+ return false;
+ }
$value = include $filename;
|
when the file is found but is not readable by the user, then prevent error `Warning: include(tmp/cache/tracker/piwikcache_general.php): failed to open stream: Permission denied in vendor/doctrine/cache/lib/Doctrine/Common/Cache/PhpFileCache.php on line <I>
|
diff --git a/lib/geocoder/stores/active_record.rb b/lib/geocoder/stores/active_record.rb
index <HASH>..<HASH> 100644
--- a/lib/geocoder/stores/active_record.rb
+++ b/lib/geocoder/stores/active_record.rb
@@ -213,8 +213,8 @@ module Geocoder::Store
bearing = false
end
- distance = approx_distance_from_sql(latitude, longitude, options)
options[:units] ||= (geocoder_options[:units] || Geocoder::Configuration.units)
+ distance = approx_distance_from_sql(latitude, longitude, options)
b = Geocoder::Calculations.bounding_box([latitude, longitude], radius, options)
conditions = [
|
fixed unit config not working with sqlite distance
|
diff --git a/test/src/test/java/ghostdriver/NavigationTest.java b/test/src/test/java/ghostdriver/NavigationTest.java
index <HASH>..<HASH> 100644
--- a/test/src/test/java/ghostdriver/NavigationTest.java
+++ b/test/src/test/java/ghostdriver/NavigationTest.java
@@ -24,4 +24,18 @@ public class NavigationTest extends BaseTest {
d.navigate().forward();
assertTrue(d.getTitle().toLowerCase().contains("HTML5".toLowerCase()));
}
+
+ @Test
+ public void navigateBackWithNoHistory() throws Exception {
+ // Quit the existing driver, and create a brand-new fresh
+ // one to insure we have no history.
+ quitDriver();
+ prepareDriver();
+ WebDriver d = getDriver();
+ d.navigate().back();
+ d.navigate().forward();
+
+ // Make sure explicit navigation still works.
+ d.get("http://google.com");
+ }
}
|
Navigation back/forward with no history crashes PhantomJS
|
diff --git a/vendor/plugins/inquiries/app/controllers/admin/inquiries_controller.rb b/vendor/plugins/inquiries/app/controllers/admin/inquiries_controller.rb
index <HASH>..<HASH> 100644
--- a/vendor/plugins/inquiries/app/controllers/admin/inquiries_controller.rb
+++ b/vendor/plugins/inquiries/app/controllers/admin/inquiries_controller.rb
@@ -12,8 +12,4 @@ class Admin::InquiriesController < Admin::BaseController
end
end
- def show
- find_inquiry
- end
-
end
diff --git a/vendor/plugins/refinery/lib/crud.rb b/vendor/plugins/refinery/lib/crud.rb
index <HASH>..<HASH> 100644
--- a/vendor/plugins/refinery/lib/crud.rb
+++ b/vendor/plugins/refinery/lib/crud.rb
@@ -34,7 +34,7 @@ module Crud
plural_name = singular_name.pluralize
module_eval %(
- before_filter :find_#{singular_name}, :only => [:update, :destroy, :edit]
+ before_filter :find_#{singular_name}, :only => [:update, :destroy, :edit, :show]
def new
@#{singular_name} = #{class_name}.new
|
Add find_#{singular_name} to method show as well. This means we can remove def show from controllers/admin/inquiries
|
diff --git a/src/Gaufrette/Adapter/Ftp.php b/src/Gaufrette/Adapter/Ftp.php
index <HASH>..<HASH> 100644
--- a/src/Gaufrette/Adapter/Ftp.php
+++ b/src/Gaufrette/Adapter/Ftp.php
@@ -528,7 +528,7 @@ class Ftp implements Adapter,
$this->connection = ftp_ssl_connect($this->host, $this->port, $this->timeout);
}
- if (PHP_VERSION_ID >= 50618) {
+ if (defined('FTP_USEPASVADDRESS')) {
ftp_set_option($this->connection, FTP_USEPASVADDRESS, false);
}
|
Enable FTP_USEPASVADDRESS option only if the constant exists
As stated by @stof in #<I>, FTP_USEPASVADDRESS is also not supported
by PHP <I> & <I>. See php/php-src@<I>a<I>a4.
|
diff --git a/api/src/main/java/org/wildfly/swarm/vertx/VertxFraction.java b/api/src/main/java/org/wildfly/swarm/vertx/VertxFraction.java
index <HASH>..<HASH> 100644
--- a/api/src/main/java/org/wildfly/swarm/vertx/VertxFraction.java
+++ b/api/src/main/java/org/wildfly/swarm/vertx/VertxFraction.java
@@ -43,7 +43,40 @@ public class VertxFraction implements Fraction
return this;
}
- public boolean isAdapterDeploymentInhibited()
+ public String jndiName()
+ {
+ return jndiName;
+ }
+
+ public VertxFraction jndiName(String jndiName)
+ {
+ this.jndiName = jndiName;
+ return this;
+ }
+
+ public String clusterHost()
+ {
+ return clusterHost;
+ }
+
+ public VertxFraction clusterHost(String clusterHost)
+ {
+ this.clusterHost = clusterHost;
+ return this;
+ }
+
+ public Integer clusterPort()
+ {
+ return clusterPort;
+ }
+
+ public VertxFraction clusterPort(Integer clusterPort)
+ {
+ this.clusterPort = clusterPort;
+ return this;
+ }
+
+ public boolean isAdapterDeploymentInhibited()
{
return inhibitAdapterDeployment;
}
|
Added getters/setters for VertXFraction
|
diff --git a/dockerscripts/check-user.go b/dockerscripts/check-user.go
index <HASH>..<HASH> 100644
--- a/dockerscripts/check-user.go
+++ b/dockerscripts/check-user.go
@@ -22,7 +22,6 @@ import (
"fmt"
"log"
"os"
- "os/exec"
"os/user"
"syscall"
@@ -43,13 +42,13 @@ func getUserGroup(path string) (string, error) {
if err != nil {
// Fresh directory we should default to what was requested by user.
if os.IsNotExist(err) {
- cmd := exec.Command("chown", "-R", defaultUserGroup, path)
- if err = cmd.Run(); err != nil {
+ fi, err = os.Stat(path)
+ if err != nil {
return "", err
}
- return defaultUserGroup, nil
+ } else {
+ return "", err
}
- return "", err
}
stat, ok := fi.Sys().(*syscall.Stat_t)
if !ok {
|
Avoid chown instead fallback to rootpath for user perms (#<I>)
Fixes #<I>
|
diff --git a/build/Burgomaster.php b/build/Burgomaster.php
index <HASH>..<HASH> 100644
--- a/build/Burgomaster.php
+++ b/build/Burgomaster.php
@@ -43,7 +43,7 @@ class Burgomaster
}
$this->debug("Creating staging directory: $this->stageDir");
-
+
if (!mkdir($this->stageDir, 0777, true)) {
throw new \RuntimeException("Could not create {$this->stageDir}");
}
@@ -343,6 +343,8 @@ EOT
$this->debug("Creating phar file at $dest");
$this->createDirIfNeeded(dirname($dest));
$phar = new \Phar($dest, 0, basename($dest));
+ $alias = basename($dest);
+ $phar->setAlias($alias);
$phar->buildFromDirectory($this->stageDir);
if ($stub !== false) {
|
Updating phar build to set an alias
|
diff --git a/src/Picqer/Financials/Exact/Budget.php b/src/Picqer/Financials/Exact/Budget.php
index <HASH>..<HASH> 100644
--- a/src/Picqer/Financials/Exact/Budget.php
+++ b/src/Picqer/Financials/Exact/Budget.php
@@ -36,8 +36,8 @@ namespace Picqer\Financials\Exact;
*/
class Budget extends Model
{
- use Findable;
- use Storable;
+ use Query\Findable;
+ use Persistance\Storable;
protected $fillable = [
'ID',
|
Include namespace path in Budget
Add the directory in the namespace for the traits: Findable & Storable
in the Budget model
|
diff --git a/framework/core/js/src/forum/components/PostsUserPage.js b/framework/core/js/src/forum/components/PostsUserPage.js
index <HASH>..<HASH> 100644
--- a/framework/core/js/src/forum/components/PostsUserPage.js
+++ b/framework/core/js/src/forum/components/PostsUserPage.js
@@ -145,7 +145,7 @@ export default class PostsUserPage extends UserPage {
parseResults(results) {
this.loading = false;
- this.posts.push(results);
+ this.posts.push(...results);
this.moreResults = results.length >= this.loadLimit;
m.redraw();
|
fix: posts tab on users page broken
|
diff --git a/yfinance/__init__.py b/yfinance/__init__.py
index <HASH>..<HASH> 100644
--- a/yfinance/__init__.py
+++ b/yfinance/__init__.py
@@ -28,6 +28,7 @@ __all__ = ['download', 'Ticker', 'pdr_override']
import time as _time
import datetime as _datetime
import requests as _requests
+from collections import namedtuple as _namedtuple
import multitasking as _multitasking
import pandas as _pd
import numpy as _np
@@ -43,7 +44,8 @@ def Tickers(tickers):
for ticker in tickers:
ticker_objects[ticker] = Ticker(ticker)
- return ticker_objects
+ return _namedtuple("Tickers", ticker_objects.keys()
+ )(*ticker_objects.values())
class Ticker():
|
Ticker returns a named tuple of Ticker objects
|
diff --git a/src/Piwik.php b/src/Piwik.php
index <HASH>..<HASH> 100644
--- a/src/Piwik.php
+++ b/src/Piwik.php
@@ -361,13 +361,13 @@ class Piwik
$params[$key] = urlencode($value);
}
- if ($this->_period != self::PERIOD_RANGE) {
+ if (empty($this->_date)) {
$params = $params + array(
- 'date' => $this->_date,
+ 'date' => $this->_rangeStart . ',' . $this->_rangeEnd,
);
} else {
$params = $params + array(
- 'date' => $this->_rangeStart . ',' . $this->_rangeEnd,
+ 'date' => $this->_date,
);
}
|
Fix a bug which prevents users from pulling entries for each of the period of the date range
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -12,6 +12,7 @@ module.exports = function build ({ middleware, routes, services }, done) {
const app = express()
app.disable('etag')
app.disable('x-powered-by')
+// app.disable('query parser')
app.enable('case sensitive routing')
app.enable('strict routing')
@@ -39,14 +40,7 @@ module.exports = function build ({ middleware, routes, services }, done) {
(next) => {
if (!services) return next()
- const serviceNames = Object.keys(services)
- if (serviceNames.length === 0) return next()
-
- parallel(serviceNames.map((serviceName) => {
- const _module = services[serviceName]
-
- return (callback) => _module(callback)
- }), next)
+ parallel(Object.values(services), next)
},
(next) => {
if (!routes) return next()
|
use Object.values as shorthand
|
diff --git a/components/elation/scripts/collection.js b/components/elation/scripts/collection.js
index <HASH>..<HASH> 100644
--- a/components/elation/scripts/collection.js
+++ b/components/elation/scripts/collection.js
@@ -488,7 +488,7 @@ elation.require([], function() {
* Provides a collection interface to a JSONP REST API
*
* @class jsonpapi
- * @augments elation.collection.jsonapi
+ * @augments elation.collection.api
* @memberof elation.collection
* @alias elation.collection.jsonpapi
*
@@ -518,7 +518,7 @@ elation.require([], function() {
document.head.appendChild(this.script);
}
- }, elation.collection.jsonapi);
+ }, elation.collection.api);
/**
* Custom data collection
|
collection.jsonp inherits from collection.api instead of collection.json
|
diff --git a/head.go b/head.go
index <HASH>..<HASH> 100644
--- a/head.go
+++ b/head.go
@@ -34,6 +34,11 @@ var (
ErrOutOfBounds = errors.New("out of bounds")
)
+type sample struct {
+ t int64
+ v float64
+}
+
// headBlock handles reads and writes of time series data within a time window.
type headBlock struct {
mtx sync.RWMutex
|
Add Sample Back
The compilation and tests are broken as head.go requires sample which
has been moved to another package while moving BufferedSeriesIterator.
Duplication seemed better compared to exposing sample from tsdbutil.
|
diff --git a/bson/src/main/org/bson/codecs/DocumentCodec.java b/bson/src/main/org/bson/codecs/DocumentCodec.java
index <HASH>..<HASH> 100644
--- a/bson/src/main/org/bson/codecs/DocumentCodec.java
+++ b/bson/src/main/org/bson/codecs/DocumentCodec.java
@@ -84,7 +84,7 @@ public class DocumentCodec implements CollectibleCodec<Document> {
public DocumentCodec(final CodecRegistry registry, final BsonTypeClassMap bsonTypeClassMap, final Transformer valueTransformer) {
this.registry = Assertions.notNull("registry", registry);
this.bsonTypeClassMap = Assertions.notNull("bsonTypeClassMap", bsonTypeClassMap);
- this.idGenerator = Assertions.notNull("idGenerator", new ObjectIdGenerator());
+ this.idGenerator = new ObjectIdGenerator();
this.valueTransformer = valueTransformer != null ? valueTransformer : new Transformer() {
@Override
public Object transform(final Object value) {
|
Update DocumentCodec.java
The assertion is unnecessary because "new ObjectIdGenerator()" is never not null
|
diff --git a/linux/hci.go b/linux/hci.go
index <HASH>..<HASH> 100644
--- a/linux/hci.go
+++ b/linux/hci.go
@@ -122,7 +122,7 @@ func (h *HCI) SetScanEnable(en bool, dup bool) error {
return h.c.SendAndCheckResp(
cmd.LESetScanEnable{
LEScanEnable: btoi(en),
- FilterDuplicates: btoi(dup),
+ FilterDuplicates: btoi(!dup),
}, []byte{0x00})
}
|
linux: fix the dup filter of Scan
|
diff --git a/src/Artax/Client.php b/src/Artax/Client.php
index <HASH>..<HASH> 100644
--- a/src/Artax/Client.php
+++ b/src/Artax/Client.php
@@ -145,6 +145,11 @@ class Client {
private $requestStateMap;
/**
+ * @var array
+ */
+ private $streamIdRequestMap;
+
+ /**
* @var Mediator
*/
private $mediator;
|
added streamIdRequestMap property declaration
|
diff --git a/packages/lingui-i18n/src/compile.js b/packages/lingui-i18n/src/compile.js
index <HASH>..<HASH> 100644
--- a/packages/lingui-i18n/src/compile.js
+++ b/packages/lingui-i18n/src/compile.js
@@ -20,10 +20,10 @@ const defaultFormats = (language) => {
return {
plural: (value, { offset = 0, rules }) =>
- rules[value] || rules[pluralRules(value - offset)],
+ rules[value] || rules[pluralRules(value - offset)] || rules.other,
selectordinal: (value, { offset = 0, rules }) =>
- rules[value] || rules[pluralRules(value - offset, true)],
+ rules[value] || rules[pluralRules(value - offset, true)] || rules.other,
select: (value, { rules }) =>
rules[value] || rules.other,
|
fix: Return fallback plural form when the correct doesn't exist
|
diff --git a/example/app.py b/example/app.py
index <HASH>..<HASH> 100644
--- a/example/app.py
+++ b/example/app.py
@@ -30,9 +30,14 @@ def create_users():
('joe@lp.com', 'password', ['editor'], True),
('jill@lp.com', 'password', ['author'], True),
('tiya@lp.com', 'password', [], False)):
- current_app.security.datastore.create_user(
- email=u[0], password=u[1], roles=u[2], active=u[3],
- authentication_token='123abc')
+ current_app.security.datastore.create_user(**{
+ 'email': u[0],
+ 'password': u[1],
+ 'roles': u[2],
+ 'active': u[3],
+ 'authentication_token':
+ '123abc'
+ })
def populate_data():
|
Try and fix an issue with python <I>
|
diff --git a/lib/node.io/processor.js b/lib/node.io/processor.js
index <HASH>..<HASH> 100644
--- a/lib/node.io/processor.js
+++ b/lib/node.io/processor.js
@@ -550,13 +550,13 @@ Processor.prototype.input = function(job, input, forWorker) {
//Called when a job instance wants to dynamically add input (outside of job.input())
Processor.prototype.addInput = function(job, add, dont_flatten) {
var j = this.jobs[job];
-
- if (isWorker && !isMaster) {
+
+ //if (isWorker && !isMaster) {
//Send the added input back to the master so that it is evenly distributed among workers
- master.send({type:'add',job:job,add:add,dont_flatten:dont_flatten});
+ //master.send({type:'add',job:job,add:add,dont_flatten:dont_flatten});
- } else {
+ //} else {
if (!dont_flatten && add instanceof Array) {
add.forEach(function(line) {
j.input.push(line);
@@ -564,7 +564,7 @@ Processor.prototype.addInput = function(job, add, dont_flatten) {
} else {
j.input.push(add);
}
- }
+ //}
}
Processor.prototype.output = function(job, output) {
|
Temporarily reverted addInput
|
diff --git a/spyderlib/utils/introspection/plugin_manager.py b/spyderlib/utils/introspection/plugin_manager.py
index <HASH>..<HASH> 100644
--- a/spyderlib/utils/introspection/plugin_manager.py
+++ b/spyderlib/utils/introspection/plugin_manager.py
@@ -17,7 +17,7 @@ from spyderlib.qt.QtCore import SIGNAL, QThread, QObject
PLUGINS = ['jedi', 'rope', 'fallback']
-PLUGINS = ['rope']
+PLUGINS = ['fallback']
LOG_FILENAME = get_conf_path('introspection.log')
DEBUG_EDITOR = DEBUG >= 3
|
Tested completions with module completions using fallback.
|
diff --git a/spec/sidekiq/throttler_spec.rb b/spec/sidekiq/throttler_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/sidekiq/throttler_spec.rb
+++ b/spec/sidekiq/throttler_spec.rb
@@ -16,7 +16,7 @@ describe Sidekiq::Throttler do
let(:message) do
{
- args: 'Clint Eastwood'
+ 'args' => 'Clint Eastwood'
}
end
|
Fix bad message setup.
Message setup in the test was using symbols for the key, but, the tests themselves
were using a string as the key.
This doesn't seem to break anything...
|
diff --git a/src/tools/Fsck.java b/src/tools/Fsck.java
index <HASH>..<HASH> 100644
--- a/src/tools/Fsck.java
+++ b/src/tools/Fsck.java
@@ -117,11 +117,11 @@ final class Fsck {
final AtomicLong vle_fixed = new AtomicLong();
/** Length of the metric + timestamp for key validation */
- private static int key_prefix_length = Const.SALT_WIDTH() +
+ private int key_prefix_length = Const.SALT_WIDTH() +
TSDB.metrics_width() + Const.TIMESTAMP_BYTES;
/** Length of a tagk + tagv pair for key validation */
- private static int key_tags_length = TSDB.tagk_width() + TSDB.tagv_width();
+ private int key_tags_length = TSDB.tagk_width() + TSDB.tagv_width();
/** How often to report progress */
private static long report_rows = 10000;
|
"tsdb fsck --fix-all" wrongly clears data points when salting enabled
Const.SALT_WIDTH() is actually not constant value, it mustn't be
called on class initialization.
|
diff --git a/quark/plugin.py b/quark/plugin.py
index <HASH>..<HASH> 100644
--- a/quark/plugin.py
+++ b/quark/plugin.py
@@ -1127,3 +1127,6 @@ class Plugin(quantum_plugin_base_v2.QuantumPluginBaseV2,
(context.tenant_id))
rules = db_api.security_group_rule_find(context, filters=filters)
return [self._make_security_group_rule_dict(rule) for rule in rules]
+
+ def update_security_group(self, context, id, security_group):
+ raise NotImplementedError()
|
Added non-implementation of abstract update_security_group
|
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index <HASH>..<HASH> 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -15,7 +15,7 @@ module ActiveRecord
# These are explicitly delegated to improve performance (avoids method_missing)
delegate :to_xml, :to_yaml, :length, :collect, :map, :each, :all?, :include?, :to => :to_a
delegate :table_name, :quoted_table_name, :primary_key, :quoted_primary_key,
- :connection, :column_hash, :auto_explain_threshold_in_seconds, :to => :klass
+ :connection, :columns_hash, :auto_explain_threshold_in_seconds, :to => :klass
attr_reader :table, :klass, :loaded
attr_accessor :extensions, :default_scoped
|
There isn't a column_hash. It was being invoked by method missing.
|
diff --git a/debug/viewer.js b/debug/viewer.js
index <HASH>..<HASH> 100644
--- a/debug/viewer.js
+++ b/debug/viewer.js
@@ -180,6 +180,9 @@ var Viewer = {
window.require = function (name) {
+ if (name == 'makerjs' || name == '../target/js/node.maker.js') {
+ return _makerjs;
+ }
return module.exports;
};
Viewer.Constructor = null;
|
allow require of published makerjs and local
|
diff --git a/core/src/main/java/org/bitcoinj/core/Block.java b/core/src/main/java/org/bitcoinj/core/Block.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/org/bitcoinj/core/Block.java
+++ b/core/src/main/java/org/bitcoinj/core/Block.java
@@ -231,7 +231,7 @@ public class Block extends Message {
time = readUint32();
difficultyTarget = readUint32();
nonce = readUint32();
- hash = Sha256Hash.wrapReversed(Sha256Hash.hashTwice(payload, offset, cursor));
+ hash = Sha256Hash.wrapReversed(Sha256Hash.hashTwice(payload, offset, cursor - offset));
headerBytesValid = serializer.isParseRetainMode();
// transactions
|
Correct length of block header when hashing at an offset
|
diff --git a/system/src/Grav/Common/Cache.php b/system/src/Grav/Common/Cache.php
index <HASH>..<HASH> 100644
--- a/system/src/Grav/Common/Cache.php
+++ b/system/src/Grav/Common/Cache.php
@@ -64,7 +64,7 @@ class Cache extends Getters
$this->enabled = (bool) $this->config->get('system.cache.enabled');
// Cache key allows us to invalidate all cache on configuration changes.
- $this->key = substr(md5(($prefix ? $prefix : 'g') . $uri->rootUrl(true) . $this->config->key . GRAV_VERSION), 2, 8);
+ $this->key = substr(md5(($prefix ? $prefix : 'g') . $uri->rootUrl(true) . $this->config->key() . GRAV_VERSION), 2, 8);
$this->driver = $this->getCacheDriver();
diff --git a/system/src/Grav/Common/Config/Config.php b/system/src/Grav/Common/Config/Config.php
index <HASH>..<HASH> 100644
--- a/system/src/Grav/Common/Config/Config.php
+++ b/system/src/Grav/Common/Config/Config.php
@@ -105,6 +105,11 @@ class Config extends Data
$this->check();
}
+ public function key()
+ {
+ return $this->checksum;
+ }
+
public function reload()
{
$this->check();
|
Add back configuration key to caching (was accidentally removed)
|
diff --git a/src/main/java/eu/hansolo/tilesfx/skins/MatrixIconTileSkin.java b/src/main/java/eu/hansolo/tilesfx/skins/MatrixIconTileSkin.java
index <HASH>..<HASH> 100644
--- a/src/main/java/eu/hansolo/tilesfx/skins/MatrixIconTileSkin.java
+++ b/src/main/java/eu/hansolo/tilesfx/skins/MatrixIconTileSkin.java
@@ -94,7 +94,7 @@ public class MatrixIconTileSkin extends TileSkin {
getPane().getChildren().addAll(titleText, matrix, text);
- if (tile.isAnimated()) { timer.start(); }
+ if (tile.isAnimated() && tile.getMatrixIcons().size() > 1) { timer.start(); }
}
@Override protected void registerListeners() {
@@ -115,7 +115,9 @@ public class MatrixIconTileSkin extends TileSkin {
} else if (EventType.ANIMATED_ON.name().equals(EVENT_TYPE)) {
updateInterval = tile.getAnimationDuration() * 1_000_000l;
pauseInterval = tile.getPauseDuration() * 1_000_000l;
- timer.start();
+ if (tile.getMatrixIcons().size() > 1) {
+ timer.start();
+ }
} else if (EventType.ANIMATED_OFF.name().equals(EVENT_TYPE)) {
timer.stop();
updateMatrix();
|
Only start timer if list of matrixicons contains at least 2 elements
|
diff --git a/src/MaxMind/Db/Reader/Decoder.php b/src/MaxMind/Db/Reader/Decoder.php
index <HASH>..<HASH> 100644
--- a/src/MaxMind/Db/Reader/Decoder.php
+++ b/src/MaxMind/Db/Reader/Decoder.php
@@ -19,21 +19,37 @@ class Decoder
private $pointerTestHack;
private $switchByteOrder;
+ /** @ignore */
const _EXTENDED = 0;
+ /** @ignore */
const _POINTER = 1;
+ /** @ignore */
const _UTF8_STRING = 2;
+ /** @ignore */
const _DOUBLE = 3;
+ /** @ignore */
const _BYTES = 4;
+ /** @ignore */
const _UINT16 = 5;
+ /** @ignore */
const _UINT32 = 6;
+ /** @ignore */
const _MAP = 7;
+ /** @ignore */
const _INT32 = 8;
+ /** @ignore */
const _UINT64 = 9;
+ /** @ignore */
const _UINT128 = 10;
+ /** @ignore */
const _ARRAY = 11;
+ /** @ignore */
const _CONTAINER = 12;
+ /** @ignore */
const _END_MARKER = 13;
+ /** @ignore */
const _BOOLEAN = 14;
+ /** @ignore */
const _FLOAT = 15;
public function __construct(
|
Hide several defines from phpdoc
|
diff --git a/lib/omnibus/project.rb b/lib/omnibus/project.rb
index <HASH>..<HASH> 100644
--- a/lib/omnibus/project.rb
+++ b/lib/omnibus/project.rb
@@ -19,14 +19,6 @@ require 'time'
require 'json'
module Omnibus
- #
- # Omnibus project DSL reader
- #
- # @todo It seems like there's a bit of a conflation between a "project" and a
- # "package" in this class... perhaps the package-building portions should be
- # extracted to a separate class.
- #
- #
class Project
class << self
#
|
Remove comment about conflation with project and packager
This is no longer true now that a real packaging DSL exists.
|
diff --git a/synapse/cores/common.py b/synapse/cores/common.py
index <HASH>..<HASH> 100644
--- a/synapse/cores/common.py
+++ b/synapse/cores/common.py
@@ -331,7 +331,7 @@ class Cortex(EventBus, DataModel, Runtime, s_ingest.IngestApi, s_telepath.Aware,
raise s_exc.NoSuchUser(name=name)
if not user.allowed(perm, elev=elev):
- raise s_exc.AuthDeny(perm=perm)
+ raise s_exc.AuthDeny(perm=perm, user=name)
def _initCoreSpliceHandlers(self):
self.spliceact.act('node:add', self._actNodeAdd)
|
When raising a AuthDeny include the name of the user being denied access.
|
diff --git a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/datasource/JdbcDriverArchiveAppender.java b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/datasource/JdbcDriverArchiveAppender.java
index <HASH>..<HASH> 100644
--- a/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/datasource/JdbcDriverArchiveAppender.java
+++ b/int-tests/src/test/java/org/jboss/arquillian/integration/persistence/datasource/JdbcDriverArchiveAppender.java
@@ -36,7 +36,7 @@ public abstract class JdbcDriverArchiveAppender implements AuxiliaryArchiveAppen
}
private Archive<?> resolveDriverArtifact(final String driverCoordinates) {
- PomEquippedResolveStage resolver = Maven.resolver().offline().loadPomFromFile("pom.xml");
+ PomEquippedResolveStage resolver = Maven.configureResolver().workOffline().loadPomFromFile("pom.xml");
File[] jars = resolver.resolve(driverCoordinates).withoutTransitivity().asFile();
return ShrinkWrap.createFromZipFile(JavaArchive.class, jars[0]);
}
|
Adjusted maven resolver usage to the API changes.
|
diff --git a/framework/directives/carousel.js b/framework/directives/carousel.js
index <HASH>..<HASH> 100755
--- a/framework/directives/carousel.js
+++ b/framework/directives/carousel.js
@@ -27,16 +27,16 @@
* @description
* [en]Fired just after the current carousel item has changed.[/en]
* [ja]現在表示しているカルーセルの要素が変わった時に発火します。[/ja]
- * @param {Object} event
+ * @param {Object} event
* [en]Event object.[/en]
* [ja]イベントオブジェクトです。[/ja]
- * @param {Object} event.details.carousel
+ * @param {Object} event.carousel
* [en]Carousel object.[/en]
* [ja]イベントが発火したCarouselオブジェクトです。[/ja]
- * @param {Number} event.details.activeIndex
+ * @param {Number} event.activeIndex
* [en]Current active index.[/en]
* [ja]現在アクティブになっている要素のインデックス。[/ja]
- * @param {Number} event.details.lastActiveIndex
+ * @param {Number} event.lastActiveIndex
* [en]Previous active index.[/en]
* [ja]以前アクティブだった要素のインデックス。[/ja]
*/
|
docs(ons-carousel): Update event docs.
|
diff --git a/multi_dict.py b/multi_dict.py
index <HASH>..<HASH> 100644
--- a/multi_dict.py
+++ b/multi_dict.py
@@ -56,7 +56,10 @@ class MultiDict():
for i in range(len(key)):
if not _isdict(value):
raise KeyError('Key {} not applicable. Under key {} is a value of type {}.'.format(key, key[:i], type(value)))
- value = value[key[i]]
+ try:
+ value = value[key[i]]
+ except TypeError as e:
+ raise KeyError('Key {} not applicable. The {}th value of the key is of type {}.'.format(key, i, type(key[i]))) from e
except KeyError as e:
# raise KeyError(key) from e
value = []
|
BUG: util/multi_dict.py: now throws KeyError if number of dicts is smaller than dim of key
|
diff --git a/src/Connector.php b/src/Connector.php
index <HASH>..<HASH> 100644
--- a/src/Connector.php
+++ b/src/Connector.php
@@ -44,6 +44,15 @@ class Connector {
return $connector->create($uri->getHost(), $port)->then(function(DuplexStreamInterface $stream) use ($request, $subProtocols) {
$futureWsConn = new Deferred;
+ $earlyClose = function() use ($futureWsConn) {
+ $futureWsConn->reject(new \RuntimeException('Connection closed before handshake'));
+ };
+
+ $stream->on('close', $earlyClose);
+ $futureWsConn->promise()->then(function() use ($stream, $earlyClose) {
+ $stream->removeListener('close', $earlyClose);
+ });
+
$buffer = '';
$headerParser = function($data, DuplexStreamInterface $stream) use (&$headerParser, &$buffer, $futureWsConn, $request, $subProtocols) {
$buffer .= $data;
|
Reject connection is socket closed before handshake
|
diff --git a/server/helpers/launcher.js b/server/helpers/launcher.js
index <HASH>..<HASH> 100644
--- a/server/helpers/launcher.js
+++ b/server/helpers/launcher.js
@@ -69,5 +69,5 @@ switch (process.argv[2]) {
break;
default:
- console.log('Usage: [-f|start|stop|restart|status|reconfig|build [-c <config file>] [-p <pid file>]]');
+ console.log('Usage: [-f|start|stop|restart|status|reconfig|build [-v] [-c <config file>] [-p <pid file>]]');
}
|
Added -v verbose flag into available commands list
|
diff --git a/falafel/mappers/installed_rpms.py b/falafel/mappers/installed_rpms.py
index <HASH>..<HASH> 100644
--- a/falafel/mappers/installed_rpms.py
+++ b/falafel/mappers/installed_rpms.py
@@ -75,15 +75,15 @@ class InstalledRpm(MapperOutput):
self["release"]
)
- @computed
+ @property
def name(self):
return self.get('name')
- @computed
+ @property
def version(self):
return self.get('version')
- @computed
+ @property
def release(self):
return self.get('release')
@@ -134,8 +134,12 @@ SOSREPORT_KEYS = [
]
+def arch_sep(s):
+ return "." if s.rfind(".") > s.rfind("-") else "-"
+
+
def parse_package(package_string):
- pkg, arch = rsplit(package_string, ".")
+ pkg, arch = rsplit(package_string, arch_sep(package_string))
if arch not in KNOWN_ARCHITECTURES:
pkg, arch = (package_string, None)
pkg, release = rsplit(pkg, "-")
|
Enhancements to installed_rpms mapper
- Switch several @computed properties to @property
- Handle case where the separator between release and arch is a dash
instead of a dot.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -3,24 +3,13 @@
from setuptools import setup
-try:
- from pypandoc import convert_file
-
- def read_md(f):
- return convert_file(f, 'rst')
-
-except ImportError:
- print("warning: pypandoc module not found, could not convert Markdown to RST")
-
- def read_md(f):
- return open(f, 'r').read()
-
setup(name='baron',
version='0.9',
description='Full Syntax Tree for python to make writing refactoring code a realist task',
author='Laurent Peuch',
- long_description=read_md("README.md") + "\n\n" + open("CHANGELOG", "r").read(),
+ long_description=open("README.md").read() + "\n\n" + open("CHANGELOG", "r").read(),
+ long_description_content_type="text/markdown",
author_email='cortex@worlddomination.be',
url='https://github.com/PyCQA/baron',
install_requires=['rply'],
|
fix: pypi now supports markdown
|
diff --git a/system/core/controllers/cli/Install.php b/system/core/controllers/cli/Install.php
index <HASH>..<HASH> 100644
--- a/system/core/controllers/cli/Install.php
+++ b/system/core/controllers/cli/Install.php
@@ -79,7 +79,7 @@ class Install extends CliController
$host = $this->getSubmitted('store.host');
$basepath = $this->getSubmitted('store.basepath');
$vars = array('@url' => rtrim("$host/$basepath", '/'));
- return $this->text("Your store has been installed.\nURL: @url\nAdmin area: @url/admin", $vars);
+ return $this->text("Your store has been installed.\nURL: @url\nAdmin area: @url/admin\nGood luck!", $vars);
}
/**
|
Minor refactoring cli\Install controller
|
diff --git a/pupa/importers/base.py b/pupa/importers/base.py
index <HASH>..<HASH> 100644
--- a/pupa/importers/base.py
+++ b/pupa/importers/base.py
@@ -121,7 +121,11 @@ class BaseImporter(object):
if json_id.startswith('~'):
spec = get_psuedo_id(json_id)
spec = self.limit_spec(spec)
- return self.model_class.objects.get(**spec).id
+ try:
+ return self.model_class.objects.get(**spec).id
+ except self.model_class.DoesNotExist:
+ raise ValueError('cannot resolve psuedo-id to {}: {}'.format(
+ self.model_class.__name__, json_id))
# get the id that the duplicate points to, or use self
json_id = self.duplicates.get(json_id, json_id)
@@ -129,7 +133,7 @@ class BaseImporter(object):
try:
return self.json_to_db_id[json_id]
except KeyError:
- raise ValueError('cannot resolve id: {0}'.format(json_id))
+ raise ValueError('cannot resolve id: {}'.format(json_id))
def import_directory(self, datadir):
""" import a JSON directory into the database """
|
better error message on failure to resolve psuedo-id
|
diff --git a/src/main/java/org/primefaces/extensions/component/layout/LayoutPane.java b/src/main/java/org/primefaces/extensions/component/layout/LayoutPane.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/primefaces/extensions/component/layout/LayoutPane.java
+++ b/src/main/java/org/primefaces/extensions/component/layout/LayoutPane.java
@@ -451,8 +451,7 @@ public class LayoutPane extends UIComponentBase {
return;
} else if (parent instanceof OutputPanel
- && Layout.STYLE_CLASS_LAYOUT_CONTENT.equals(((OutputPanel) parent).getStyleClass())
- && "block".equals(((OutputPanel) parent).getLayout())) {
+ && Layout.STYLE_CLASS_LAYOUT_CONTENT.equals(((OutputPanel) parent).getStyleClass())) {
// layout pane can be within p:outputPanel representing a HTML div
setOptions(parent.getParent());
|
Fixed compilation error in LayoutPane
|
diff --git a/lib/irt/extensions/rails.rb b/lib/irt/extensions/rails.rb
index <HASH>..<HASH> 100644
--- a/lib/irt/extensions/rails.rb
+++ b/lib/irt/extensions/rails.rb
@@ -3,7 +3,8 @@ class ActiveSupport::BufferedLogger
alias_method :original_add, :add
def add(*args)
- message = original_add(*args)
+ original_add(*args)
+ message = args[1]
# no inline log when in rails server and not interactive mode
return message if IRB.CurrentContext.nil? || IRT.rails_server && IRB.CurrentContext.irt_mode != :interactive
if IRT.rails_log
|
fixes an issue with rails <I>
|
diff --git a/mod/lesson/continue.php b/mod/lesson/continue.php
index <HASH>..<HASH> 100644
--- a/mod/lesson/continue.php
+++ b/mod/lesson/continue.php
@@ -42,6 +42,7 @@ $lessonoutput = $PAGE->get_renderer('mod_lesson');
$url = new moodle_url('/mod/lesson/continue.php', array('id'=>$cm->id));
$PAGE->set_url($url);
+$PAGE->set_pagetype('mod-lesson-view');
$PAGE->navbar->add(get_string('continue', 'lesson'));
// This is the code updates the lesson time for a timed test
|
MDL-<I> lesson: Fix for positioning of blocks on continue.php
|
diff --git a/lib/cli.js b/lib/cli.js
index <HASH>..<HASH> 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -6,17 +6,17 @@ var meow = require('meow');
module.exports = function () {
var config;
- var cli = meow({
+ var args = meow({
pkg: '../package.json'
});
try {
- config = configLoader(cli.flags.c || cli.flags.config);
+ config = configLoader(args.flags.c || args.flags.config);
} catch (e) {
console.log('Something\'s wrong with the config file.');
process.exit(1);
}
- linter.lint(cli.input[0], config);
+ linter.lint(args.input[0], config);
};
|
Use 'args' instead of 'cli'
|
diff --git a/Slim/Container.php b/Slim/Container.php
index <HASH>..<HASH> 100644
--- a/Slim/Container.php
+++ b/Slim/Container.php
@@ -32,6 +32,22 @@
*/
namespace Slim;
+/**
+ * Container
+ *
+ * This is a very simple dependency injection (DI) container. I must
+ * give a hat tip to Fabien Potencier, because a few methods in this
+ * class are borrowed wholesale from his `Pimple` library.
+ *
+ * I wanted to avoid third-party dependencies, so I created this
+ * DI container as a simple derivative of Pimple. If you need a separate
+ * stand-alone DI container component, please use Pimple:
+ *
+ * @package Slim
+ * @author Fabien Potencier, Josh Lockhart
+ * @since 2.3.0
+ * @see https://github.com/fabpot/Pimple
+ */
class Container implements \ArrayAccess, \Countable, \IteratorAggregate
{
/**
|
Provide credit to Pimple in \Slim\Container
|
diff --git a/test/test_conf_in_symlinks.py b/test/test_conf_in_symlinks.py
index <HASH>..<HASH> 100755
--- a/test/test_conf_in_symlinks.py
+++ b/test/test_conf_in_symlinks.py
@@ -21,6 +21,7 @@
#
# This file is used to test reading and processing of config files
#
+import os
import sys
from shinken_test import *
@@ -28,10 +29,13 @@ from shinken_test import *
class TestConfigWithSymlinks(ShinkenTest):
def setUp(self):
+ if os.name == 'nt':
+ return
self.setup_with_file('etc/nagios_conf_in_symlinks.cfg')
def test_symlinks(self):
-
+ if os.name == 'nt':
+ return
if sys.version_info < (2 , 6):
print "************* WARNING********"*200
print "On python 2.4 and 2.5, the symlinks following is NOT managed"
|
Fix : test_conf_in_symlinks.py and windows is not a good mix....
|
diff --git a/docs/source/conf.py b/docs/source/conf.py
index <HASH>..<HASH> 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -21,6 +21,8 @@ import os
import sys
sys.path.append('/Users/thomassaunders/Workshop/neo-python/')
+# resolve module import errors for :automodule: and :autoclass:
+sys.path.append(os.path.abspath('../..'))
# need to mock plyvel so it will compile on rtd.org
|
Fix automodule imports such that SmartContract Parameter types are actually parsed.
|
diff --git a/library/CM/Model/User.php b/library/CM/Model/User.php
index <HASH>..<HASH> 100644
--- a/library/CM/Model/User.php
+++ b/library/CM/Model/User.php
@@ -202,10 +202,14 @@ class CM_Model_User extends CM_Model_Abstract {
}
/**
+ * @param bool|null $withDefault
* @return CM_Model_Currency|null
*/
- public function getCurrency() {
+ public function getCurrency($withDefault = null) {
if (!$this->_get('currencyId')) {
+ if ($withDefault) {
+ return CM_Model_Currency::getDefaultCurrency();
+ }
return null;
}
return new CM_Model_Currency($this->_get('currencyId'));
|
add $withDefault to be able to get the default currency
|
diff --git a/spec/unit/azure_server_create_spec.rb b/spec/unit/azure_server_create_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/unit/azure_server_create_spec.rb
+++ b/spec/unit/azure_server_create_spec.rb
@@ -274,9 +274,9 @@ describe Chef::Knife::AzureServerCreate do
@server_instance.run
end
-########## Uncomment the code below to test automatic certificate generation for ssl communication
-=begin
+
it 'create with automatic certificates creation if winrm-transport=ssl' do
+ pending "with automatic certificates creation if winrm-transport=ssl"
# set all params
Chef::Config[:knife][:azure_dns_name] = 'service001'
Chef::Config[:knife][:azure_vm_name] = 'vm002'
@@ -298,7 +298,6 @@ describe Chef::Knife::AzureServerCreate do
#Delete temp directory
FileUtils.remove_entry_secure dir
end
-=end
end
context "when --azure-dns-name is not specified" do
|
Added pending testcase for automatic certificate generation
|
diff --git a/tests/DrafterTest.php b/tests/DrafterTest.php
index <HASH>..<HASH> 100644
--- a/tests/DrafterTest.php
+++ b/tests/DrafterTest.php
@@ -78,8 +78,7 @@ class DrafterTest extends \PHPUnit_Framework_TestCase
// the drafter binary will add a line break at the end of the version string
$version = trim($version);
- // Assert the fixed version of drafter that this package currently supports
- $this->assertRegExp('/v1\.\d+\.\d+/', $version);
+ $this->assertNotEmpty($version);
}
/**
|
Do not care about the exact version of drafter binary
|
diff --git a/lib/arjdbc/teradata/adapter.rb b/lib/arjdbc/teradata/adapter.rb
index <HASH>..<HASH> 100644
--- a/lib/arjdbc/teradata/adapter.rb
+++ b/lib/arjdbc/teradata/adapter.rb
@@ -111,7 +111,7 @@ module ::ArJdbc
output = nil
pk = primary_key(table)
if pk
- output = execute("SELECT TOP 1 #{pk} FROM #{table} ORDER BY #{pk} DESC").first[pk]
+ output = execute("SELECT TOP 1 #{quote_column_name(pk)} FROM #{quote_table_name(table)} ORDER BY #{quote_column_name(pk)} DESC").first[pk]
end
output
end
|
Quote table name and column name when looking for primary key
|
diff --git a/lib/handlers/wallaby/cached_compiled_erb.rb b/lib/handlers/wallaby/cached_compiled_erb.rb
index <HASH>..<HASH> 100644
--- a/lib/handlers/wallaby/cached_compiled_erb.rb
+++ b/lib/handlers/wallaby/cached_compiled_erb.rb
@@ -3,8 +3,12 @@ require 'erubis'
# TODO: move this kind of logic into a gem called faster rails :)
class Wallaby::CachedCompiledErb < ActionView::Template::Handlers::ERB
def call(template)
- Rails.cache.fetch "wallaby/views/erb/#{ template.inspect }" do
+ if Rails.env.development?
super
+ else
+ Rails.cache.fetch "wallaby/views/erb/#{ template.inspect }" do
+ super
+ end
end
end
end
|
do not cache compiled era for dev env
|
diff --git a/Source/fluent-ui.js b/Source/fluent-ui.js
index <HASH>..<HASH> 100644
--- a/Source/fluent-ui.js
+++ b/Source/fluent-ui.js
@@ -41,7 +41,7 @@ class FluentUI {
original_bg: $(selector).css("background-image"),
light_color: "rgba(255,255,255,0.15)",
light_effect_size: $(selector).outerWidth(),
- click_effect_enable: false,
+ click_effect_enable: true,
click_effect_size: 70
}
diff --git a/Test/main.js b/Test/main.js
index <HASH>..<HASH> 100644
--- a/Test/main.js
+++ b/Test/main.js
@@ -2,12 +2,13 @@
FluentUI.applyTo(".toolbar", {
light_color: "rgba(255,255,255,0.1)",
- light_effect_size: 400
+ light_effect_size: 400,
+ click_effect_enable: false
})
FluentUI.applyTo(".btn", {
light_color: "rgba(255,255,255,0.2)",
- click_effect_enable: true
+
})
|
change the default option of click_effect_enable to true
|
diff --git a/src/Graviton/SchemaBundle/Model/SchemaModel.php b/src/Graviton/SchemaBundle/Model/SchemaModel.php
index <HASH>..<HASH> 100644
--- a/src/Graviton/SchemaBundle/Model/SchemaModel.php
+++ b/src/Graviton/SchemaBundle/Model/SchemaModel.php
@@ -2,7 +2,6 @@
namespace Graviton\SchemaBundle\Model;
-use MyProject\Proxies\__CG__\OtherProject\Proxies\__CG__\stdClass;
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
|
damn ide, it does too much ;-)
|
diff --git a/inject/src/main/java/io/micronaut/context/DefaultApplicationContextBuilder.java b/inject/src/main/java/io/micronaut/context/DefaultApplicationContextBuilder.java
index <HASH>..<HASH> 100644
--- a/inject/src/main/java/io/micronaut/context/DefaultApplicationContextBuilder.java
+++ b/inject/src/main/java/io/micronaut/context/DefaultApplicationContextBuilder.java
@@ -63,7 +63,7 @@ public class DefaultApplicationContextBuilder implements ApplicationContextBuild
@Override
public boolean isEagerInitConfiguration() {
- return eagerInitSingletons;
+ return eagerInitConfiguration;
}
@NonNull
|
isEagerInitConfiguration should return eagerInitConfiguration
|
diff --git a/examples/basic.py b/examples/basic.py
index <HASH>..<HASH> 100755
--- a/examples/basic.py
+++ b/examples/basic.py
@@ -7,6 +7,12 @@ import time
import pusherclient
+# Add a logging handler so we can see the raw communication data
+root = logging.getLogger()
+root.setLevel(logging.INFO)
+ch = logging.StreamHandler(sys.stdout)
+root.addHandler(ch)
+
global pusher
def print_usage(filename):
|
Examples - Include rootlogger in basic example.
|
diff --git a/test/helper.js b/test/helper.js
index <HASH>..<HASH> 100644
--- a/test/helper.js
+++ b/test/helper.js
@@ -11,7 +11,7 @@ exports.getStanza = function(file) {
}
var Eventer = function() {}
-Eventer.prototype = new Event()
+Eventer.prototype.__proto__ = Event.prototype
Eventer.prototype.send = function(stanza) {
this.emit('stanza', stanza.root())
}
|
Improvement to helper when splitting tests to multiple files
|
diff --git a/lib/deep_cloneable.rb b/lib/deep_cloneable.rb
index <HASH>..<HASH> 100644
--- a/lib/deep_cloneable.rb
+++ b/lib/deep_cloneable.rb
@@ -80,7 +80,7 @@ class ActiveRecord::Base
if association_reflection.options[:as]
fk = association_reflection.options[:as].to_s + "_id"
else
- fk = association_reflection.options[:foreign_key] || self.class.to_s.underscore + "_id"
+ fk = association_reflection.options[:foreign_key] || self.class.to_s.underscore.sub(/([^\/]*\/)*/, '') + "_id"
end
self.send(association).collect do |obj|
tmp = obj.clone(opts)
|
fix one bug:
when model has namespace, like class is Aaa::Bbb, then it will be raise a undefined method error "can't find aaa/bbb_id", generally, the foreign key
will be bbb_id for aaa object, this is a common case.
|
diff --git a/scapy/layers/inet6.py b/scapy/layers/inet6.py
index <HASH>..<HASH> 100644
--- a/scapy/layers/inet6.py
+++ b/scapy/layers/inet6.py
@@ -1023,6 +1023,12 @@ class IPv6ExtHdrFragment(_IPv6ExtHdr):
IntField("id", None)]
overload_fields = {IPv6: {"nh": 44}}
+ def guess_payload_class(self, p):
+ if self.offset > 0:
+ return Raw
+ else:
+ return super(IPv6ExtHdrFragment, self).guess_payload_class(p)
+
def defragment6(packets):
"""
|
IPv6: disable payload detection for non-first fragments
|
diff --git a/classes/GemsEscort.php b/classes/GemsEscort.php
index <HASH>..<HASH> 100644
--- a/classes/GemsEscort.php
+++ b/classes/GemsEscort.php
@@ -527,7 +527,7 @@ class GemsEscort extends MUtil_Application_Escort
*/
protected function _initSession()
{
-
+ $this->bootstrap('project'); // Make sure the project is available
$session = new Zend_Session_Namespace('gems.' . GEMS_PROJECT_NAME . '.session');
$idleTimeout = $this->project->getSessionTimeOut();
|
Make session init failsafe and order independent when overruled from project bootstrap
|
diff --git a/src/Command/IssueTakeCommand.php b/src/Command/IssueTakeCommand.php
index <HASH>..<HASH> 100644
--- a/src/Command/IssueTakeCommand.php
+++ b/src/Command/IssueTakeCommand.php
@@ -69,7 +69,11 @@ EOF
'allow_failures' => true
],
[
- 'line' => sprintf('git checkout -b %s %s/%s', $slugTitle, 'origin', $baseBranch),
+ 'line' => sprintf('git checkout %s/%s', 'origin', $baseBranch),
+ 'allow_failures' => true
+ ],
+ [
+ 'line' => sprintf('git checkout -b %s', $slugTitle),
'allow_failures' => true
],
];
|
fix #<I> fix bug with tracking on itake when that is the job of the pusher command
|
diff --git a/src/ruby_supportlib/phusion_passenger/admin_tools/instance_registry.rb b/src/ruby_supportlib/phusion_passenger/admin_tools/instance_registry.rb
index <HASH>..<HASH> 100644
--- a/src/ruby_supportlib/phusion_passenger/admin_tools/instance_registry.rb
+++ b/src/ruby_supportlib/phusion_passenger/admin_tools/instance_registry.rb
@@ -104,8 +104,9 @@ module PhusionPassenger
# as the instance registry dir. See https://github.com/phusion/passenger/issues/1475
#
# systemd's PrivateTmp feature works like an inverted OSX, apache gets its own
- # TMPDIR and users use /tmp
- [string_env("TMPDIR"), "/tmp", "/var/run/passenger-instreg",*Dir['/tmp/systemd-private-*-{httpd,nginx}.service-*/tmp']].compact
+ # TMPDIR and users use /tmp, however the path is often too long because socket paths can
+ # only be up to 108 characters long.
+ [string_env("TMPDIR"), "/tmp", "/var/run/passenger-instreg",*Dir['/tmp/systemd-private-*-{httpd,nginx,apache2}.service-*/tmp']].compact
end
def string_env(name)
|
add missing apache name for ubuntu in instance registry dir detection
|
diff --git a/jams/version.py b/jams/version.py
index <HASH>..<HASH> 100644
--- a/jams/version.py
+++ b/jams/version.py
@@ -3,4 +3,4 @@
"""Version info"""
short_version = '0.2'
-version = '0.2.0'
+version = '0.2.0rc1'
|
changed version number to rc1
|
diff --git a/odl/operator/tensor_ops.py b/odl/operator/tensor_ops.py
index <HASH>..<HASH> 100644
--- a/odl/operator/tensor_ops.py
+++ b/odl/operator/tensor_ops.py
@@ -858,6 +858,8 @@ class MatrixOperator(Operator):
def _call(self, x, out=None):
"""Return ``self(x[, out])``."""
+ from pkg_resources import parse_version
+
if out is None:
return self.range.element(self.matrix.dot(x))
else:
@@ -866,8 +868,14 @@ class MatrixOperator(Operator):
# sparse matrices
out[:] = self.matrix.dot(x)
else:
- with writable_array(out) as out_arr:
- self.matrix.dot(x, out=out_arr)
+ if (parse_version(np.__version__) < parse_version('1.13.0') and
+ x is out):
+ # Workaround for bug in Numpy < 1.13 with aliased in and
+ # out in np.dot
+ out[:] = self.matrix.dot(x)
+ else:
+ with writable_array(out) as out_arr:
+ self.matrix.dot(x, out=out_arr)
def __repr__(self):
"""Return ``repr(self)``."""
|
MAINT: add workaround for Numpy bug in MatrixOperator
|
diff --git a/lib/node_modules/@stdlib/utils/merge/lib/mergefcn.js b/lib/node_modules/@stdlib/utils/merge/lib/mergefcn.js
index <HASH>..<HASH> 100644
--- a/lib/node_modules/@stdlib/utils/merge/lib/mergefcn.js
+++ b/lib/node_modules/@stdlib/utils/merge/lib/mergefcn.js
@@ -2,7 +2,7 @@
// MODULES //
-var isObject = require( '@stdlib/utils/is-object' ); // TODO: plain object
+var isObject = require( '@stdlib/utils/is-plain-object' );
var deepMerge = require( './deepmerge.js' );
|
Use utility to test if a value is a plain object
|
diff --git a/core/ArchiveProcessing.php b/core/ArchiveProcessing.php
index <HASH>..<HASH> 100644
--- a/core/ArchiveProcessing.php
+++ b/core/ArchiveProcessing.php
@@ -994,7 +994,7 @@ abstract class Piwik_ArchiveProcessing
public static function isArchivingDisabledFor($segment, $period)
{
- if($period == 'range') {
+ if($period->getLabel() == 'range') {
return false;
}
$processOneReportOnly = !self::shouldProcessReportsAllPluginsFor($segment, $period);
|
Refs #<I> - Piwik_Period's toString method does not return the type of the Period and a "Array to String conversion" notice is triggered. So we use the getLabel accessor.
|
diff --git a/library/src/main/java/trikita/anvil/Anvil.java b/library/src/main/java/trikita/anvil/Anvil.java
index <HASH>..<HASH> 100644
--- a/library/src/main/java/trikita/anvil/Anvil.java
+++ b/library/src/main/java/trikita/anvil/Anvil.java
@@ -11,6 +11,8 @@ import java.util.Map;
import java.util.WeakHashMap;
import static trikita.anvil.Nodes.*;
+import java.util.HashSet;
+import java.util.Set;
/**
* <p>
@@ -108,7 +110,11 @@ public final class Anvil {
skipNextRender = false;
return;
}
- for (Renderable r: mounts.keySet()) {
+ // We need to copy the keyset, otherwise a concurrent modification may
+ // happen if Renderables are nested
+ Set<Renderable> set = new HashSet<Renderable>();
+ set.addAll(mounts.keySet());
+ for (Renderable r: set) {
render(r);
}
}
|
fixed renderable iteration in Anvil to avoid concurrent modification exceptions
|
diff --git a/lib/ooor/relation/finder_methods.rb b/lib/ooor/relation/finder_methods.rb
index <HASH>..<HASH> 100644
--- a/lib/ooor/relation/finder_methods.rb
+++ b/lib/ooor/relation/finder_methods.rb
@@ -35,15 +35,7 @@ module Ooor
def find_first_or_last(options, ordering = "ASC")
options[:order] ||= "id #{ordering}"
options[:limit] = 1
- domain = options[:domain] || options[:conditions] || []
- context = options[:context] || {}
- ids = rpc_execute('search', to_openerp_domain(domain), options[:offset] || 0,
- options[:limit], options[:order], context.dup)
- if ids.empty?
- return nil
- else
- find_single(ids.first, options)
- end
+ find_single(nil, options)[0]
end
#actually finds many resources specified with scope = ids_array
|
major optimization: find_first_or_last now use search_read when using JSRPC transport
|
diff --git a/lib/decorate.js b/lib/decorate.js
index <HASH>..<HASH> 100644
--- a/lib/decorate.js
+++ b/lib/decorate.js
@@ -7,7 +7,7 @@ function decorate (callSpec, decorator) {
thisObj = callSpec.thisObj,
numArgsToCapture = callSpec.numArgsToCapture;
- return function () {
+ return function decoratedAssert () {
var context, message, args = slice.apply(arguments);
if (args.every(isNotCaptured)) {
|
refactor(empower): name function to make stacktrace a bit clean
|
diff --git a/app/models/glue/pulp/repo.rb b/app/models/glue/pulp/repo.rb
index <HASH>..<HASH> 100644
--- a/app/models/glue/pulp/repo.rb
+++ b/app/models/glue/pulp/repo.rb
@@ -304,7 +304,7 @@ module Glue::Pulp::Repo
history = self.sync_status
return if history.nil? || history.state == ::PulpSyncStatus::Status::NOT_SYNCED
- Pulp::Repository.cancel(self.pulp_id, history)
+ Pulp::Repository.cancel(self.pulp_id, history.uuid)
end
def sync_finish
|
sync management - fixing repository cancel
|
diff --git a/lib/PHPExif/Mapper/Native.php b/lib/PHPExif/Mapper/Native.php
index <HASH>..<HASH> 100644
--- a/lib/PHPExif/Mapper/Native.php
+++ b/lib/PHPExif/Mapper/Native.php
@@ -225,6 +225,14 @@ class Native implements MapperInterface
{
$parts = explode('/', $component);
- return count($parts) === 1 ? $parts[0] : (int) reset($parts) / (int) end($parts);
+ if (count($parts) > 0) {
+ if ($parts[1]) {
+ return (int) $parts[0] / (int) $parts[1];
+ }
+
+ return 0;
+ }
+
+ return $parts[0];
}
}
|
Fixed normalization of zero degrees coordinates in the native mapper
|
diff --git a/pefile.py b/pefile.py
index <HASH>..<HASH> 100644
--- a/pefile.py
+++ b/pefile.py
@@ -2279,7 +2279,7 @@ def is_valid_dos_filename(s):
# charset we will assume the name is invalid.
allowed_function_name = b(
- string.ascii_lowercase + string.ascii_uppercase + string.digits + "_?@$()<>"
+ string.ascii_lowercase + string.ascii_uppercase + string.digits + "._?@$()<>"
)
|
Allow dot in PE symbol name
When building with optimization flag enable, it is possible to generate
symbol names such as 'PyErr_CheckSignals.part<I>' which contain a dot.
Simply add '.' to the allowed_function_name list.
|
diff --git a/pyemma/coordinates/clustering/uniform_time.py b/pyemma/coordinates/clustering/uniform_time.py
index <HASH>..<HASH> 100644
--- a/pyemma/coordinates/clustering/uniform_time.py
+++ b/pyemma/coordinates/clustering/uniform_time.py
@@ -82,7 +82,7 @@ class UniformTimeClustering(AbstractClustering):
# random access matrix
ra_stride = np.array([UniformTimeClustering._idx_to_traj_idx(x, cumsum) for x in linspace])
self.clustercenters = np.concatenate([X for X in
- iterable.iterator(stride=ra_stride, return_trajindex=False, **kw)])
+ iterable.iterator(stride=ra_stride, return_trajindex=False)])
assert len(self.clustercenters) == self.n_clusters
return self
|
[uniform-t-clustering] do not pass kw into iterator
|
diff --git a/lib/import.js b/lib/import.js
index <HASH>..<HASH> 100644
--- a/lib/import.js
+++ b/lib/import.js
@@ -118,6 +118,12 @@ function importFramework (framework, skip) {
*/
function resolve (framework) {
+ debug('resolving framework name or path:', framework)
+ // strip off a trailing slash if present
+ if (framework[framework.length-1] == '/') {
+ framework = framework.slice(0, framework.length-1)
+ debug('stripped trailing slash:', framework)
+ }
// already absolute, return as-is
if (~framework.indexOf('/')) return framework;
var i = 0
|
Strip a trailing slash from the framework name if present.
Fixes #<I>.
|
diff --git a/stun/discover.go b/stun/discover.go
index <HASH>..<HASH> 100644
--- a/stun/discover.go
+++ b/stun/discover.go
@@ -204,15 +204,15 @@ func discover(conn net.PacketConn, addr net.Addr, softwareName string) (NATType,
return NAT_FULL, host, nil
}
+ if changeAddr == nil {
+ return NAT_ERROR, host, errors.New("No changed address.")
+ }
+
otherConn, err := net.ListenUDP("udp", nil)
if err != nil {
return NAT_ERROR, nil, err
}
- if changeAddr == nil {
- return NAT_ERROR, host, errors.New("No changed address.")
- }
-
packet, _, identical, _, err = test1(otherConn, changeAddr, softwareName)
if err != nil {
return NAT_ERROR, host, err
|
check changed addr first then conn for test1
|
diff --git a/src/Events/BaseViewListener.php b/src/Events/BaseViewListener.php
index <HASH>..<HASH> 100644
--- a/src/Events/BaseViewListener.php
+++ b/src/Events/BaseViewListener.php
@@ -186,30 +186,29 @@ abstract class BaseViewListener implements EventListenerInterface
{
$result = [];
- if (!$event->subject()->request->query('associated')) {
- return $result;
- }
-
- $table = $event->subject()->{$event->subject()->name};
- $associations = $table->associations();
+ $associations = $event->subject()->{$event->subject()->name}->associations();
if (empty($associations)) {
return $result;
}
+ // always include file associations
$result = $this->_containAssociations(
$associations,
- $this->_nestedAssociations
+ $this->_fileAssociations,
+ true
);
- // always include file associations
+ if (!$event->subject()->request->query('associated')) {
+ return $result;
+ }
+
$result = array_merge(
- $result,
$this->_containAssociations(
$associations,
- $this->_fileAssociations,
- true
- )
+ $this->_nestedAssociations
+ ),
+ $result
);
return $result;
|
always include file associations (task #<I>)
|
diff --git a/lib/turn/runners/minirunner.rb b/lib/turn/runners/minirunner.rb
index <HASH>..<HASH> 100644
--- a/lib/turn/runners/minirunner.rb
+++ b/lib/turn/runners/minirunner.rb
@@ -66,7 +66,7 @@ module Turn
# suites are cases in minitest
@turn_case = @turn_suite.new_case(suite.name)
- filter = @turn_config.pattern || /./
+ filter = @options[:filter] || @turn_config.pattern || /./
suite.send("#{type}_methods").grep(filter).each do |test|
@turn_case.new_test(test)
|
Use MiniTest's filter option.
|
diff --git a/__pkginfo__.py b/__pkginfo__.py
index <HASH>..<HASH> 100644
--- a/__pkginfo__.py
+++ b/__pkginfo__.py
@@ -49,8 +49,8 @@ install_requires = ['columnize >= 0.3.9',
'pygments >= 2.2.0',
'spark_parser >= 1.8.5, <1.9.0',
'tracer >= 0.3.2',
- 'uncompyle6 >= 3.1.0',
- 'xdis >= 3.7.0, < 3.8.0',
+ 'uncompyle6 >= 3.1.1',
+ 'xdis >= 3.8.0, < 3.9.0',
]
license = 'GPL3'
mailing_list = 'python-debugger@googlegroups.com'
|
Bump xdis and uncompyle6 min versions
|
diff --git a/consumer_test.go b/consumer_test.go
index <HASH>..<HASH> 100644
--- a/consumer_test.go
+++ b/consumer_test.go
@@ -341,11 +341,11 @@ func TestBlueGreenDeployment(t *testing.T) {
blue := BlueGreenDeployment{activeTopic, "static", blueGroup}
green := BlueGreenDeployment{inactiveTopic, "static", greenGroup}
- time.Sleep(20 * time.Second)
+ time.Sleep(30 * time.Second)
coordinator.RequestBlueGreenDeployment(blue, green)
- time.Sleep(60 * time.Second)
+ time.Sleep(120 * time.Second)
//All Blue consumers should switch to Green group and change topic to inactive
greenConsumerIds, _ := coordinator.GetConsumersInGroup(greenGroup)
|
Increased timeout for blue-green test.
|
diff --git a/runtime/graphdriver/devmapper/deviceset.go b/runtime/graphdriver/devmapper/deviceset.go
index <HASH>..<HASH> 100644
--- a/runtime/graphdriver/devmapper/deviceset.go
+++ b/runtime/graphdriver/devmapper/deviceset.go
@@ -821,6 +821,10 @@ func (devices *DeviceSet) Shutdown() error {
info.lock.Unlock()
}
+ if err := devices.deactivateDevice(""); err != nil {
+ utils.Debugf("Shutdown deactivate base , error: %s\n", err)
+ }
+
if err := devices.deactivatePool(); err != nil {
utils.Debugf("Shutdown deactivate pool , error: %s\n", err)
}
|
devmapper: Ensure we shut down thin pool cleanly.
The change in commit a9fa1a<I>c3b0a<I>a<I>be<I>ff7ec<I>e<I>b<I>
made us only deactivate devices that were mounted. Unfortunately
this made us not deactivate the base device. Which caused
us to not be able to deactivate the pool.
This fixes that by always just deactivating the base device.
Docker-DCO-<I>-
|
diff --git a/question/type/questiontype.php b/question/type/questiontype.php
index <HASH>..<HASH> 100644
--- a/question/type/questiontype.php
+++ b/question/type/questiontype.php
@@ -9,10 +9,11 @@
* {@link http://maths.york.ac.uk/serving_maths}
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
* @package quiz
-*/
+*//** */
-/// Question type class //////////////////////////////////////////////
+require_once($CFG->libdir . '/questionlib.php');
+/// Question type class //////////////////////////////////////////////
class default_questiontype {
/**
|
Tweak to unbreak unit tests.
|
diff --git a/cmd2.py b/cmd2.py
index <HASH>..<HASH> 100755
--- a/cmd2.py
+++ b/cmd2.py
@@ -141,7 +141,7 @@ def options(option_list):
arg = newArgs
result = func(instance, arg, opts)
return result
- newFunc.__doc__ = '%s\n%s' % (func.__doc__, optionParser.format_help())
+ new_func.__doc__ = '%s\n%s' % (func.__doc__, optionParser.format_help())
return new_func
return option_setup
|
oops, had to fix a reference to newFunc
|
diff --git a/lib/codemirror.js b/lib/codemirror.js
index <HASH>..<HASH> 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -23,7 +23,7 @@ window.CodeMirror = (function() {
replaceSelection: operation(replaceSelection),
focus: function(){window.focus(); focusInput(); onFocus(); fastPoll();},
setOption: function(option, value) {
- if (options[option] == value) return;
+ if (options[option] == value && option != "mode") return;
options[option] = value;
if (option == "mode" || option == "indentUnit") loadMode();
else if (option == "readOnly" && value == "nocursor") {onBlur(); input.blur();}
|
Always force a re-highlight when the 'mode' option is set
Closes #<I>
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.