diff stringlengths 65 26.7k | message stringlengths 7 9.92k |
|---|---|
diff --git a/lib/amqp/server.rb b/lib/amqp/server.rb
index <HASH>..<HASH> 100644
--- a/lib/amqp/server.rb
+++ b/lib/amqp/server.rb
@@ -115,7 +115,7 @@ module Carrot::AMQP
@socket.connect
if ctx.verify_mode != OpenSSL::SSL::VERIFY_NONE
- @socket.post_connection_check(@address)
+ @socket.post_connection_check(@host)
end
end | @host is the correct property to validate - not @address |
diff --git a/gevent_openssl/SSL.py b/gevent_openssl/SSL.py
index <HASH>..<HASH> 100644
--- a/gevent_openssl/SSL.py
+++ b/gevent_openssl/SSL.py
@@ -2,9 +2,8 @@
"""
import OpenSSL.SSL
-import select
import socket
-import sys
+from gevent.socket import wait_read, wait_write
_real_connection = OpenSSL.SSL.Connection
@@ -26,21 +25,15 @@ class Connection(object):
return getattr(self._connection, attr)
def __iowait(self, io_func, *args, **kwargs):
- timeout = self._sock.gettimeout() or 0.1
fd = self._sock.fileno()
+ timeout = self._sock.gettimeout()
while True:
try:
return io_func(*args, **kwargs)
except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantX509LookupError):
- sys.exc_clear()
- _, _, errors = select.select([fd], [], [fd], timeout)
- if errors:
- break
+ wait_read(fd, timeout=timeout)
except OpenSSL.SSL.WantWriteError:
- sys.exc_clear()
- _, _, errors = select.select([], [fd], [fd], timeout)
- if errors:
- break
+ wait_write(fd, timeout=timeout)
def accept(self):
sock, addr = self._sock.accept() | Fix infinite loop in __iowait (#6)
Use gevent's wait_read and wait_write instead of directly selecting
the file descriptor. |
diff --git a/lib/fog/rackspace/mock_data.rb b/lib/fog/rackspace/mock_data.rb
index <HASH>..<HASH> 100644
--- a/lib/fog/rackspace/mock_data.rb
+++ b/lib/fog/rackspace/mock_data.rb
@@ -39,7 +39,7 @@ module Fog
"OS-DCF:diskConfig" => "AUTO",
"created" => "2012-02-28T19:38:57Z",
"id" => image_id,
- "name" => "Ubuntu",
+ "name" => image_name,
"links" => [
{
"href" => "https://dfw.servers.api.rackspacecloud.com/v2/010101/images/#{image_id}",
@@ -77,7 +77,6 @@ module Fog
},
"minDisk" => 10,
"minRam" => 256,
- "name" => image_name,
"progress" => 100,
"status" => "ACTIVE",
"updated" => "2012-02-28T19:39:05Z" | Remove duplicated hash key in rackspace/mock_data.rb |
diff --git a/peri/comp/exactpsf.py b/peri/comp/exactpsf.py
index <HASH>..<HASH> 100644
--- a/peri/comp/exactpsf.py
+++ b/peri/comp/exactpsf.py
@@ -404,7 +404,7 @@ class ExactLineScanConfocalPSF(psfs.PSF):
#Clipping params to computable values:
alpha = self.param_dict['psf-alpha']
zscale = self.param_dict['psf-zscale']
- wavelength = self.param_dict['laser-wavelength']
+ wavelength = self.param_dict['psf-laser-wavelength']
max_alpha, max_zscale = np.pi/2, 100.
if alpha < 1e-3 or alpha > max_alpha:
@@ -415,7 +415,7 @@ class ExactLineScanConfocalPSF(psfs.PSF):
self.param_dict['psf-zscale'] = np.clip(zscale, 1e-3, max_zscale-1e-3)
if wavelength < 1e-3:
warnings.warn('Invalid laser wavelength, clipping', RuntimeWarning)
- self.param_dict['laser-wavelength'] = np.clip(wavelength, 1e-3, np.inf)
+ self.param_dict['psf-laser-wavelength'] = np.clip(wavelength, 1e-3, np.inf)
def set_tile(self, tile):
if not hasattr(self, 'tile') or (self.tile.shape != tile.shape).any(): | Fixing psf dict key in prev. change<I> |
diff --git a/werkzeug/formparser.py b/werkzeug/formparser.py
index <HASH>..<HASH> 100644
--- a/werkzeug/formparser.py
+++ b/werkzeug/formparser.py
@@ -413,7 +413,9 @@ class MultiPartParser(object):
disposition, extra = parse_options_header(disposition)
transfer_encoding = self.get_part_encoding(headers)
name = extra.get('name')
- filename = extra.get('filename')
+
+ # Accept filename* to support non-ascii filenames as per rfc2231
+ filename = extra.get('filename') or extra.get('filename*')
# if no content type is given we stream into memory. A list is
# used as a temporary container. | Add support for non-ascii filenames when uploading files using multipart/form-data (#<I>) |
diff --git a/airflow/executors/local_executor.py b/airflow/executors/local_executor.py
index <HASH>..<HASH> 100644
--- a/airflow/executors/local_executor.py
+++ b/airflow/executors/local_executor.py
@@ -46,7 +46,6 @@ locally, into just one `LocalExecutor` with multiple modes.
import multiprocessing
import subprocess
-import time
from builtins import range
@@ -94,7 +93,6 @@ class LocalWorker(multiprocessing.Process, LoggingMixin):
def run(self):
self.execute_work(self.key, self.command)
- time.sleep(1)
class QueuedLocalWorker(LocalWorker):
@@ -116,7 +114,6 @@ class QueuedLocalWorker(LocalWorker):
break
self.execute_work(key, command)
self.task_queue.task_done()
- time.sleep(1)
class LocalExecutor(BaseExecutor):
@@ -164,7 +161,6 @@ class LocalExecutor(BaseExecutor):
def end(self):
while self.executor.workers_active > 0:
self.executor.sync()
- time.sleep(0.5)
class _LimitedParallelism(object):
"""Implements LocalExecutor with limited parallelism using a task queue to | [AIRFLOW-<I>] Remove sleep in localexecutor (#<I>) |
diff --git a/projects/samskivert/src/java/com/samskivert/util/StringUtil.java b/projects/samskivert/src/java/com/samskivert/util/StringUtil.java
index <HASH>..<HASH> 100644
--- a/projects/samskivert/src/java/com/samskivert/util/StringUtil.java
+++ b/projects/samskivert/src/java/com/samskivert/util/StringUtil.java
@@ -1,5 +1,5 @@
//
-// $Id: StringUtil.java,v 1.3 2001/02/13 19:54:43 mdb Exp $
+// $Id: StringUtil.java,v 1.4 2001/03/02 01:49:48 mdb Exp $
package com.samskivert.util;
@@ -121,4 +121,26 @@ public class StringUtil
return buf.toString();
}
+
+ /**
+ * Generates a string from the supplied bytes that is the HEX encoded
+ * representation of those bytes.
+ */
+ public static String hexlate (byte[] bytes)
+ {
+ char[] chars = new char[bytes.length*2];
+
+ for (int i = 0; i < chars.length; i++) {
+ int val = (int)chars[i];
+ if (val < 0) {
+ val += 256;
+ }
+ chars[2*i] = XLATE.charAt(val/16);
+ chars[2*i+1] = XLATE.charAt(val%16);
+ }
+
+ return new String(chars);
+ }
+
+ private final static String XLATE = "0123456789abcdef";
} | Added hexlate() a function that takes an array of bytes and returns a
string that is the hex encoding of said bytes.
git-svn-id: <URL> |
diff --git a/src/components/Editor/SearchBar.js b/src/components/Editor/SearchBar.js
index <HASH>..<HASH> 100644
--- a/src/components/Editor/SearchBar.js
+++ b/src/components/Editor/SearchBar.js
@@ -477,7 +477,7 @@ class SearchBar extends Component {
}
onKeyUp(e: SyntheticKeyboardEvent) {
- if (e.key != "Enter") {
+ if (e.key !== "Enter" || e.key !== "F3") {
return;
} | Added F3 for searching. (#<I>) |
diff --git a/tests/test_include.py b/tests/test_include.py
index <HASH>..<HASH> 100644
--- a/tests/test_include.py
+++ b/tests/test_include.py
@@ -1,8 +1,13 @@
import pytest
from django.db.models import Count
-from django.db.models import OuterRef
-from django.db.models import Subquery
+try:
+ from django.db.models import OuterRef
+ from django.db.models import Subquery
+except ImportError: # Django < 1.11
+ HAS_SUBQUERIES = False
+else:
+ HAS_SUBQUERIES = True
from tests import models
from tests import factories
@@ -17,6 +22,7 @@ class TestQuerySet:
assert len(models.Cat.objects.include().all()) == 10
assert models.Cat.objects.include().all().count() == 10
+ @pytest.mark.skipif(not HAS_SUBQUERIES, reason='Subqueries not supported on older Django versions')
def test_values(self):
qs = models.Cat.objects.include('archetype')
list(qs.filter(id__in=Subquery(qs.filter(id=OuterRef('pk')).values('pk')))) | Fix tests on older versions of Django |
diff --git a/lnd_test.go b/lnd_test.go
index <HASH>..<HASH> 100644
--- a/lnd_test.go
+++ b/lnd_test.go
@@ -4847,6 +4847,15 @@ func TestLightningNetworkDaemon(t *testing.T) {
t.Logf("Running %v integration tests", len(testsCases))
for _, testCase := range testsCases {
+ logLine := fmt.Sprintf("STARTING ============ %v ============\n",
+ testCase.name)
+ if err := lndHarness.Alice.AddToLog(logLine); err != nil {
+ t.Fatalf("unable to add to log: %v", err)
+ }
+ if err := lndHarness.Bob.AddToLog(logLine); err != nil {
+ t.Fatalf("unable to add to log: %v", err)
+ }
+
success := t.Run(testCase.name, func(t1 *testing.T) {
ht := newHarnessTest(t1)
ht.RunTestCase(testCase, lndHarness) | lnd_test: add name of testcase to node's logfile
This commit adds a line of text including a test case's
name to Alice's and Bob's logfiles during integration
tests, making it easier to seek for the place in the log
where the specific tests start. |
diff --git a/res/tests/axelitus/Base/TestsDotArr.php b/res/tests/axelitus/Base/TestsDotArr.php
index <HASH>..<HASH> 100644
--- a/res/tests/axelitus/Base/TestsDotArr.php
+++ b/res/tests/axelitus/Base/TestsDotArr.php
@@ -62,6 +62,7 @@ class TestsDotArr extends TestCase
$this->assertEquals(['a.aa' => 'A.AA', 'b' => 'B'], DotArr::get(['a' => ['aa' => 'A.AA'], 'b' => 'B', 'c' => 'C'], ['a.aa', 'b']));
$this->assertEquals(['a.aa' => 'A.AA', 'd' => null], DotArr::get(['a' => ['aa' => 'A.AA'], 'b' => 'B', 'c' => 'C'], ['a.aa', 'd']));
+ $this->assertEquals(['a.aa' => 'A.AA', 'a.aaa' => null], DotArr::get(['a' => ['aa' => 'A.AA'], 'b' => 'B', 'c' => 'C'], ['a.aa', 'a.aaa']));
}
public function testGetEx01() | Added a test for DotArr::get() fucntion. |
diff --git a/tests/src/java/com/threerings/presents/server/RefTest.java b/tests/src/java/com/threerings/presents/server/RefTest.java
index <HASH>..<HASH> 100644
--- a/tests/src/java/com/threerings/presents/server/RefTest.java
+++ b/tests/src/java/com/threerings/presents/server/RefTest.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.assertTrue;
/**
* Tests the oid list reference tracking code.
*/
-public class RefTest extends PresentsTest
+public class RefTest extends PresentsTestBase
{
@Test public void runTest ()
{ | That ended up being called PresentsTestBase.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@<I> <I>f4-<I>e9-<I>-aa3c-eee0fc<I>fb1 |
diff --git a/tornado/test/twisted_test.py b/tornado/test/twisted_test.py
index <HASH>..<HASH> 100644
--- a/tornado/test/twisted_test.py
+++ b/tornado/test/twisted_test.py
@@ -453,9 +453,10 @@ else:
# Doesn't clean up its temp files
'test_shebang',
],
- 'twisted.internet.test.test_process.PTYProcessTestsBuilder': [
- 'test_systemCallUninterruptedByChildExit',
- ],
+ # Process tests appear to work on OSX 10.7, but not 10.6
+ #'twisted.internet.test.test_process.PTYProcessTestsBuilder': [
+ # 'test_systemCallUninterruptedByChildExit',
+ # ],
'twisted.internet.test.test_tcp.TCPClientTestsBuilder': [
'test_badContext', # ssl-related; see also SSLClientTestsMixin
], | Disable twisted process tests, which don't work for me on OSX <I> |
diff --git a/lib/commands/execute.js b/lib/commands/execute.js
index <HASH>..<HASH> 100644
--- a/lib/commands/execute.js
+++ b/lib/commands/execute.js
@@ -8,6 +8,17 @@ import logger from '../logger';
let commands = {}, helpers = {}, extensions = {};
commands.execute = async function (script, args) {
+ if (script.match(/^mobile\:/)) {
+ script = script.replace(/^mobile\:/, '').trim();
+ return await this.executeMobile(script, _.isArray(args) ? args[0] : args);
+ } else {
+ if (this.isWebContext()) {
+ args = this.convertElementsForAtoms(args);
+ return await this.executeAtom('execute_script', [script, args]);
+ } else {
+ return await this.uiAutoClient.sendCommand(script);
+ }
+ }
if (this.isWebContext()) {
args = this.convertElementsForAtoms(args);
return await this.executeAtom('execute_script', [script, args]); | Make sure mobile:scroll is checked before web execute |
diff --git a/media/boom/js/boom/chunk/asset/editor.js b/media/boom/js/boom/chunk/asset/editor.js
index <HASH>..<HASH> 100644
--- a/media/boom/js/boom/chunk/asset/editor.js
+++ b/media/boom/js/boom/chunk/asset/editor.js
@@ -38,7 +38,7 @@ function boomChunkAssetEditor(pageId, slotname, visibleElements) {
asset_id : this.asset.attr('data-asset-id'),
caption : this.caption.find('textarea').val(),
url : this.link.find('input').val(),
- title : this.title.find('input').val()
+ title : this.title.find('textarea').val()
};
}; | Bugfix: asset chunk title not saving |
diff --git a/rpcserver.go b/rpcserver.go
index <HASH>..<HASH> 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -214,6 +214,7 @@ func WalletRequestProcessor() {
// ignore
case tx.ErrInconsistantStore:
+ log.Warn("Detected inconsistant TxStore. Reconnecting...")
// Likely due to a mis-ordered btcd notification.
// To recover, close server connection and reopen
// all accounts from their last good state saved | Warn when inconsistant TxStore is detected. |
diff --git a/tests/PlayerTest.php b/tests/PlayerTest.php
index <HASH>..<HASH> 100644
--- a/tests/PlayerTest.php
+++ b/tests/PlayerTest.php
@@ -20,7 +20,7 @@ class PlayerTest extends TestCase
public function can_queue_a_play()
{
$player = new Player();
- $player->play('spock');
+ $player->move('spock');
$last_move = $player->getLastMove();
@@ -31,7 +31,7 @@ class PlayerTest extends TestCase
public function can_get_move_history()
{
$player = new Player();
- $player->play('rock');
+ $player->move('rock');
$history = $player->getMoveHistory();
@@ -44,7 +44,7 @@ class PlayerTest extends TestCase
$this->expectException(RockPaperScissorsSpockLizardException::class);
$player = new Player();
- $player->play('paper');
- $player->play('scissors');
+ $player->move('paper');
+ $player->move('scissors');
}
}
\ No newline at end of file | Updated test to reflect method name change from play() to move() |
diff --git a/website/data/alert-banner.js b/website/data/alert-banner.js
index <HASH>..<HASH> 100644
--- a/website/data/alert-banner.js
+++ b/website/data/alert-banner.js
@@ -8,5 +8,5 @@ export default {
linkText: 'Join Now',
// Set the expirationDate prop with a datetime string (e.g. '2020-01-31T12:00:00-07:00')
// if you'd like the component to stop showing at or after a certain date
- expirationDate: '2021-10-21T12:00:00-07:00',
+ expirationDate: '2021-10-20T23:00:00-07:00',
} | Update HashiConf alert-banner expiration
Updates the HashiConf Alert Banner expiration to <I>/<I> @ <I>pm (PT) |
diff --git a/brozzler/browser.py b/brozzler/browser.py
index <HASH>..<HASH> 100644
--- a/brozzler/browser.py
+++ b/brozzler/browser.py
@@ -506,7 +506,6 @@ class Chrome:
# start_new_session - new process group so we can kill the whole group
self.chrome_process = subprocess.Popen(chrome_args, env=new_env,
stdout=subprocess.PIPE, stderr=subprocess.PIPE, bufsize=0,
- creationflags=subprocess.CREATE_NEW_PROCESS_GROUP,
start_new_session=True)
self._out_reader_thread = threading.Thread(target=self._read_stderr_stdout,
name="ChromeOutReaderThread(pid={})".format(self.chrome_process.pid))
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ import setuptools
setuptools.setup(
name='brozzler',
- version='1.1.dev42',
+ version='1.1.dev43',
description='Distributed web crawling with browsers',
url='https://github.com/internetarchive/brozzler',
author='Noah Levitt', | oops didn't mean to leave that windows-only subprocess flag |
diff --git a/lib/ProMotion/table/cell/table_view_cell_module.rb b/lib/ProMotion/table/cell/table_view_cell_module.rb
index <HASH>..<HASH> 100644
--- a/lib/ProMotion/table/cell/table_view_cell_module.rb
+++ b/lib/ProMotion/table/cell/table_view_cell_module.rb
@@ -22,7 +22,7 @@ module ProMotion
# TODO: Remove this in ProMotion 2.1. Just for migration purposes.
def check_deprecated_styles
- whitelist = [ :title, :subtitle, :image, :remote_image, :accessory, :selection_style, :action, :arguments, :cell_style, :cell_class, :cell_identifier, :editing_style, :search_text, :keep_selection, :height ]
+ whitelist = [ :title, :subtitle, :image, :remote_image, :accessory, :selection_style, :action, :long_press_action, :arguments, :cell_style, :cell_class, :cell_identifier, :editing_style, :search_text, :keep_selection, :height ]
if (data_cell.keys - whitelist).length > 0
PM.logger.deprecated("In #{self.table_screen.class.to_s}#table_data, you should set :#{(data_cell.keys - whitelist).join(", :")} in a `styles:` hash. See TableScreen documentation.")
end | Add long_press_action to the cell non-deprecated whitelist. |
diff --git a/src/lib/Supra/Controller/Pages/Filter/ParsedHtmlFilter.php b/src/lib/Supra/Controller/Pages/Filter/ParsedHtmlFilter.php
index <HASH>..<HASH> 100644
--- a/src/lib/Supra/Controller/Pages/Filter/ParsedHtmlFilter.php
+++ b/src/lib/Supra/Controller/Pages/Filter/ParsedHtmlFilter.php
@@ -42,8 +42,6 @@ class ParsedHtmlFilter implements FilterInterface
*/
private function parseSupraLinkStart(Entity\ReferencedElement\LinkReferencedElement $link)
{
- ObjectRepository::setCallerParent($link, $this);
-
$attributes = array(
'target' => $link->getTarget(),
'title' => $link->getTitle(),
@@ -194,6 +192,8 @@ class ParsedHtmlFilter implements FilterInterface
else {
$link = $metadataItem->getReferencedElement();
+ // Overwriting in case of duplicate markup tag usage
+ ObjectRepository::setCallerParent($link, $this, true);
$result[] = $this->parseSupraLinkStart($link);
}
} | Bug #<I> fixed, ObjectRepository::setCallerParent was called twice, guess because of duplicate supra link markup ID inside the editable HTML.
git-svn-id: <URL> |
diff --git a/charmhelpers/contrib/openstack/neutron.py b/charmhelpers/contrib/openstack/neutron.py
index <HASH>..<HASH> 100644
--- a/charmhelpers/contrib/openstack/neutron.py
+++ b/charmhelpers/contrib/openstack/neutron.py
@@ -249,6 +249,8 @@ def neutron_plugins():
plugins['nsx']['server_packages'].remove('neutron-plugin-vmware')
plugins['nsx']['server_packages'].append('python-vmware-nsx')
plugins['nsx']['config'] = '/etc/neutron/nsx.ini'
+ plugins['vsp']['driver'] = (
+ 'nuage_neutron.plugins.nuage.plugin.NuagePlugin')
return plugins | Added Nuage Neutron plugin information for mitaka release when neutron-plugin is vsp |
diff --git a/lib/daru/dataframe.rb b/lib/daru/dataframe.rb
index <HASH>..<HASH> 100644
--- a/lib/daru/dataframe.rb
+++ b/lib/daru/dataframe.rb
@@ -357,8 +357,7 @@ module Daru
# Access row or vector. Specify name of row/vector followed by axis(:row, :vector).
# Defaults to *:vector*. Use of this method is not recommended for accessing
- # rows or vectors. Use df.row[:a] for accessing row with index ':a' or
- # df.vector[:vec] for accessing vector with index *:vec*.
+ # rows. Use df.row[:a] for accessing row with index ':a'.
def [](*names)
if names[-1] == :vector or names[-1] == :row
axis = names[-1] | Fix doc recommending against using []
The comments on the #vector method say that it has been deprecated, but the comments
on #[] say to use #vector. I think #[] is actually preferred. |
diff --git a/luigi/scheduler.py b/luigi/scheduler.py
index <HASH>..<HASH> 100644
--- a/luigi/scheduler.py
+++ b/luigi/scheduler.py
@@ -127,6 +127,10 @@ class CentralPlannerScheduler(Scheduler):
self.update(worker)
task = self._tasks.setdefault(task_id, Task(status=PENDING, deps=deps))
+
+ if task.remove is not None:
+ task.remove = None # unmark task for removal so it isn't removed after being added
+
if not (task.status == RUNNING and status == PENDING):
# don't allow re-scheduling of task while it is running, it must either fail or succeed first
task.status = status | Dont remove tasks that are added after removal mark
Change-Id: I<I>ebd<I>e<I>e<I>e4b4c<I>f4c<I>b
Reviewed-on: <URL> |
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -39,7 +39,7 @@ module.exports = function(Parser) {
// Not a BigInt, reset and parse again
if (this.input.charCodeAt(this.pos) != 110) {
this.pos = start
- super.readNumber(startsWithDot)
+ return super.readNumber(startsWithDot)
}
let str = this.input.slice(start, this.pos) | Fix parsing of normal int literals |
diff --git a/test/Expr/NotLikeExprTest.php b/test/Expr/NotLikeExprTest.php
index <HASH>..<HASH> 100644
--- a/test/Expr/NotLikeExprTest.php
+++ b/test/Expr/NotLikeExprTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Cekurte\Resource\Query\Language\Test;
+namespace Cekurte\Resource\Query\Language\Test\Expr;
use Cekurte\Resource\Query\Language\Expr\NotLikeExpr;
use Cekurte\Tdd\ReflectionTestCase; | Added the php unit tests to the NotLikeExpr class. |
diff --git a/core/src/main/java/io/grpc/inprocess/InProcessSocketAddress.java b/core/src/main/java/io/grpc/inprocess/InProcessSocketAddress.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/io/grpc/inprocess/InProcessSocketAddress.java
+++ b/core/src/main/java/io/grpc/inprocess/InProcessSocketAddress.java
@@ -33,4 +33,9 @@ public final class InProcessSocketAddress extends SocketAddress {
public String getName() {
return name;
}
+
+ @Override
+ public String toString() {
+ return name;
+ }
} | inprocess: add a toString for InProcessSocketAddress
The motivation here is in some cases we log the remote-addr that is set in the gRPC call attributes, and have to special case this type to support inprocess servers. |
diff --git a/bw2python/client.py b/bw2python/client.py
index <HASH>..<HASH> 100644
--- a/bw2python/client.py
+++ b/bw2python/client.py
@@ -16,8 +16,8 @@ class Client(object):
if handler is not None:
status = frame.getFirstValue("status")
reason = frame.getFirstValue("reason")
- response = BosswaveResponse(status, reason)
- handler(response)
+ response = BosswaveResponse(status, reason)
+ handler(response)
elif frame.command == "rslt":
finished = frame.getFirstValue("finished") | Fixed problem with null response handlers |
diff --git a/src/IndexManager.php b/src/IndexManager.php
index <HASH>..<HASH> 100644
--- a/src/IndexManager.php
+++ b/src/IndexManager.php
@@ -10,12 +10,11 @@ use Symfony\Component\PropertyAccess\PropertyAccess;
class IndexManager implements IndexManagerInterface
{
- public $propertyAccessor;
-
protected $engine;
protected $configuration;
protected $useSerializerGroups;
+ private $propertyAccessor;
private $searchableEntities;
private $aggregators;
private $entitiesAggregators; | Property accessor wasn't public before |
diff --git a/gspread/worksheet.py b/gspread/worksheet.py
index <HASH>..<HASH> 100644
--- a/gspread/worksheet.py
+++ b/gspread/worksheet.py
@@ -1414,6 +1414,26 @@ class Worksheet:
return self.spreadsheet.batch_update(body)
+ def delete_protected_range(self, id):
+ """Delete protected range identified by the ID ``id``.
+
+ To retrieve the ID of a protected range use the following method
+ to list them all:
+ :func:`~gspread.Spreadsheet.list_protected_ranges`
+ """
+
+ body = {
+ "requests": [
+ {
+ "deleteProtectedRange": {
+ "protectedRangeId": id,
+ }
+ }
+ ]
+ }
+
+ return self.spreadsheet.batch_update(body)
+
def delete_dimension(self, dimension, start_index, end_index=None):
"""Deletes multi rows from the worksheet at the specified index. | Add method to delete a protected range
Add a new method to delete a protected range.
In order to retrieve the `ID` of a protected range, use the method
`gspread.Spreadsheet.list_protected_ranges`.
closes #<I> |
diff --git a/lib/pragmater/formatter.rb b/lib/pragmater/formatter.rb
index <HASH>..<HASH> 100644
--- a/lib/pragmater/formatter.rb
+++ b/lib/pragmater/formatter.rb
@@ -27,6 +27,10 @@ module Pragmater
/x
end
+ def self.valid_formats
+ Regexp.union shebang_format, pragma_format
+ end
+
def initialize comment
@comment = comment
end
diff --git a/spec/lib/pragmater/formatter_spec.rb b/spec/lib/pragmater/formatter_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/lib/pragmater/formatter_spec.rb
+++ b/spec/lib/pragmater/formatter_spec.rb
@@ -55,6 +55,20 @@ RSpec.describe Pragmater::Formatter do
end
end
+ describe ".valid_formats" do
+ it "match shebang format" do
+ expect(described_class.valid_formats).to match("#! /usr/bin/ruby")
+ end
+
+ it "match frozen string literal format" do
+ expect(described_class.valid_formats).to match("# frozen_string_literal: true")
+ end
+
+ it "does not match general comments" do
+ expect(described_class.valid_formats).to_not match("# A example comment.")
+ end
+ end
+
describe "#format_shebang" do
subject { described_class.new comment } | Added valid formats to Formatter.
- Provides a convenience method for answering all
possible valid comment formats. |
diff --git a/src/Models/Corporation/CorporationMemberTracking.php b/src/Models/Corporation/CorporationMemberTracking.php
index <HASH>..<HASH> 100644
--- a/src/Models/Corporation/CorporationMemberTracking.php
+++ b/src/Models/Corporation/CorporationMemberTracking.php
@@ -23,12 +23,12 @@
namespace Seat\Eveapi\Models\Corporation;
use Illuminate\Database\Eloquent\Model;
+use Seat\Eveapi\Models\RefreshToken;
use Seat\Eveapi\Models\Sde\InvType;
use Seat\Eveapi\Models\Sde\MapDenormalize;
use Seat\Eveapi\Models\Sde\StaStation;
use Seat\Eveapi\Models\Universe\UniverseName;
use Seat\Eveapi\Models\Universe\UniverseStructure;
-use Seat\Web\Models\User;
/**
* Class CorporationMemberTracking.
@@ -196,10 +196,10 @@ class CorporationMemberTracking extends Model
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
* @deprecated
*/
- public function user()
+ public function refresh_token()
{
- return $this->belongsTo(User::class, 'character_id', 'id');
+ return $this->belongsTo(RefreshToken::class, 'character_id', 'character_id');
}
/** | fix(relations): Update relation for CorporationMemberTracking model from User to RefreshToken |
diff --git a/framework/core/js/lib/helpers/username.js b/framework/core/js/lib/helpers/username.js
index <HASH>..<HASH> 100644
--- a/framework/core/js/lib/helpers/username.js
+++ b/framework/core/js/lib/helpers/username.js
@@ -6,7 +6,7 @@
* @return {Object}
*/
export default function username(user) {
- const name = (user && user.username()) || app.translator.trans('core.lib.deleted_user_text');
+ const name = (user && user.username()) || app.translator.trans('core.lib.username.deleted_text');
return <span className="username">{name}</span>;
} | Add third-level namespacing to deleted_user_text |
diff --git a/lib/write_xlsx/workbook.rb b/lib/write_xlsx/workbook.rb
index <HASH>..<HASH> 100644
--- a/lib/write_xlsx/workbook.rb
+++ b/lib/write_xlsx/workbook.rb
@@ -164,6 +164,30 @@ module Writexlsx
end
#
+ # Set the date system: false = 1900 (the default), true = 1904
+ #
+ # Excel stores dates as real numbers where the integer part stores
+ # the number of days since the epoch and the fractional part stores
+ # the percentage of the day. The epoch can be either 1900 or 1904.
+ # Excel for Windows uses 1900 and Excel for Macintosh uses 1904.
+ # However, Excel on either platform will convert automatically between
+ # one system and the other.
+ #
+ # WriteXLSX stores dates in the 1900 format by default. If you wish to
+ # change this you can call the set_1904() workbook method.
+ # You can query the current value by calling the get_1904() workbook method.
+ # This returns 0 for 1900 and 1 for 1904.
+ #
+ # In general you probably won't need to use set_1904().
+ #
+ def set_1904(mode = true)
+ unless sheets.empty?
+ raise "set_1904() must be called before add_worksheet()"
+ end
+ @date_1904 = (!mode || mode == 0) ? false : true
+ end
+
+ #
# user must not use. it is internal method.
#
def set_xml_writer(filename) #:nodoc: | * Workbook#set_<I> added. |
diff --git a/lib/ruote/exp/fe_participant.rb b/lib/ruote/exp/fe_participant.rb
index <HASH>..<HASH> 100644
--- a/lib/ruote/exp/fe_participant.rb
+++ b/lib/ruote/exp/fe_participant.rb
@@ -103,11 +103,12 @@ module Ruote
def do_dispatch (participant)
- participant.consume(@applied_workitem)
+ wi = @applied_workitem.dup
+
+ participant.consume(wi)
wqueue.emit(
- :workitems, :dispatched,
- :workitem => @applied_workitem, :pname => @participant_name)
+ :workitems, :dispatched, :workitem => wi, :pname => @participant_name)
end
end
end | handing a copy of the workitem to participant |
diff --git a/examples/sampleserver.py b/examples/sampleserver.py
index <HASH>..<HASH> 100644
--- a/examples/sampleserver.py
+++ b/examples/sampleserver.py
@@ -47,6 +47,7 @@ class ConcreteServer(OpenIDServer):
raise ProtocolError('Unknown assoc_type: %r' % assoc_type)
def lookup_secret(self, assoc_handle):
+ print (assoc_handle, self.assoc_store)
return self.assoc_store.get(assoc_handle)
def get_server_secret(self): | [project @ Added debugging] |
diff --git a/plugins/Eav/src/Model/Behavior/EavBehavior.php b/plugins/Eav/src/Model/Behavior/EavBehavior.php
index <HASH>..<HASH> 100644
--- a/plugins/Eav/src/Model/Behavior/EavBehavior.php
+++ b/plugins/Eav/src/Model/Behavior/EavBehavior.php
@@ -490,13 +490,21 @@ class EavBehavior extends Behavior
*/
public function hydrateEntity(EntityInterface $entity, array $values)
{
+ $virtualProperties = (array)$entity->virtualProperties();
+
foreach ($values as $value) {
if (!$this->_toolbox->propertyExists($entity, $value['property_name'])) {
+ if (!in_array($value['property_name'], $virtualProperties)) {
+ $virtualProperties[] = $value['property_name'];
+ }
+
$entity->set($value['property_name'], $value['value']);
$entity->dirty($value['property_name'], false);
}
}
+ $entity->virtualProperties($virtualProperties);
+
// force cache-columns to be of the proper type as they might be NULL if
// entity has not been updated yet.
if ($this->config('cacheMap')) { | Expose eav columns as virtual properties |
diff --git a/concrete/elements/page_types/composer/controls/core_page_property/url_slug.php b/concrete/elements/page_types/composer/controls/core_page_property/url_slug.php
index <HASH>..<HASH> 100644
--- a/concrete/elements/page_types/composer/controls/core_page_property/url_slug.php
+++ b/concrete/elements/page_types/composer/controls/core_page_property/url_slug.php
@@ -73,7 +73,6 @@ $resolverManager = app(ResolverManagerInterface::class);
$('.ccm-composer-url-slug-loading').show();
$.post(
<?= json_encode((string) $resolverManager->resolve(['/ccm/system/page/url_slug'])) ?>,
- '<?=REL_DIR_FILES_TOOLS_REQUIRED?>/pages/url_slug',
send,
function(r) {
$('.ccm-composer-url-slug-loading').hide(); | Fix bug introduced in <I>e7b<I>ffb<I>edbda0a8b<I>e<I> |
diff --git a/upload/catalog/model/account/reward.php b/upload/catalog/model/account/reward.php
index <HASH>..<HASH> 100644
--- a/upload/catalog/model/account/reward.php
+++ b/upload/catalog/model/account/reward.php
@@ -42,14 +42,14 @@ class Reward extends \Opencart\System\Engine\Model {
public function getTotalRewards(): int {
$query = $this->db->query("SELECT COUNT(*) AS `total` FROM `" . DB_PREFIX . "customer_reward` WHERE `customer_id` = '" . (int)$this->customer->getId() . "'");
- return $query->row['total'];
+ return (int)$query->row['total'];
}
public function getTotalPoints(): int {
$query = $this->db->query("SELECT SUM(`points`) AS `total` FROM `" . DB_PREFIX . "customer_reward` WHERE `customer_id` = '" . (int)$this->customer->getId() . "' GROUP BY `customer_id`");
if ($query->num_rows) {
- return $query->row['total'];
+ return (int)$query->row['total'];
} else {
return 0;
} | Added sanitized int on total |
diff --git a/lib/workers/pr/index.js b/lib/workers/pr/index.js
index <HASH>..<HASH> 100644
--- a/lib/workers/pr/index.js
+++ b/lib/workers/pr/index.js
@@ -129,8 +129,7 @@ async function ensurePr(prConfig) {
let prBody;
async function trimPrBody() {
let prBodyMarkdown = handlebars.compile(config.prBody)(config);
- const atUserRe = /[^`]@([a-z]+\/[a-z]+)/g;
- prBodyMarkdown = prBodyMarkdown.replace(atUserRe, '@​$1');
+ prBodyMarkdown = prBodyMarkdown.replace('@', '@​');
prBody = converter.makeHtml(prBodyMarkdown);
// Public GitHub repos need links prevented - see #489
prBody = prBody.replace(issueRe, '$1#​$2$3'); | fix: escape every @ in pr body with zero width space (#<I>) |
diff --git a/mockServerClient.js b/mockServerClient.js
index <HASH>..<HASH> 100644
--- a/mockServerClient.js
+++ b/mockServerClient.js
@@ -384,11 +384,17 @@ var mockServerClient;
if (Array.isArray(expectation)) {
for (var i = 0; i < expectation.length; i++) {
expectation[i].httpRequest = addDefaultRequestMatcherHeaders(expectation[i].httpRequest);
- expectation[i].httpResponse = addDefaultResponseMatcherHeaders(expectation[i].httpResponse);
+ if(!expectation[i].httpForward) {
+ expectation[i].httpResponse = addDefaultResponseMatcherHeaders(
+ expectation[i].httpResponse);
+ }
}
} else {
expectation.httpRequest = addDefaultRequestMatcherHeaders(expectation.httpRequest);
- expectation.httpResponse = addDefaultResponseMatcherHeaders(expectation.httpResponse);
+ if(!expectation.httpForward) {
+ expectation.httpResponse = addDefaultResponseMatcherHeaders(
+ expectation.httpResponse);
+ }
}
return expectation;
}; | Fix header for httpForward
Issue related: <URL> |
diff --git a/shared/logging/log_posix.go b/shared/logging/log_posix.go
index <HASH>..<HASH> 100644
--- a/shared/logging/log_posix.go
+++ b/shared/logging/log_posix.go
@@ -3,6 +3,8 @@
package logging
import (
+ slog "log/syslog"
+
log "gopkg.in/inconshreveable/log15.v2"
)
@@ -13,11 +15,11 @@ func getSystemHandler(syslog string, debug bool, format log.Format) log.Handler
if !debug {
return log.LvlFilterHandler(
log.LvlInfo,
- log.Must.SyslogHandler(syslog, format),
+ log.Must.SyslogHandler(slog.LOG_INFO, syslog, format),
)
}
- return log.Must.SyslogHandler(syslog, format)
+ return log.Must.SyslogHandler(slog.LOG_INFO, syslog, format)
}
return nil | Temporary workaround for log<I> API breakage
log<I> broke their v2 API earlier today, this change should get things
building again until upstream log<I> fixes the API breakage.
Related: <URL> |
diff --git a/test/adapter.spec.js b/test/adapter.spec.js
index <HASH>..<HASH> 100644
--- a/test/adapter.spec.js
+++ b/test/adapter.spec.js
@@ -59,7 +59,8 @@ describe('mocha adapter', () => {
let adapter, load, send, sendInternal, originalCWD
let cid = 1
- let config = { framework: 'mocha' }
+ const title = 'mocha-tests'
+ let config = { framework: 'mocha', title: title }
let specs = ['fileA.js', 'fileB.js']
let caps = { browserName: 'chrome' }
@@ -117,6 +118,7 @@ describe('mocha adapter', () => {
let msg = send.firstCall.args[0]
msg.type.should.be.exactly('suite:start')
msg.cid.should.be.exactly(cid)
+ msg.uid.should.be.equal(title)
msg.specs.should.be.exactly(specs)
msg.runner[cid].should.be.exactly(caps)
msg.err.should.not.have.property('unAllowedProp')
@@ -135,6 +137,7 @@ describe('mocha adapter', () => {
let msg = sendInternal.firstCall.args[1]
msg.cid.should.be.exactly(cid)
+ msg.uid.should.be.equal(title)
msg.specs.should.be.exactly(specs)
msg.runner[cid].should.be.exactly(caps)
}) | Added check for uid to the test scenario’s |
diff --git a/compliance_checker/cf/cf.py b/compliance_checker/cf/cf.py
index <HASH>..<HASH> 100644
--- a/compliance_checker/cf/cf.py
+++ b/compliance_checker/cf/cf.py
@@ -2462,8 +2462,8 @@ class CFBaseCheck(BaseCheck):
expected_std_names = grid_mapping[2]
for expected_std_name in expected_std_names:
found_vars = ds.get_variables_by_attributes(standard_name=expected_std_name)
- valid_grid_mapping.assert_true(len(found_vars) == 1,
- "grid mapping {} requires exactly ".format(grid_mapping_name)+\
+ valid_grid_mapping.assert_true(len(found_vars) >= 1,
+ "grid mapping {} requires at least ".format(grid_mapping_name)+\
"one variable with standard_name "+\
"{} to be defined".format(expected_std_name)) | mod. check of req. vars with std.name for grid map; fixed #<I>
Modified the checking of the number of variables with spezific
attributes required by a grid mapping. Previously `==1` was checked (are
variable with a specific required standard name was allowed to exist
only once). Now, `>=1` is checked (the variable has to exist at least
once). The user output was updated accordingly. |
diff --git a/src/utils/services/call.js b/src/utils/services/call.js
index <HASH>..<HASH> 100644
--- a/src/utils/services/call.js
+++ b/src/utils/services/call.js
@@ -12,10 +12,12 @@ var rpcClient = new JsonRpc2Client()
// TODO: add api.onMethod('methodName')
// TODO: add api.onNotification('methodName')
-export default function callService (methodName, params, secretKey) {
+export default function callService (methodName, params, options) {
// API
params = params || {}
+ options = options || {}
+ var secretKey = options.secretKey
// try cache
// var cacheKey | Updated services API to be more specific and extendable |
diff --git a/sorl/thumbnail/admin/compat.py b/sorl/thumbnail/admin/compat.py
index <HASH>..<HASH> 100644
--- a/sorl/thumbnail/admin/compat.py
+++ b/sorl/thumbnail/admin/compat.py
@@ -75,6 +75,8 @@ class AdminImageMixin(object):
"""
def formfield_for_dbfield(self, db_field, **kwargs):
if isinstance(db_field, ImageField):
+ if not db_field.blank:
+ return db_field.formfield(widget=AdminImageWidget)
return db_field.formfield(
form_class=ClearableImageFormField,
widget=AdminClearableImageWidget, | fixed bug for reuired images in admin < <I> |
diff --git a/src/PlaceService.php b/src/PlaceService.php
index <HASH>..<HASH> 100644
--- a/src/PlaceService.php
+++ b/src/PlaceService.php
@@ -4,6 +4,11 @@
*/
namespace CultuurNet\UDB3;
+/**
+ * Class PlaceService
+ * @package CultuurNet\UDB3
+ * @deprecated use LocalPlaceService instead
+ */
class PlaceService extends LocalEntityService
{
} | III-<I> Marked PlaceService as obsolete and should use LocalPlaceService instead. |
diff --git a/two_factor/management/commands/two_factor_disable.py b/two_factor/management/commands/two_factor_disable.py
index <HASH>..<HASH> 100644
--- a/two_factor/management/commands/two_factor_disable.py
+++ b/two_factor/management/commands/two_factor_disable.py
@@ -12,7 +12,7 @@ class Command(BaseCommand):
Example usage::
- manage.py disable bouke steve
+ manage.py two_factor_disable bouke steve
"""
help = 'Disables two-factor authentication for the given users'
diff --git a/two_factor/management/commands/two_factor_status.py b/two_factor/management/commands/two_factor_status.py
index <HASH>..<HASH> 100644
--- a/two_factor/management/commands/two_factor_status.py
+++ b/two_factor/management/commands/two_factor_status.py
@@ -13,7 +13,7 @@ class Command(BaseCommand):
Example usage::
- manage.py status bouke steve
+ manage.py two_factor_status bouke steve
bouke: enabled
steve: disabled
""" | Update management cmd doc strings to reflect the actual command (#<I>)
* update doc string for two_factor_disable command
* update doc string for two_factor_status command |
diff --git a/spyder/plugins/editor/widgets/editor.py b/spyder/plugins/editor/widgets/editor.py
index <HASH>..<HASH> 100644
--- a/spyder/plugins/editor/widgets/editor.py
+++ b/spyder/plugins/editor/widgets/editor.py
@@ -1344,19 +1344,16 @@ class EditorStack(QWidget):
# Regular actions
actions = [MENU_SEPARATOR, self.versplit_action,
self.horsplit_action, self.close_action]
- if plugin is not None:
- actions += [MENU_SEPARATOR, self.new_window_action,
- plugin.undock_action, plugin.close_plugin_action]
- # Actions when the stack is part of an undocked window
if self.new_window:
- actions = [MENU_SEPARATOR, self.versplit_action,
- self.horsplit_action, self.close_action]
- if plugin is not None:
- if plugin.undocked_window:
- actions += [MENU_SEPARATOR, plugin.dock_action]
- else:
- actions += [MENU_SEPARATOR, self.new_window_action]
+ actions += [MENU_SEPARATOR, self.new_window_action]
+ elif plugin is not None:
+ if plugin.undocked_window is not None:
+ actions += [MENU_SEPARATOR, plugin.dock_action]
+ else:
+ actions += [MENU_SEPARATOR, self.new_window_action,
+ plugin.undock_action, plugin.close_plugin_action]
+
return actions
def reset_orientation(self): | Editor: Fix actions shown in its Options menu for undocked and new windows |
diff --git a/openfisca_web_api/controllers/simulate.py b/openfisca_web_api/controllers/simulate.py
index <HASH>..<HASH> 100644
--- a/openfisca_web_api/controllers/simulate.py
+++ b/openfisca_web_api/controllers/simulate.py
@@ -228,6 +228,8 @@ def api1_simulate(req):
).iteritems())),
headers = headers,
)
+ except ValueError as exc:
+ wsgihelpers.handle_error(exc, ctx, headers)
if data['reforms'] is not None:
reform_decomposition_json = model.get_cached_or_new_decomposition_json(reform_tax_benefit_system)
@@ -254,6 +256,8 @@ def api1_simulate(req):
).iteritems())),
headers = headers,
)
+ except ValueError as exc:
+ wsgihelpers.handle_error(exc, ctx, headers)
if data['trace']:
simulations_variables_json = [] | Return nice errors to user during decomposition calculation |
diff --git a/datastore.go b/datastore.go
index <HASH>..<HASH> 100644
--- a/datastore.go
+++ b/datastore.go
@@ -73,6 +73,7 @@ func (d *datastore) QueryNew(q dsq.Query) (dsq.Results, error) {
return d.QueryOrig(q)
}
+ prefix := []byte(q.Prefix)
opt := badger.DefaultIteratorOptions
opt.FetchValues = !q.KeysOnly
it := d.DB.NewIterator(opt)
@@ -82,7 +83,7 @@ func (d *datastore) QueryNew(q dsq.Query) (dsq.Results, error) {
return dsq.ResultsFromIterator(q, dsq.Iterator{
Next: func() (dsq.Result, bool) {
- if !it.ValidForPrefix(q.Prefix) {
+ if !it.ValidForPrefix(prefix) {
return dsq.Result{}, false
}
item := it.Item() | fix: cast prefix to bytes |
diff --git a/keyring_windows.go b/keyring_windows.go
index <HASH>..<HASH> 100644
--- a/keyring_windows.go
+++ b/keyring_windows.go
@@ -1,8 +1,9 @@
package keyring
-import "github.com/danieljoos/wincred"
-
-const errNotFound = "Element not found."
+import (
+ "github.com/danieljoos/wincred"
+ "syscall"
+)
type windowsKeychain struct{}
@@ -10,7 +11,7 @@ type windowsKeychain struct{}
func (k windowsKeychain) Get(service, username string) (string, error) {
cred, err := wincred.GetGenericCredential(k.credName(service, username))
if err != nil {
- if err.Error() == errNotFound {
+ if err == syscall.ERROR_NOT_FOUND {
return "", ErrNotFound
}
return "", err
@@ -32,7 +33,7 @@ func (k windowsKeychain) Set(service, username, password string) error {
func (k windowsKeychain) Delete(service, username string) error {
cred, err := wincred.GetGenericCredential(k.credName(service, username))
if err != nil {
- if err.Error() == errNotFound {
+ if err == syscall.ERROR_NOT_FOUND {
return ErrNotFound
}
return err | "Element not found." does not work on non-english machines |
diff --git a/src/rasterstats/io.py b/src/rasterstats/io.py
index <HASH>..<HASH> 100644
--- a/src/rasterstats/io.py
+++ b/src/rasterstats/io.py
@@ -154,8 +154,8 @@ def bounds_window(bounds, affine):
def window_bounds(window, affine):
(row_start, row_stop), (col_start, col_stop) = window
- w, s = (col_start, row_stop) * affine
- e, n = (col_stop, row_start) * affine
+ w, s = affine * (col_start, row_stop)
+ e, n = affine * (col_stop, row_start)
return w, s, e, n | chore: left multiplication for rasterio |
diff --git a/tornado/web.py b/tornado/web.py
index <HASH>..<HASH> 100644
--- a/tornado/web.py
+++ b/tornado/web.py
@@ -70,6 +70,7 @@ import stat
import sys
import time
import tornado
+import traceback
import types
import urllib
import urlparse
@@ -663,11 +664,16 @@ class RequestHandler(object):
If this error was caused by an uncaught exception, the
exception object can be found in kwargs e.g. kwargs['exception']
"""
- return "<html><title>%(code)d: %(message)s</title>" \
- "<body>%(code)d: %(message)s</body></html>" % {
- "code": status_code,
- "message": httplib.responses[status_code],
- }
+ if self.settings.get("debug"):
+ # in debug mode, try to send a traceback
+ self.set_header('Content-Type', 'text/plain')
+ return traceback.format_exc()
+ else:
+ return "<html><title>%(code)d: %(message)s</title>" \
+ "<body>%(code)d: %(message)s</body></html>" % {
+ "code": status_code,
+ "message": httplib.responses[status_code],
+ }
@property
def locale(self): | add text tracebacks on <I>s when in debug mode |
diff --git a/mongodb/mongodb.js b/mongodb/mongodb.js
index <HASH>..<HASH> 100644
--- a/mongodb/mongodb.js
+++ b/mongodb/mongodb.js
@@ -296,6 +296,13 @@ module.exports = function(RED) {
delete response.result.connection;
}
}
+ // `response` is an instance of CommandResult, and does not seem to have the standard Object methods,
+ // which means that some props are not correctly being forwarded to msg.payload (eg "ops" ouputted from `insertOne`)
+ // cloning the object fixes that.
+ response = Object.assign({}, response);
+ // response.message includes info about the DB op, but is large and never used (like the connection)
+ delete response.message;
+
// send msg (when err == forEachEnd, this is just a forEach completion).
if (forEachIteration == err) {
// Clone, so we can send the same message again with a different payload | preserve all response props in message.payload
`response` is an instance of CommandResult, and does not seem to have the standard Object methods, which means that some props are not correctly being forwarded to msg.payload (eg "ops" outputted from `insertOne`) - only the "result" property is being saved as payload. Cloning the object fixes that.
(<URL>)
fixes <URL> |
diff --git a/lib/reel/mixins.rb b/lib/reel/mixins.rb
index <HASH>..<HASH> 100644
--- a/lib/reel/mixins.rb
+++ b/lib/reel/mixins.rb
@@ -66,8 +66,8 @@ module Reel
# optimizations possible, depending on OS:
# TCP_NODELAY: prevent TCP packets from being buffered
- # TCP_CORK: yet to be tersely described
- # SO_REUSEADDR: yet to be tersely described
+ # TCP_CORK: TODO: tersely describe
+ # SO_REUSEADDR: TODO: tersely describe
if RUBY_PLATFORM =~ /linux/
# Only Linux supports the mix of socket behaviors given in these optimizations. | Change to TODO versus implied TODO |
diff --git a/container.go b/container.go
index <HASH>..<HASH> 100644
--- a/container.go
+++ b/container.go
@@ -80,7 +80,7 @@ func ParseRun(args []string, stdout io.Writer) (*Config, error) {
flMemory := cmd.Int64("m", 0, "Memory limit (in bytes)")
var flPorts ports
- cmd.Var(&flPorts, "p", "Map a network port to the container")
+ cmd.Var(&flPorts, "p", "Expose a container's port to the host (use 'docker port' to see the actual mapping)")
var flEnv ListOpts
cmd.Var(&flEnv, "e", "Set environment variables") | change option description to reflect the semantics
At least, for me, 'map' means that there are two values and one is "mapped" to
another.
In this case, just one value is provided (container's port), the other value is
automatically obtained (host's port) and the actual mapping can be seen using
``docker port`` command. |
diff --git a/dvc/__init__.py b/dvc/__init__.py
index <HASH>..<HASH> 100644
--- a/dvc/__init__.py
+++ b/dvc/__init__.py
@@ -5,7 +5,7 @@ Make your data science projects reproducible and shareable.
"""
import os
-VERSION_BASE = '0.14.0'
+VERSION_BASE = '0.14.1'
__version__ = VERSION_BASE
PACKAGEPATH = os.path.abspath(os.path.dirname(__file__)) | dvc: bump to <I> |
diff --git a/admin/__init__.py b/admin/__init__.py
index <HASH>..<HASH> 100644
--- a/admin/__init__.py
+++ b/admin/__init__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# This file is part of Invenio.
-# Copyright (C) 2014 CERN.
+# Copyright (C) 2014, 2015 CERN.
#
# Invenio is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
@@ -18,7 +18,7 @@
"""Administrative views."""
-from __future__ import absolute_import
+from __future__ import absolute_import, unicode_literals
from invenio.ext.admin.views import ModelView
from invenio.ext.sqlalchemy import db | global: unicode literal for admin views
* Forces unicode literals on all admin pages. (addresses #<I>)
* PEP8/<I> code style improvements. |
diff --git a/src/Enhavo/Bundle/MediaBundle/Service/FileService.php b/src/Enhavo/Bundle/MediaBundle/Service/FileService.php
index <HASH>..<HASH> 100644
--- a/src/Enhavo/Bundle/MediaBundle/Service/FileService.php
+++ b/src/Enhavo/Bundle/MediaBundle/Service/FileService.php
@@ -196,11 +196,11 @@ class FileService
* unknown type.
* @return EnhavoFile The generated doctrine entity object (already persisted).
*/
- public function addFile($file, $mimeType = null, $fileExtension = null, $title = null, $fileName = null, $order = null, $garbage = false)
+ public function storeFile($file, $mimeType = null, $fileExtension = null, $title = null, $fileName = null, $order = null, $garbage = false)
{
$fileInfo = $this->getFileInformation($file);
if (!$fileInfo) {
- throw new \InvalidArgumentException("Invalid format on file parameter");
+ throw new \InvalidArgumentException("Invalid format on file parameter; possible formats: Symfony\\Component\\HttpFoundation\\File\\UploadedFile, Symfony\\Component\\HttpFoundation\\File\\File, \\SplFileInfo or string (absolute path + filename)");
}
$slugifier = new Slugifier; | Renamed addFile to storeFile, added additional information to Exception thrown on invalid format for file parameter |
diff --git a/framework/core/src/Api/Serializer/PostSerializer.php b/framework/core/src/Api/Serializer/PostSerializer.php
index <HASH>..<HASH> 100644
--- a/framework/core/src/Api/Serializer/PostSerializer.php
+++ b/framework/core/src/Api/Serializer/PostSerializer.php
@@ -85,7 +85,7 @@ class PostSerializer extends PostBasicSerializer
*/
protected function discussion($post)
{
- return $this->hasOne($post, 'Flarum\Api\Serializer\DiscussionSerializer');
+ return $this->hasOne($post, 'Flarum\Api\Serializer\DiscussionBasicSerializer');
}
/**
@@ -93,7 +93,7 @@ class PostSerializer extends PostBasicSerializer
*/
protected function editUser($post)
{
- return $this->hasOne($post, 'Flarum\Api\Serializer\UserSerializer');
+ return $this->hasOne($post, 'Flarum\Api\Serializer\UserBasicSerializer');
}
/**
@@ -101,6 +101,6 @@ class PostSerializer extends PostBasicSerializer
*/
protected function hideUser($post)
{
- return $this->hasOne($post, 'Flarum\Api\Serializer\UserSerializer');
+ return $this->hasOne($post, 'Flarum\Api\Serializer\UserBasicSerializer');
}
} | Performance: Load only basic information about post discussion/users |
diff --git a/lib/ezutils/classes/ezmoduleoperationinfo.php b/lib/ezutils/classes/ezmoduleoperationinfo.php
index <HASH>..<HASH> 100644
--- a/lib/ezutils/classes/ezmoduleoperationinfo.php
+++ b/lib/ezutils/classes/ezmoduleoperationinfo.php
@@ -750,11 +750,12 @@ class eZModuleOperationInfo
if ( !class_exists( $className ) )
{
include_once( $includeFile );
- }
- if ( !class_exists( $className ) )
- {
- return array( 'internal_error' => eZModuleOperationInfo::ERROR_NO_CLASS,
- 'internal_error_class_name' => $className );
+
+ if ( !class_exists( $className, false ) )
+ {
+ return array( 'internal_error' => eZModuleOperationInfo::ERROR_NO_CLASS,
+ 'internal_error_class_name' => $className );
+ }
}
$classObject = $this->objectForClass( $className );
if ( $classObject === null ) | EZP-<I> : no need to trigger autoload on second class_exists |
diff --git a/lib/requestMethods.js b/lib/requestMethods.js
index <HASH>..<HASH> 100644
--- a/lib/requestMethods.js
+++ b/lib/requestMethods.js
@@ -47,8 +47,11 @@ module.exports.authenticate= function(strategy, opts, callback, strategyExecutor
}
// Choose the first strategy defined if no strategy provided
- if( !strategy && strategyExecutor.strategies.length >0 ) {
- strategy= [strategyExecutor.strategies[0].name];
+ if( !strategy && strategyExecutor.strategies ) {
+ for( var k in strategyExecutor.strategies ) {
+ strategy= [strategyExecutor.strategies[k].name];
+ break;
+ }
}
trace( "Authenticating ("+this.headers.host + this.url+")", scope, ">>>" ); | Support object literals as well as arrays for auto-selecting strategies |
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index <HASH>..<HASH> 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -66,6 +66,12 @@ end
OAUTH_TOKEN = 'bafec72922f31fe86aacc8aca4261117f3bd62cf'
+def reset_authentication_for(object)
+ ['basic_auth', 'oauth_token', 'login', 'password' ].each do |item|
+ object.send("#{item}=", nil)
+ end
+end
+
class Hash
def except(*keys)
cpy = self.dup | Add helper method for authentication params resetting. |
diff --git a/Gruntfile.js b/Gruntfile.js
index <HASH>..<HASH> 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -2,7 +2,7 @@ module.exports = function(grunt) {
grunt.initConfig({
eslint: {
- src: ['speck.js', 'Gruntfile.js']
+ src: ['speck.js', 'Gruntfile.js', 'parsing/**/*.js’]
},
watch: {
files: ['<%= eslint.src %>'], | Added parsing subdirectory to Gruntfile |
diff --git a/python/mxnet/rnn/io.py b/python/mxnet/rnn/io.py
index <HASH>..<HASH> 100644
--- a/python/mxnet/rnn/io.py
+++ b/python/mxnet/rnn/io.py
@@ -162,7 +162,7 @@ class BucketSentenceIter(DataIter):
data = self.nddata[i][j:j+self.batch_size]
label = self.ndlabel[i][j:j+self.batch_size]
- return DataBatch([data], [label],
+ return DataBatch([data], [label], pad=0,
bucket_key=self.buckets[i],
provide_data=[(self.data_name, data.shape)],
provide_label=[(self.label_name, label.shape)]) | Add pad param to DataBatch returned by BucketSentenceIter (#<I>) |
diff --git a/sub.js b/sub.js
index <HASH>..<HASH> 100644
--- a/sub.js
+++ b/sub.js
@@ -1,6 +1,10 @@
var inherits = require('inherits')
var Stream = require('./stream')
+function isError (end) {
+ return end && end !== true
+}
+
module.exports = Sub
inherits(Sub, Stream)
@@ -9,14 +13,16 @@ function Sub (parent, id) {
this.parent = parent
this.id = id
Stream.call(this)
+ this.paused = false
}
Sub.prototype.write = function (data) {
this.parent._write({req: this.id, value: data, stream: true, end: false})
+ this.paused = !this.parent.sink || this.parent.sink.paused
}
Sub.prototype.end = function (err) {
- this.parent._write({req: this.id, value: data, stream: true, end: true})
+ this.parent._write({req: this.id, value: err, stream: true, end: true})
delete this.parent.subs[this.id]
//if we errored this stream, kill it immediately.
if(isError(this.ended)) this._end(err)
@@ -26,5 +32,3 @@ Sub.prototype.end = function (err) {
-
- | sub should pause if the parent's sink is paused, or there is no sink! |
diff --git a/library/Services/ShopInstaller/ShopInstaller.php b/library/Services/ShopInstaller/ShopInstaller.php
index <HASH>..<HASH> 100644
--- a/library/Services/ShopInstaller/ShopInstaller.php
+++ b/library/Services/ShopInstaller/ShopInstaller.php
@@ -22,6 +22,9 @@
include_once LIBRARY_PATH .'/DbHandler.php';
require_once LIBRARY_PATH .'/Cache.php';
+/** Class is used to stop autoloading in oxsetup as it breaks shop installation. */
+class Conf{}
+
/**
* Class for shop installation.
*/ | Define class Conf
Class is used to stop autoloading in oxsetup as it breaks shop installation. |
diff --git a/prow/plank/controller.go b/prow/plank/controller.go
index <HASH>..<HASH> 100644
--- a/prow/plank/controller.go
+++ b/prow/plank/controller.go
@@ -405,9 +405,10 @@ func (c *Controller) syncPendingJob(pj kube.ProwJob, pm map[string]kube.Pod, rep
var b bytes.Buffer
if err := c.ca.Config().Plank.JobURLTemplate.Execute(&b, &pj); err != nil {
- return fmt.Errorf("error executing URL template: %v", err)
+ c.log.Errorf("error executing URL template: %v", err)
+ } else {
+ pj.Status.URL = b.String()
}
- pj.Status.URL = b.String()
reports <- pj
if prevState != pj.Status.State {
c.log.WithFields(pjutil.ProwJobFields(&pj)). | Prevent template errors from blocking ProwJob state transition. |
diff --git a/properties/base.py b/properties/base.py
index <HASH>..<HASH> 100644
--- a/properties/base.py
+++ b/properties/base.py
@@ -184,15 +184,11 @@ class HasProperties(with_metaclass(PropertyMetaclass, object)):
def _set(self, name, value):
change = dict(name=name, value=value, mode='validate')
self._notify(change)
- if change['name'] != name:
- warn('Specified Property for assignment changed during '
- 'validation. Setting original property {}'.format(name),
- RuntimeWarning)
if change['value'] is utils.undefined and name in self._backend:
self._backend.pop(name)
else:
self._backend[name] = change['value']
- change.update(mode='observe')
+ change.update(name=name, mode='observe')
self._notify(change)
def validate(self): | Remove warning if 'name' is modified on change validation
Instead, any change to name is disregarded, only updated values are used |
diff --git a/boon/src/main/java/org/boon/core/Sys.java b/boon/src/main/java/org/boon/core/Sys.java
index <HASH>..<HASH> 100644
--- a/boon/src/main/java/org/boon/core/Sys.java
+++ b/boon/src/main/java/org/boon/core/Sys.java
@@ -214,7 +214,7 @@ public class Sys {
Class.forName ( "javax.servlet.http.HttpServlet" );
_inContainer = true;
- } catch ( ClassNotFoundException e ) {
+ } catch ( Throwable e ) {
_inContainer = false;
}
if ( !_inContainer ) {
@@ -222,7 +222,7 @@ public class Sys {
Class.forName ( "javax.ejb.EJBContext" );
_inContainer = true;
- } catch ( ClassNotFoundException e ) {
+ } catch ( Throwable e ) {
_inContainer = false;
} | Protect against unloadable classes, close #<I> |
diff --git a/actionpack/lib/action_view/template_handlers/builder.rb b/actionpack/lib/action_view/template_handlers/builder.rb
index <HASH>..<HASH> 100644
--- a/actionpack/lib/action_view/template_handlers/builder.rb
+++ b/actionpack/lib/action_view/template_handlers/builder.rb
@@ -6,7 +6,8 @@ module ActionView
include Compilable
def compile(template)
- "controller.response.content_type ||= Mime::XML;" +
+ # ActionMailer does not have a response
+ "controller.respond_to?(:response) && controller.response.content_type ||= Mime::XML;" +
"xml = ::Builder::XmlMarkup.new(:indent => 2);" +
template.source +
";xml.target!;" | Check for response in builder template since ActionMailer does not have one |
diff --git a/library/CM/Mail.php b/library/CM/Mail.php
index <HASH>..<HASH> 100644
--- a/library/CM/Mail.php
+++ b/library/CM/Mail.php
@@ -364,7 +364,6 @@ class CM_Mail extends CM_View_Abstract implements CM_Typed {
/**
* @throws CM_Exception_Invalid
- * @throws CM_Exception_NotAllowed
* @throws phpmailerException
*/
protected function _send($subject, $text, $html = null) { | Reworked docu according to review |
diff --git a/ca/django_ca/management/commands/sign_cert.py b/ca/django_ca/management/commands/sign_cert.py
index <HASH>..<HASH> 100644
--- a/ca/django_ca/management/commands/sign_cert.py
+++ b/ca/django_ca/management/commands/sign_cert.py
@@ -87,7 +87,7 @@ the default values, options like --key-usage still override the profile.""")
if options['cn_in_san'] is not None:
kwargs['cn_in_san'] = options['cn_in_san']
if options['key_usage']:
- kwargs['keyUsage'] = self.parse_extension(options['key_usage'])
+ kwargs['keyUsage'] = options['key_usage']
if options['ext_key_usage']:
kwargs['extendedKeyUsage'] = self.parse_extension(options['ext_key_usage'])
if options['tls_features']: | pass keyUsage verbatim (should be a django_ca.extensions.KeyUsage by now) |
diff --git a/src/edit/methods.js b/src/edit/methods.js
index <HASH>..<HASH> 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -480,7 +480,7 @@ function findPosH(doc, pos, dir, unit, visually) {
next = moveVisually(doc.cm, lineObj, pos, dir)
} else {
let ch = moveLogically(lineObj, pos, dir)
- next = ch == null ? null : new Pos(pos.line, ch, dir < 0 ? "after" : "before")
+ next = ch == null ? null : new Pos(pos.line, ch, dir < 0 ? "after" : "before")
}
if (next == null) {
if (!boundToLine && findNextLine())
diff --git a/test/test.js b/test/test.js
index <HASH>..<HASH> 100644
--- a/test/test.js
+++ b/test/test.js
@@ -34,7 +34,6 @@ var opera = /Opera\/\./.test(navigator.userAgent);
var opera_version = opera && navigator.userAgent.match(/Version\/(\d+\.\d+)/);
if (opera_version) opera_version = Number(opera_version);
var opera_lt10 = opera && (!opera_version || opera_version < 10);
-var webkit = /WebKit\//.test(navigator.userAgent);
namespace = "core_"; | Remove unused variable and duplicate white space |
diff --git a/ella/polls/models.py b/ella/polls/models.py
index <HASH>..<HASH> 100644
--- a/ella/polls/models.py
+++ b/ella/polls/models.py
@@ -88,7 +88,8 @@ class Choice(models.Model):
return self.choice
class Meta:
- order_with_respect_to = 'question'
+ #order_with_respect_to = 'question'
+ order = ('question',)
verbose_name = _('Choice')
verbose_name_plural = _('Choices') | Choice option Order with respect to question temporary disabled
git-svn-id: <URL> |
diff --git a/src/Stream/Stream.php b/src/Stream/Stream.php
index <HASH>..<HASH> 100644
--- a/src/Stream/Stream.php
+++ b/src/Stream/Stream.php
@@ -26,7 +26,12 @@ final class Stream implements StreamInterface
}
$this->resource = $resource;
- $this->rewind();
+ $meta = stream_get_meta_data($resource);
+
+ if ($meta['seekable']) {
+ $this->rewind();
+ }
+
$stats = fstat($resource);
if (isset($stats['size'])) { | only rewind if the stream is seekable |
diff --git a/salt/states/ipset.py b/salt/states/ipset.py
index <HASH>..<HASH> 100644
--- a/salt/states/ipset.py
+++ b/salt/states/ipset.py
@@ -293,7 +293,7 @@ def absent(name, entry=None, entries=None, family='ipv4', **kwargs):
kwargs['set_name'],
family)
else:
- command = __salt__['ipset.delete'](kwargs['set_name'], _entry, family, **kwargs)
+ command = __salt__['ipset.delete'](kwargs['set_name'], entry, family, **kwargs)
if 'Error' not in command:
ret['changes'] = {'locale': name}
ret['result'] = True | Fix state absent broken by ipset-add-new-options PR |
diff --git a/test/emmett.test.js b/test/emmett.test.js
index <HASH>..<HASH> 100644
--- a/test/emmett.test.js
+++ b/test/emmett.test.js
@@ -150,6 +150,23 @@ describe('Emitter', function() {
assert.strictEqual(count, 3);
});
+
+ it('onces should be unbound in the correct order.', function() {
+ var count = 0,
+ ne = new emitter(),
+ callback = function() { count++; };
+
+ ne.once('event', callback);
+ ne.once('event', callback);
+
+ ne.emit('event');
+
+ assert.strictEqual(count, 2);
+
+ ne.emit('event');
+
+ assert.strictEqual(count, 2);
+ });
});
describe('api', function() { | Adding test to ensure several onces unbinding |
diff --git a/src/Tenant/Setting.php b/src/Tenant/Setting.php
index <HASH>..<HASH> 100644
--- a/src/Tenant/Setting.php
+++ b/src/Tenant/Setting.php
@@ -96,11 +96,10 @@ class Tenant_Setting extends Pluf_Model
);
$this->_a['idx'] = array(
'mod_key_idx' => array(
- 'type' => 'unique',
- 'col' => 'mod, key'
+ 'col' => 'mode, key'
),
'key_idx' => array(
- 'type' => 'unique',
+ 'type' => 'index',
'col' => 'key'
)
);
diff --git a/tests/conf/config.php b/tests/conf/config.php
index <HASH>..<HASH> 100644
--- a/tests/conf/config.php
+++ b/tests/conf/config.php
@@ -1,5 +1,5 @@
<?php
-// $cfg = include 'mysql.config.php';
-$cfg = include 'sqlite.config.php';
+$cfg = include 'mysql.config.php';
+// $cfg = include 'sqlite.config.php';
return $cfg; | key,mode is not a unique index. |
diff --git a/service/managedinstance/providers/aws/aws.go b/service/managedinstance/providers/aws/aws.go
index <HASH>..<HASH> 100644
--- a/service/managedinstance/providers/aws/aws.go
+++ b/service/managedinstance/providers/aws/aws.go
@@ -184,6 +184,7 @@ type Strategy struct {
UtilizeReservedInstances *bool `json:"utilizeReservedInstances,omitempty"`
OptimizationWindows []string `json:"optimizationWindows,omitempty"`
RevertToSpot *RevertToSpot `json:"revertToSpot,omitempty"`
+ MinimumInstanceLifetime *int `json:"minimumInstanceLifetime,omitempty"`
forceSendFields []string
nullFields []string
@@ -1337,6 +1338,13 @@ func (o *Strategy) SetLifeCycle(v *string) *Strategy {
return o
}
+func (o *Strategy) SetMinimumInstanceLifetime(v *int) *Strategy {
+ if o.MinimumInstanceLifetime = v; o.MinimumInstanceLifetime == nil {
+ o.nullFields = append(o.nullFields, "MinimumInstanceLifetime")
+ }
+ return o
+}
+
// endregion
// region RevertToSpot | feat(managedinstance/aws): add support for minimum instance lifetime (#<I>) |
diff --git a/src/Components/ExcelExport.php b/src/Components/ExcelExport.php
index <HASH>..<HASH> 100644
--- a/src/Components/ExcelExport.php
+++ b/src/Components/ExcelExport.php
@@ -3,7 +3,7 @@
namespace Nayjest\Grids\Components;
use Event;
-use Paginator;
+use Illuminate\Pagination\Paginator;
use Illuminate\Foundation\Application;
use Maatwebsite\Excel\Classes\LaravelExcelWorksheet;
use Maatwebsite\Excel\Excel; | Excel export bugfix for L5+ |
diff --git a/tests/dummy/app/controllers/demos/sl-grid.js b/tests/dummy/app/controllers/demos/sl-grid.js
index <HASH>..<HASH> 100644
--- a/tests/dummy/app/controllers/demos/sl-grid.js
+++ b/tests/dummy/app/controllers/demos/sl-grid.js
@@ -28,7 +28,7 @@ export default Ember.ArrayController.extend({
size : 'small',
sortable : true,
title : 'Hex Code',
- valuePath : 'test'
+ valuePath : 'hexCode'
}
]),
diff --git a/tests/dummy/app/controllers/demos/sl-grid/detail.js b/tests/dummy/app/controllers/demos/sl-grid/detail.js
index <HASH>..<HASH> 100644
--- a/tests/dummy/app/controllers/demos/sl-grid/detail.js
+++ b/tests/dummy/app/controllers/demos/sl-grid/detail.js
@@ -24,12 +24,6 @@ export default Ember.Controller.extend({
action : 'sendLog',
label : 'Log'
}
- ]),
-
- test: Ember.computed( function() {
- return Math.random();
- }),
-
- testValue: 'Okay'
+ ])
}); | Remove temporary test data from sl-grid demo |
diff --git a/lib/spark/worker/master.rb b/lib/spark/worker/master.rb
index <HASH>..<HASH> 100755
--- a/lib/spark/worker/master.rb
+++ b/lib/spark/worker/master.rb
@@ -129,7 +129,8 @@ module Master
::Thread.abort_on_exception = true
# For synchronous access to socket IO
- $mutex = Mutex.new
+ $mutex_for_command = Mutex.new
+ $mutex_for_iterator = Mutex.new
super
end
diff --git a/lib/spark/worker/worker.rb b/lib/spark/worker/worker.rb
index <HASH>..<HASH> 100644
--- a/lib/spark/worker/worker.rb
+++ b/lib/spark/worker/worker.rb
@@ -134,6 +134,10 @@ module Worker
private
+ def load_command
+ $mutex_for_command.synchronize { super }
+ end
+
# Threads changing for reading is very slow
# Faster way is do it one by one
def load_iterator
@@ -144,7 +148,7 @@ module Worker
client_socket.wait_readable
end
- $mutex.synchronize { super }
+ $mutex_for_iterator.synchronize { super }
end
end | fix: thread worker for mri |
diff --git a/bundles/org.eclipse.orion.client.git/web/orion/git/gitCommitExplorer.js b/bundles/org.eclipse.orion.client.git/web/orion/git/gitCommitExplorer.js
index <HASH>..<HASH> 100644
--- a/bundles/org.eclipse.orion.client.git/web/orion/git/gitCommitExplorer.js
+++ b/bundles/org.eclipse.orion.client.git/web/orion/git/gitCommitExplorer.js
@@ -171,7 +171,7 @@ define(['dojo', 'orion/explorer', 'orion/util', 'orion/compare/diff-provider', '
var commitMessage1 = commit.Message.substring(commitMessage0.length, commit.Message.length);
- if (commitMessage1.length > 0){
+ if (commitMessage1.trim().length > 0){
div = dojo.create( "pre", null, detailsView );
dojo.place(document.createTextNode(cut ? "..." + commitMessage1 : commitMessage1.trim()), div);
dojo.create( "div", {"style":"padding-top:15px"}, detailsView ); | Do not show an empty box when the commit message ends with
the end-line character |
diff --git a/health.go b/health.go
index <HASH>..<HASH> 100644
--- a/health.go
+++ b/health.go
@@ -24,7 +24,7 @@ type HealthCheck struct {
GracePeriodSeconds int `json:"gracePeriodSeconds,omitempty"`
IntervalSeconds int `json:"intervalSeconds,omitempty"`
PortIndex int `json:"portIndex,omitempty"`
- MaxConsecutiveFailures int `json:"maxConsecutiveFailures,omitempty"`
+ MaxConsecutiveFailures int `json:"maxConsecutiveFailures"`
TimeoutSeconds int `json:"timeoutSeconds,omitempty"`
} | remove omitempty on MaxConsecutiveFailures as 0 ok |
diff --git a/js/plugins/legend.js b/js/plugins/legend.js
index <HASH>..<HASH> 100644
--- a/js/plugins/legend.js
+++ b/js/plugins/legend.js
@@ -22,6 +22,13 @@ Flotr.addPlugin('legend', {
callbacks: {
'flotr:afterinit': function() {
this.legend.insertLegend();
+ },
+ 'flotr:destroy': function() {
+ var markup = this.legend.markup;
+ if (markup) {
+ this.legend.markup = null;
+ D.remove(markup);
+ }
}
},
/**
@@ -139,7 +146,8 @@ Flotr.addPlugin('legend', {
if(fragments.length > 0){
var table = '<table style="font-size:smaller;color:' + options.grid.color + '">' + fragments.join('') + '</table>';
if(legend.container){
- D.empty(legend.container);
+ table = D.node(table);
+ this.legend.markup = table;
D.insert(legend.container, table);
}
else { | Do not empty container div and cleanup markup when done. |
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -318,6 +318,12 @@ setup(
author='Victor M. Alvarez',
author_email='plusvic@gmail.com, vmalvarez@virustotal.com',
url='https://github.com/VirusTotal/yara-python',
+ classifiers=[
+ 'Programming Language :: Python',
+ 'License :: OSI Approved :: Apache Software License',
+ 'Operating System :: OS Independent',
+ 'Development Status :: 5 - Production/Stable',
+ ],
zip_safe=False,
cmdclass={
'build': BuildCommand, | Add trove classifiers to setup.py. |
diff --git a/app/assets/javascripts/releaf/include/sortable.js b/app/assets/javascripts/releaf/include/sortable.js
index <HASH>..<HASH> 100644
--- a/app/assets/javascripts/releaf/include/sortable.js
+++ b/app/assets/javascripts/releaf/include/sortable.js
@@ -1,7 +1,6 @@
jQuery(document).ready(function() {
jQuery(document.body).on('initsortable', function(e) {
- console.debug("test");
jQuery(e.target).find('.list[data-sortable]').sortable({
axis: "y",
ontainment: "parent", | Remove debuging from js |
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -98,27 +98,34 @@ function SerialPort(path, options, openImmediately, callback) {
return;
}
+ options.rtscts = _options.rtscts;
+
if (options.flowControl || options.flowcontrol) {
var fc = options.flowControl || options.flowcontrol;
if (typeof fc === 'boolean') {
options.rtscts = true;
} else {
- fc.forEach(function (flowControl) {
+ var clean = fc.every(function (flowControl) {
var fcup = flowControl.toUpperCase();
var idx = FLOWCONTROLS.indexOf(fcup);
if (idx < 0) {
- var err = new Error('Invalid "flowControl": ' + fcup + ". Valid options: " + FLOWCONTROLS.join(", "));
+ var err = new Error('Invalid "flowControl": ' + fcup + '. Valid options: ' + FLOWCONTROLS.join(', '));
callback(err);
- return;
+ return false;
} else {
// "XON", "XOFF", "XANY", "DTRDTS", "RTSCTS"
switch (idx) {
case 0: options.rtscts = true; break;
}
+ return true;
}
});
+ console.log(clean);
+ if(!clean){
+ return;
+ }
}
} | flow control thought it was returning and halting execution from inside a foreach, it was not |
diff --git a/lib/request.js b/lib/request.js
index <HASH>..<HASH> 100644
--- a/lib/request.js
+++ b/lib/request.js
@@ -250,14 +250,13 @@ class Request extends AsyncResource {
assert(!this.upgrade && this.method !== 'CONNECT')
if (this.aborted) {
- return null
+ return
}
try {
return this.runInAsyncScope(this._onData, this, chunk.slice(offset, offset + length))
} catch (err) {
this.onError(err)
- return null
}
} | refactor: undefined is nully |
diff --git a/pycbc/future.py b/pycbc/future.py
index <HASH>..<HASH> 100644
--- a/pycbc/future.py
+++ b/pycbc/future.py
@@ -23,7 +23,7 @@
#
# =============================================================================
#
-"""This file contains backported functionality from future versions of librarays.
+"""This file contains backported functionality from future versions of libraries.
Mostly done with monkey-patching.
""" | Fix typo in pycbc.futures module docstring. |
diff --git a/src/Parser.php b/src/Parser.php
index <HASH>..<HASH> 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -47,7 +47,7 @@ abstract class Parser {
final function __clone()
{
- $this->onCommit = null;
+ $this->onCommit = $this->onTry = null;
}
function parse(TokenStream $ts) /*: Result|null*/ | fix potential state leak on parser::__clone operation |
diff --git a/integration/lifecycle/rlimit_test.go b/integration/lifecycle/rlimit_test.go
index <HASH>..<HASH> 100644
--- a/integration/lifecycle/rlimit_test.go
+++ b/integration/lifecycle/rlimit_test.go
@@ -32,7 +32,7 @@ var _ = Describe("Resource limits", func() {
})
Context("when setting all rlimits to minimum values", func() {
- It("succeeds", func(done Done) {
+ PIt("succeeds", func(done Done) {
// Experimental minimum values tend to produce flakes.
fudgeFactor := 1.50 | Set the failing minimum rlimits test to pending
[#<I>] |
diff --git a/lib/timerizer.rb b/lib/timerizer.rb
index <HASH>..<HASH> 100644
--- a/lib/timerizer.rb
+++ b/lib/timerizer.rb
@@ -5,7 +5,7 @@ class RelativeTime
:second => 1,
:minute => 60,
:hour => 3600,
- :day => 864000,
+ :day => 86400,
:week => 604800
} | fix number of seconds in a day |
diff --git a/integration_tests/androidx_test/src/test/java/org/robolectric/integration_tests/axt/ActivityScenarioTest.java b/integration_tests/androidx_test/src/test/java/org/robolectric/integration_tests/axt/ActivityScenarioTest.java
index <HASH>..<HASH> 100644
--- a/integration_tests/androidx_test/src/test/java/org/robolectric/integration_tests/axt/ActivityScenarioTest.java
+++ b/integration_tests/androidx_test/src/test/java/org/robolectric/integration_tests/axt/ActivityScenarioTest.java
@@ -106,6 +106,19 @@ public class ActivityScenarioTest {
}
@Test
+ public void launch_pauseAndResume_callbackSequence() {
+ ActivityScenario<TranscriptActivity> activityScenario =
+ ActivityScenario.launch(TranscriptActivity.class);
+ assertThat(activityScenario).isNotNull();
+ activityScenario.moveToState(State.STARTED);
+ activityScenario.moveToState(State.RESUMED);
+ assertThat(callbacks)
+ .containsExactly(
+ "onCreate", "onStart", "onPostCreate", "onResume", "onWindowFocusChanged true",
+ "onPause", "onResume");
+ }
+
+ @Test
public void launch_lifecycleOwnerActivity() {
ActivityScenario<LifecycleOwnerActivity> activityScenario =
ActivityScenario.launch(LifecycleOwnerActivity.class); | Add test that verify calling only onPause and onResume when pause/resume Activity |
diff --git a/python/dllib/src/bigdl/dllib/nn/layer.py b/python/dllib/src/bigdl/dllib/nn/layer.py
index <HASH>..<HASH> 100644
--- a/python/dllib/src/bigdl/dllib/nn/layer.py
+++ b/python/dllib/src/bigdl/dllib/nn/layer.py
@@ -4034,11 +4034,12 @@ class SequenceBeamSearch(Layer):
:param alpha: defining the strength of length normalization
:param decode_length: maximum length to decoded sequence
:param eos_id: id of eos token, used to determine when a sequence has finished
+ :param padding_value
:param num_hidden_layers: number of hidden layers
:param hidden_size: size of hidden layer
- >>> sequenceBeamSearch = SequenceBeamSearch(4, 3, 0.0, 10, 1.0, 2, 5)
+ >>> sequenceBeamSearch = SequenceBeamSearch(4, 3, 0.0, 10, 2.0, 1.0, 2, 5)
creating: createSequenceBeamSearch
'''
@@ -4048,6 +4049,7 @@ class SequenceBeamSearch(Layer):
alpha,
decode_length,
eos_id,
+ padding_value,
num_hidden_layers,
hidden_size,
bigdl_type="float"):
@@ -4057,6 +4059,7 @@ class SequenceBeamSearch(Layer):
alpha,
decode_length,
eos_id,
+ padding_value,
num_hidden_layers,
hidden_size) | update beam search feature for interface with transformer model (#<I>)
* update beam search for padding value and cache structure
* update python API for beam search
* add comments and update python layer
* modify comments format
* modify comments format |
diff --git a/src/Illuminate/Redis/Connections/PhpRedisConnection.php b/src/Illuminate/Redis/Connections/PhpRedisConnection.php
index <HASH>..<HASH> 100644
--- a/src/Illuminate/Redis/Connections/PhpRedisConnection.php
+++ b/src/Illuminate/Redis/Connections/PhpRedisConnection.php
@@ -140,7 +140,7 @@ class PhpRedisConnection extends Connection implements ConnectionContract
*/
public function hsetnx($hash, $key, $value)
{
- return (int) $this->client->hsetnx($hash, $key, $value);
+ return (int) $this->client->hSetNx($hash, $key, $value);
}
/** | Use hSetNx with valid case (#<I>) |
diff --git a/lib/NewtifryPro.js b/lib/NewtifryPro.js
index <HASH>..<HASH> 100644
--- a/lib/NewtifryPro.js
+++ b/lib/NewtifryPro.js
@@ -331,7 +331,7 @@ function sendMessage(message, senderKey, registrationIds, callback) {
body[Constants.PARAM_PAYLOAD_KEY] = message.data;
body[Constants.JSON_REGISTRATION_IDS] = registrationIds;
if (message.priority == 3) {
- body[Constants.PARAM_PRIORITY_KEY] = 'high';
+ //body[Constants.PARAM_PRIORITY_KEY] = 'high';
}
requestBody = JSON.stringify(body);
var toSend = JSON.stringify(message.data);
@@ -392,7 +392,7 @@ function sendMessageToTopic(message, senderKey, topic, callback) {
body[Constants.PARAM_PAYLOAD_KEY] = message.data;
body[Constants.PARAM_TOPIC_KEY] = '/topics/' + topic;
if (message.priority == 3) {
- body[Constants.PARAM_PRIORITY_KEY] = 'high';
+ //body[Constants.PARAM_PRIORITY_KEY] = 'high';
}
requestBody = JSON.stringify(body);
var toSend = JSON.stringify(message.data); | remove high FCM priority (bring NP to front on API >= Oreo |
diff --git a/Classes/Service/SolrServiceProvider.php b/Classes/Service/SolrServiceProvider.php
index <HASH>..<HASH> 100644
--- a/Classes/Service/SolrServiceProvider.php
+++ b/Classes/Service/SolrServiceProvider.php
@@ -93,7 +93,7 @@ class SolrServiceProvider extends AbstractServiceProvider implements ServiceProv
$this->query = $this->getConnection()->createSuggester();
$results = [];
if (array_key_exists('q', $arguments)) {
- $this->query->setQuery($arguments);
+ $this->query->setQuery($arguments['q']);
if ($arguments['dictionary']) {
$this->query->setDictionary($arguments['dictionary']);
} | Fixed suggester (#<I>)
The property q was missing and so the wrong solr query was exported. Now it works fine. Tested in our test page <URL> |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.