diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/examples/webhooks.php b/examples/webhooks.php
index <HASH>..<HASH> 100644
--- a/examples/webhooks.php
+++ b/examples/webhooks.php
@@ -1,5 +1,13 @@
<?php
+// You can use this script with the webhook testing tool in the developer tab.
+// At the moment, the best way to learn about the different webhooks is to
+// change the options in the webhook tester and read the annotations that pop
+// up.
+
+// Webhook documentation:
+// https://sandbox.gocardless.com/docs/web_hooks_guide
+
// Include library
include_once '../lib/GoCardless.php';
|
Added intro and docs link to webhook example
|
diff --git a/tests/OSS/Tests/BucketLiveChannelTest.php b/tests/OSS/Tests/BucketLiveChannelTest.php
index <HASH>..<HASH> 100644
--- a/tests/OSS/Tests/BucketLiveChannelTest.php
+++ b/tests/OSS/Tests/BucketLiveChannelTest.php
@@ -20,6 +20,7 @@ class BucketLiveChannelTest extends \PHPUnit_Framework_TestCase
$this->client = Common::getOssClient();
$this->bucketName = 'php-sdk-test-bucket-name-' . strval(rand(0, 10));
$this->client->createBucket($this->bucketName);
+ sleep(15);
}
public function tearDown()
|
add sleep to fix bucket not exsit
|
diff --git a/lib/ahoy_email.rb b/lib/ahoy_email.rb
index <HASH>..<HASH> 100644
--- a/lib/ahoy_email.rb
+++ b/lib/ahoy_email.rb
@@ -75,5 +75,5 @@ end
ActiveSupport.on_load(:action_mailer) do
include AhoyEmail::Mailer
register_observer AhoyEmail::Observer
- Mail::Message.attr_accessor :ahoy_data, :ahoy_message
+ Mail::Message.send(:attr_accessor, :ahoy_data, :ahoy_message)
end
|
Fixed error with attr_accessor being private in earlier versions of Ruby - fixes #<I>
|
diff --git a/spec/theatre/invocation_spec.rb b/spec/theatre/invocation_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/theatre/invocation_spec.rb
+++ b/spec/theatre/invocation_spec.rb
@@ -56,6 +56,7 @@ describe "Using Invocations that've been ran through the Theatre" do
end
it "should have a status of :error if an exception was raised and set the #error property" do
+ pending
errorful_callback = lambda { raise ArgumentError, "this error is intentional" } # Simulate logic error
invocation = Theatre::Invocation.new("/namespace/whatever", errorful_callback)
invocation.queued
@@ -103,6 +104,7 @@ describe "Using Invocations that've been ran through the Theatre" do
end
it "should set the #finished_time property when a failure was encountered" do
+ pending
block = lambda { raise LocalJumpError }
invocation = Theatre::Invocation.new('/foo/bar', block)
invocation.queued
diff --git a/spec/theatre/theatre_class_spec.rb b/spec/theatre/theatre_class_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/theatre/theatre_class_spec.rb
+++ b/spec/theatre/theatre_class_spec.rb
@@ -117,6 +117,7 @@ describe "Theatre::Theatre" do
end
it "should run the callback of the Invocation it receives from the master_queue" do
+ pending
has_executed = false
thrower = lambda { has_executed = true }
namespace = "/foo/bar"
|
Set theatre tests pending where they were failing pre-cleanup
|
diff --git a/languagetool-core/src/main/java/org/languagetool/rules/patterns/PasswordAuthenticator.java b/languagetool-core/src/main/java/org/languagetool/rules/patterns/PasswordAuthenticator.java
index <HASH>..<HASH> 100644
--- a/languagetool-core/src/main/java/org/languagetool/rules/patterns/PasswordAuthenticator.java
+++ b/languagetool-core/src/main/java/org/languagetool/rules/patterns/PasswordAuthenticator.java
@@ -32,6 +32,9 @@ public class PasswordAuthenticator extends Authenticator {
@Override
protected PasswordAuthentication getPasswordAuthentication() {
+ if (getRequestingURL() == null) {
+ return null;
+ }
String userInfo = getRequestingURL().getUserInfo();
if (StringTools.isEmpty(userInfo)) {
return null;
|
avoid NPE which can occur under some (unclear) conditions
|
diff --git a/Person.php b/Person.php
index <HASH>..<HASH> 100644
--- a/Person.php
+++ b/Person.php
@@ -9,20 +9,24 @@ use Vundi\Potato\Exceptions\IDShouldBeNumber;
class Person extends Model
{
protected static $entity_table = 'Person';
- protected static $entity_class = 'Person';
}
- $dotenv = new Dotenv\Dotenv(__DIR__);
- $dotenv->load();
-
try {
//var_dump(Person::findAll());
- $person = Person::find(36);
- $person->FName = "Kisooo";
+
+ $person = Person::find(29);
+ $person->FName = "Koech";
$person->update();
- echo "success";
+ /*$person = new Person();
+ $person->FName = "Mahad";
+ $person->gshdh = "Kimeu";
+ $person->Age = 33;
+ $person->save();*/
+
+
+ //Person::remove('gshd');
} catch (NonExistentID $e) {
echo $e->getMessage();
} catch (IDShouldBeNumber $e) {
|
(Fix) Remove the dotenv initializer from the child class.Moved to Database class
|
diff --git a/fmn/rules/__init__.py b/fmn/rules/__init__.py
index <HASH>..<HASH> 100644
--- a/fmn/rules/__init__.py
+++ b/fmn/rules/__init__.py
@@ -1,3 +1,4 @@
+from fmn.rules.anitya import *
from fmn.rules.ansible import *
from fmn.rules.askbot import *
from fmn.rules.bodhi import *
|
Import the anitya rules at the module level
|
diff --git a/src/Guzzle/Http/Client.php b/src/Guzzle/Http/Client.php
index <HASH>..<HASH> 100644
--- a/src/Guzzle/Http/Client.php
+++ b/src/Guzzle/Http/Client.php
@@ -222,7 +222,7 @@ class Client extends AbstractHasDispatcher implements ClientInterface
if (!is_array($uri)) {
$templateVars = null;
} else {
- if (count($uri) != 2 || !is_array($uri[1])) {
+ if (count($uri) != 2 || !isset($uri[1]) || !is_array($uri[1])) {
throw new InvalidArgumentException(
'You must provide a URI template followed by an array of template variables '
. 'when using an array for a URI template'
|
Fix error in Client::createRequest
|
diff --git a/tests/Tests.php b/tests/Tests.php
index <HASH>..<HASH> 100644
--- a/tests/Tests.php
+++ b/tests/Tests.php
@@ -634,4 +634,13 @@ abstract class Tests extends TestBase
$test->get('/barcodes?transform=1');
$test->expect('{"barcodes":[{"id":1,"product_id":1,"hex":"00ff01","bin":"AP8B"}]}');
}
+
+ public function testEditPostWithApostrophe()
+ {
+ $test = new Api($this);
+ $test->put('/posts/1', '[{"id":1,"user_id":1,"category_id":1,"content":"blog start\'d"}]');
+ $test->expect('1');
+ $test->get('/posts/1');
+ $test->expect('{"id":1,"user_id":1,"category_id":1,"content":"blog start\'d"}');
+ }
}
|
Add test case for Escaped JSON Issue #<I>
|
diff --git a/src/jquery.gridster.js b/src/jquery.gridster.js
index <HASH>..<HASH> 100755
--- a/src/jquery.gridster.js
+++ b/src/jquery.gridster.js
@@ -31,6 +31,7 @@
autogrow_cols: false,
autogenerate_stylesheet: true,
avoid_overlapped_widgets: true,
+ auto_init: true,
serialize_params: function($w, wgd) {
return {
col: wgd.col,
@@ -89,6 +90,8 @@
* @param {Boolean} [options.avoid_overlapped_widgets] Avoid that widgets loaded
* from the DOM can be overlapped. It is helpful if the positions were
* bad stored in the database or if there was any conflict.
+ * @param {Boolean} [options.auto_init] Automatically call gridster init
+ * method or not when the plugin is instantiated.
* @param {Function} [options.serialize_params] Return the data you want
* for each widget in the serialization. Two arguments are passed:
* `$w`: the jQuery wrapped HTMLElement, and `wgd`: the grid
@@ -141,7 +144,7 @@
this.generated_stylesheets = [];
this.$style_tags = $([]);
- this.init();
+ this.options.auto_init && this.init();
}
Gridster.generated_stylesheets = [];
|
feature(gridster): added `auto_init` config option, default to true
Useful when using `positionschanged` event, fired before gridster
instance is cached.
|
diff --git a/projections.py b/projections.py
index <HASH>..<HASH> 100644
--- a/projections.py
+++ b/projections.py
@@ -219,6 +219,14 @@ class Projections():
self.year = str(self.dateArr[0])
self.month = str(self.dateArr[1] + 1)
self.day = str(self.dateArr[2])
+ if self.addIncomeRadio.get_active() == True:
+ self.selected = "income"
+ elif self.addExpenseRadio.get_active() == True:
+ self.selected = "expense"
+ self.data.add_projection_data(self.transactionTitleEntry.get_text(),
+ self.transactionAmountEntry.get_text(), self.transactionDescriptionEntry.get_text(),
+ self.selected, self.addCategoryComboBoxText.get_active(), self.year, self.month, self.day,
+ self.frequencyComboBoxText.get_active(), 1)
else:
self.add_view_mode(True)
|
Worked on exporting data to database.
|
diff --git a/res/template/GeneratedPuliFactory.tpl.php b/res/template/GeneratedPuliFactory.tpl.php
index <HASH>..<HASH> 100644
--- a/res/template/GeneratedPuliFactory.tpl.php
+++ b/res/template/GeneratedPuliFactory.tpl.php
@@ -23,7 +23,7 @@ use <?php echo $import ?>;
*
* Otherwise any modifications will be overwritten!
*/
-class <?php echo $shortClassName."\n" ?> implements PuliFactory
+class <?php echo $shortClassName ?> implements PuliFactory
{
/**
* Creates the resource repository.
|
Removed superfluous linebreak from GeneratedPuliFactory
|
diff --git a/src/Listeners/CascadeDeleteListener.php b/src/Listeners/CascadeDeleteListener.php
index <HASH>..<HASH> 100755
--- a/src/Listeners/CascadeDeleteListener.php
+++ b/src/Listeners/CascadeDeleteListener.php
@@ -9,8 +9,8 @@ class CascadeDeleteListener
/**
* Handel the event for eloquent delete.
*
- * @param $event
- * @param $model
+ * @param $event
+ * @param $model
*
* @return void
* @SuppressWarnings(PHPMD.UnusedFormalParameter("event"))
diff --git a/src/Listeners/CascadeRestoreListener.php b/src/Listeners/CascadeRestoreListener.php
index <HASH>..<HASH> 100755
--- a/src/Listeners/CascadeRestoreListener.php
+++ b/src/Listeners/CascadeRestoreListener.php
@@ -9,8 +9,8 @@ class CascadeRestoreListener
/**
* Handel the event for eloquent restore.
*
- * @param $event
- * @param $model
+ * @param $event
+ * @param $model
*
* @return void
* @SuppressWarnings(PHPMD.UnusedFormalParameter("event"))
|
Apply fixes from StyleCI (#<I>)
|
diff --git a/src/js/pannellum.js b/src/js/pannellum.js
index <HASH>..<HASH> 100644
--- a/src/js/pannellum.js
+++ b/src/js/pannellum.js
@@ -187,7 +187,7 @@ controls.orientation.className = 'pnlm-orientation-button pnlm-sprite pnlm-contr
if (window.DeviceOrientationEvent) {
window.addEventListener('deviceorientation', function(e) {
window.removeEventListener('deviceorientation', this);
- if (e)
+ if (e && e.alpha !== null && e.beta !== null && e.gamma !== null)
controls.container.appendChild(controls.orientation);
});
}
|
Don't show device orientation button on desktop Chrome.
|
diff --git a/lib/cache.js b/lib/cache.js
index <HASH>..<HASH> 100644
--- a/lib/cache.js
+++ b/lib/cache.js
@@ -385,10 +385,10 @@ function setRoute(options) {
CTZN.cache.routes[options.route] = {
route: options.route,
contentType: options.contentType,
- view: {
- identity: options.view.identity,
- gzip: options.view.gzip,
- deflate: options.view.deflate
+ render: {
+ identity: options.render.identity,
+ gzip: options.render.gzip,
+ deflate: options.render.deflate
},
timer: timer,
context: options.context,
diff --git a/lib/server.js b/lib/server.js
index <HASH>..<HASH> 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -1910,7 +1910,7 @@ function cacheResponse(params, context, view, zippedView, deflatedView, contentT
cache.setRoute({
route: params.route.pathname,
contentType: contentType,
- view: {
+ render: {
identity: view,
gzip: zippedView,
deflate: deflatedView
|
Renamed route cache contents to 'render' for consistency
|
diff --git a/activesupport/test/core_ext/string_ext_test.rb b/activesupport/test/core_ext/string_ext_test.rb
index <HASH>..<HASH> 100644
--- a/activesupport/test/core_ext/string_ext_test.rb
+++ b/activesupport/test/core_ext/string_ext_test.rb
@@ -414,7 +414,7 @@ class StringConversionsTest < ActiveSupport::TestCase
end
def test_partial_string_to_time
- with_env_tz "Europe/Moscow" do
+ with_env_tz "Europe/Moscow" do # use timezone which does not observe DST.
now = Time.now
assert_equal Time.local(now.year, now.month, now.day, 23, 50), "23:50".to_time
assert_equal Time.utc(now.year, now.month, now.day, 23, 50), "23:50".to_time(:utc)
|
tests, add note about the usage of a specific timezone. Closes #<I>.
|
diff --git a/src/index.js b/src/index.js
index <HASH>..<HASH> 100644
--- a/src/index.js
+++ b/src/index.js
@@ -63,7 +63,7 @@ export default class Api {
else {
if( !(ep instanceof Object) )
ep = { name: ep };
- const { name, options = {} } = ep;
+ const {name, options={}} = ep;
// Make the endpoint.
this.makeEndpoint( name, path + '/', match[1], options );
@@ -81,7 +81,7 @@ export default class Api {
}
makeCrudEndpoints( key, path ) {
- let ep = [ key, key + 's' ];
+ let ep = [key.slice( 0, -1 ), key];
const joiner = ((path[path.length - 1] == '/') ? '' : '/');
const basePath = path + joiner + ep[1];
const baseName = capitalize( ep[0] );
@@ -126,7 +126,7 @@ export default class Api {
request( endpoint, options = {} ) {
const { method = endpoint.method, path = endpoint.path,
args = {}, type = endpoint.type, data,
- include = [] } = options;
+ include = (endpoint.include || []) } = options;
let queryString = [];
// Process the body. This can end up being a FormData object
|
* Use default include options.
* By default use plurals.
|
diff --git a/lib/ruby_gems_gems_gem_simple.rb b/lib/ruby_gems_gems_gem_simple.rb
index <HASH>..<HASH> 100644
--- a/lib/ruby_gems_gems_gem_simple.rb
+++ b/lib/ruby_gems_gems_gem_simple.rb
@@ -13,10 +13,17 @@ class RubyGemsGems_GemSimple < GemSimple
if from_git?
return nil
end
- gem_uri = "#{@gems_url}/#{@name}-#{@version}.gem"
- Utils::log_debug "download and md5 for #{@name} from #{gem_uri}"
+ gem_uri = URI.parse("#{@gems_url}/#{@name}-#{@version}.gem")
+ uri_debug = gem_uri.clone
+ uri_debug.password = "********" if uri_debug.password
+ Utils::log_debug "download and md5 for #{@name} from #{uri_debug}"
begin
- source = open(gem_uri)
+ if gem_uri.user && gem_uri.password
+ source = open(gem_uri.scheme + "://" + gem_uri.host + "/" + gem_uri.path,
+ :http_basic_authentication=>[gem_uri.user, gem_uri.password])
+ else
+ source = open(gem_uri)
+ end
@md5 = Digest::MD5.hexdigest(source.read)
return @md5
rescue
|
add support for username and password in the url
|
diff --git a/tests/Parts/Channel/ChannelTest.php b/tests/Parts/Channel/ChannelTest.php
index <HASH>..<HASH> 100644
--- a/tests/Parts/Channel/ChannelTest.php
+++ b/tests/Parts/Channel/ChannelTest.php
@@ -266,7 +266,7 @@ final class ChannelTest extends DiscordTestCase
/**
* @covers \Discord\Parts\Channel\Channel::allowVoice
*/
- public function testVoiceChannelDoesNotAllowText()
+ public function testVoiceChannelAllowVoice()
{
/**
* @var Channel
@@ -275,7 +275,6 @@ final class ChannelTest extends DiscordTestCase
return $channel->type == Channel::TYPE_VOICE;
})->first();
- $this->assertFalse($vc->allowText());
$this->assertTrue($vc->allowVoice());
}
}
|
test: remove allowText assertion on voice channel
|
diff --git a/library/Garp/Cache/Store/Versioned.php b/library/Garp/Cache/Store/Versioned.php
index <HASH>..<HASH> 100755
--- a/library/Garp/Cache/Store/Versioned.php
+++ b/library/Garp/Cache/Store/Versioned.php
@@ -57,8 +57,7 @@ class Garp_Cache_Store_Versioned {
public function read($key) {
$cache = Zend_Registry::get('CacheFrontend');
// fetch results from cache
- if ($cache->test($key)) {
- $results = $cache->load($key);
+ if (($results = $cache->load($key)) !== false) {
if (!is_array($results)) {
return -1;
}
|
Prevent unnecessary call to backend cache
|
diff --git a/pkg/oauth/server/osinserver/tokengen.go b/pkg/oauth/server/osinserver/tokengen.go
index <HASH>..<HASH> 100644
--- a/pkg/oauth/server/osinserver/tokengen.go
+++ b/pkg/oauth/server/osinserver/tokengen.go
@@ -2,7 +2,6 @@ package osinserver
import (
"encoding/base64"
- "io"
"strings"
"crypto/rand"
@@ -12,9 +11,9 @@ import (
func randomBytes(len int) []byte {
b := make([]byte, len)
- if _, err := io.ReadFull(rand.Reader, b); err != nil {
- // rand.Reader should never fail
- panic(err.Error())
+ if _, err := rand.Read(b); err != nil {
+ // rand.Read should never fail
+ panic(err)
}
return b
}
|
Simplify reading of random bytes
No need to use io.ReadFull, no need to convert error to string.
|
diff --git a/webwhatsapi/__init__.py b/webwhatsapi/__init__.py
index <HASH>..<HASH> 100755
--- a/webwhatsapi/__init__.py
+++ b/webwhatsapi/__init__.py
@@ -234,12 +234,16 @@ class WhatsAPIDriver(object):
EC.visibility_of_element_located((By.CSS_SELECTOR, self._SELECTORS['mainPage']))
)
- def get_qr(self):
+ def get_qr(self, filename=None):
"""Get pairing QR code from client"""
if "Click to reload QR code" in self.driver.page_source:
self.reload_qr()
qr = self.driver.find_element_by_css_selector(self._SELECTORS['qrCode'])
- fd, fn_png = tempfile.mkstemp(prefix=self.username, suffix='.png')
+ if filename is None:
+ fd, fn_png = tempfile.mkstemp(prefix=self.username, suffix='.png')
+ else:
+ fd = os.open(filename, os.O_RDWR|os.CREAT)
+ fn_png = os.path.abspath(filename)
self.logger.debug("QRcode image saved at %s" % fn_png)
qr.screenshot(fn_png)
os.close(fd)
|
Added custom filename option for get_qr
|
diff --git a/src/Prettus/Repository/Eloquent/BaseRepository.php b/src/Prettus/Repository/Eloquent/BaseRepository.php
index <HASH>..<HASH> 100644
--- a/src/Prettus/Repository/Eloquent/BaseRepository.php
+++ b/src/Prettus/Repository/Eloquent/BaseRepository.php
@@ -670,10 +670,13 @@ abstract class BaseRepository implements RepositoryInterface, RepositoryCriteria
// we should pass data that has been casts by the model
// to make sure data type are same because validator may need to use
// this data to compare with data that fetch from database.
+ $model = $this->model->newInstance();
+ $model->setRawAttributes([]);
+ $model->setAppends([]);
if ($this->versionCompare($this->app->version(), "5.2.*", ">")) {
- $attributes = $this->model->newInstance()->forceFill($attributes)->makeVisible($this->model->getHidden())->toArray();
+ $attributes = $model->forceFill($attributes)->makeVisible($this->model->getHidden())->toArray();
} else {
- $model = $this->model->newInstance()->forceFill($attributes);
+ $model->forceFill($attributes);
$model->makeVisible($this->model->getHidden());
$attributes = $model->toArray();
}
|
BUGFIX: If an array $attributes exists in the model, its data is written to the table when the repository is updated (#<I>)
Details in test:
<URL>
|
diff --git a/api/log_test.go b/api/log_test.go
index <HASH>..<HASH> 100644
--- a/api/log_test.go
+++ b/api/log_test.go
@@ -52,7 +52,7 @@ func (s *LogSuite) TearDownSuite(c *gocheck.C) {
func (s *LogSuite) TestLogRemoveAll(c *gocheck.C) {
a := app.App{Name: "words"}
- request, err := http.NewRequest("DELETE", "/log", nil)
+ request, err := http.NewRequest("DELETE", "/logs", nil)
c.Assert(err, gocheck.IsNil)
recorder := httptest.NewRecorder()
err = s.conn.Apps().Insert(a)
@@ -83,7 +83,7 @@ func (s *LogSuite) TestLogRemoveByApp(c *gocheck.C) {
defer s.conn.Apps().Remove(bson.M{"name": a2.Name})
err = a2.Log("last log msg2", "tsuru")
c.Assert(err, gocheck.IsNil)
- url := fmt.Sprintf("/log/%s?:app=%s", a.Name, a.Name)
+ url := fmt.Sprintf("/logs/%s?:app=%s", a.Name, a.Name)
request, err := http.NewRequest("DELETE", url, nil)
c.Assert(err, gocheck.IsNil)
recorder := httptest.NewRecorder()
|
api: fixed url for log in tests.
|
diff --git a/openquake/commands/engine.py b/openquake/commands/engine.py
index <HASH>..<HASH> 100644
--- a/openquake/commands/engine.py
+++ b/openquake/commands/engine.py
@@ -76,13 +76,6 @@ def run_job(job_ini, log_level='info', log_file=None, exports='',
return job_id
-def run_tile(job_ini, sites_slice):
- """
- Used in tiling calculations
- """
- return run_job(job_ini, sites_slice=(sites_slice.start, sites_slice.stop))
-
-
def del_calculation(job_id, confirmed=False):
"""
Delete a calculation and all associated outputs.
|
Removed unused code [skip CI]
|
diff --git a/test/test_trace_output.rb b/test/test_trace_output.rb
index <HASH>..<HASH> 100644
--- a/test/test_trace_output.rb
+++ b/test/test_trace_output.rb
@@ -41,13 +41,17 @@ class TestTraceOutput < Rake::TestCase # :nodoc:
end
def test_trace_issues_single_io_for_args_multiple_strings_and_alternate_sep
+ verbose, $VERBOSE = $VERBOSE, nil
old_sep = $\
$\ = "\r"
+ $VERBOSE = verbose
spy = PrintSpy.new
trace_on(spy, "HI\r", "LO")
assert_equal "HI\rLO\r", spy.result
assert_equal 1, spy.calls
ensure
+ $VERBOSE = nil
$\ = old_sep
+ $VERBOSE = verbose
end
end
|
Suppress deprecation warning for $\ since ruby <I>
|
diff --git a/cake/tests/cases/console/libs/tasks/model.test.php b/cake/tests/cases/console/libs/tasks/model.test.php
index <HASH>..<HASH> 100644
--- a/cake/tests/cases/console/libs/tasks/model.test.php
+++ b/cake/tests/cases/console/libs/tasks/model.test.php
@@ -647,8 +647,9 @@ array(
//'on' => 'create', // Limit validation to 'create' or 'update' operations
),
STRINGEND;
-
- $this->assertPattern('/' . preg_quote($expected, '/') . '/', $result);
+debug($expected);
+debug($result);
+ $this->assertPattern('/' . preg_quote(str_replace("\r\n", "\n", $expected), '/') . '/', $result);
}
/**
|
Fix Model validation bake tests for Windows.
|
diff --git a/services/transaction/get_receipt.js b/services/transaction/get_receipt.js
index <HASH>..<HASH> 100644
--- a/services/transaction/get_receipt.js
+++ b/services/transaction/get_receipt.js
@@ -29,6 +29,7 @@ const GetReceiptKlass = function(params) {
params = params || {};
oThis.transactionHash = params.transaction_hash;
oThis.chain = params.chain;
+ oThis.addressToNameMap = params.address_to_name_map || {};
};
GetReceiptKlass.prototype = {
@@ -58,7 +59,7 @@ GetReceiptKlass.prototype = {
if (!txReceipt) {
return Promise.resolve(responseHelper.successWithData({}));
} else {
- const web3EventsDecoderResponse = web3EventsDecoder.perform(txReceipt, {});
+ const web3EventsDecoderResponse = web3EventsDecoder.perform(txReceipt, oThis.addressToNameMap);
return Promise.resolve(web3EventsDecoderResponse);
}
|
name to map handle in receipt service.
|
diff --git a/setting.go b/setting.go
index <HASH>..<HASH> 100644
--- a/setting.go
+++ b/setting.go
@@ -28,8 +28,8 @@ type QorWidgetSettingInterface interface {
// QorWidgetSetting default qor widget setting struct
type QorWidgetSetting struct {
Name string `gorm:"primary_key"`
- WidgetType string `gorm:"primary_key"`
- Scope string `gorm:"primary_key;default:'default'"`
+ WidgetType string `gorm:"primary_key;size:128"`
+ Scope string `gorm:"primary_key;size:128;default:'default'"`
GroupName string
ActivatedAt *time.Time
Template string
|
Set max length for widget type, scope
|
diff --git a/src/DjangoPassword.php b/src/DjangoPassword.php
index <HASH>..<HASH> 100644
--- a/src/DjangoPassword.php
+++ b/src/DjangoPassword.php
@@ -87,7 +87,7 @@ class DjangoPassword implements PasswordInterface {
if (strpos($hash, '$') === false) {
return true;
} else {
- list($method, ,) = explode('$', $hash, 3);
+ list($method,,) = explode('$', $hash, 3);
switch (strtolower($method)) {
case 'crypt':
case 'sha256':
|
Scrutinizer Auto-Fixes (#2)
This commit consists of patches automatically generated for this project on <URL>
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100755
--- a/index.js
+++ b/index.js
@@ -286,6 +286,8 @@ function attemptInstall (packages, attempts, cb) {
log('-- installing %j', packages)
var done = once(function (err) {
+ clearTimeout(timeout)
+
if (!err) return cb()
if (++attempts <= 10) {
@@ -301,6 +303,14 @@ function attemptInstall (packages, attempts, cb) {
var opts = { noSave: true, command: npmCmd }
if (argv.verbose) opts.stdio = 'inherit'
+ // npm on Travis have a tendency to hang every once in a while
+ // (https://twitter.com/wa7son/status/1006859826549477378). We'll use a
+ // timeout to abort and retry the install in case it hasn't finished within 2
+ // minutes.
+ var timeout = setTimeout(function () {
+ done(new Error('npm install took too long'))
+ }, 2 * 60 * 1000)
+
install(packages, opts, done).on('error', done)
}
|
fix: gracefully handle npm timeouts (#6)
|
diff --git a/lib/codemirror.js b/lib/codemirror.js
index <HASH>..<HASH> 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1276,7 +1276,7 @@ var CodeMirror = (function() {
var tc = textChanged; // textChanged can be reset by cursoractivity callback
if (selectionChanged && options.onCursorActivity)
options.onCursorActivity(instance);
- if (tc && options.onChange)
+ if (tc && options.onChange && instance)
options.onChange(instance, tc);
}
var nestedOperation = 0;
|
don't fire onChange during editor initialization
|
diff --git a/src/DayPicker.js b/src/DayPicker.js
index <HASH>..<HASH> 100644
--- a/src/DayPicker.js
+++ b/src/DayPicker.js
@@ -12,7 +12,7 @@ const keys = {
SPACE: 32
};
-class Caption extends Component {
+class Caption extends Component { // eslint-disable-line
render() {
const { date, locale, localeUtils, onClick } = this.props;
diff --git a/test/DayPicker.js b/test/DayPicker.js
index <HASH>..<HASH> 100644
--- a/test/DayPicker.js
+++ b/test/DayPicker.js
@@ -14,7 +14,7 @@ ExecutionEnvironment.canUseDOM = true;
const TestUtils = require("react-addons-test-utils");
-const DayPicker = require("../src/DayPicker").default;
+const DayPicker = require("../src/DayPicker").default; // eslint-disable-line
const keys = {
LEFT: 37,
|
[wip] Disable eslint not working well
Need to investigate 🤔
|
diff --git a/smack-resolver-javax/src/main/java/org/jivesoftware/smack/util/dns/javax/JavaxResolver.java b/smack-resolver-javax/src/main/java/org/jivesoftware/smack/util/dns/javax/JavaxResolver.java
index <HASH>..<HASH> 100644
--- a/smack-resolver-javax/src/main/java/org/jivesoftware/smack/util/dns/javax/JavaxResolver.java
+++ b/smack-resolver-javax/src/main/java/org/jivesoftware/smack/util/dns/javax/JavaxResolver.java
@@ -52,7 +52,7 @@ public class JavaxResolver extends DNSResolver implements SmackInitializer {
static {
try {
dirContext = new InitialDirContext();
- } catch (Exception e) {
+ } catch (NamingException e) {
LOGGER.log(Level.SEVERE, "Could not construct InitialDirContext", e);
}
|
Reduce scope of catched Exceptions in JavaxResolver
|
diff --git a/lib/phusion_passenger/admin_tools/instance_registry.rb b/lib/phusion_passenger/admin_tools/instance_registry.rb
index <HASH>..<HASH> 100644
--- a/lib/phusion_passenger/admin_tools/instance_registry.rb
+++ b/lib/phusion_passenger/admin_tools/instance_registry.rb
@@ -105,7 +105,7 @@ module PhusionPassenger
begin
FileUtils.chmod_R(0700, path) rescue nil
FileUtils.remove_entry_secure(path)
- rescue Errno::EPERM, Errno::EACCES => e
+ rescue SystemCallError => e
puts " Warning: #{e}"
end
end
|
When cleaning stale instance directories, rescue all system call exceptions
|
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/Restarter.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/Restarter.java
index <HASH>..<HASH> 100644
--- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/Restarter.java
+++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/Restarter.java
@@ -525,12 +525,16 @@ public class Restarter {
public static void initialize(String[] args, boolean forceReferenceCleanup,
RestartInitializer initializer, boolean restartOnInitialize,
RestartListener... listeners) {
- if (instance == null) {
- synchronized (Restarter.class) {
- instance = new Restarter(Thread.currentThread(), args,
+ Restarter localInstance = null;
+ synchronized (Restarter.class) {
+ if (instance == null) {
+ localInstance = new Restarter(Thread.currentThread(), args,
forceReferenceCleanup, initializer, listeners);
+ instance = localInstance;
}
- instance.initialize(restartOnInitialize);
+ }
+ if (localInstance != null) {
+ localInstance.initialize(restartOnInitialize);
}
}
|
Fix broken locking in Restarter.initialize
Closes gh-<I>
|
diff --git a/view/frontend/web/js/view/payment/method-renderer/embedded.js b/view/frontend/web/js/view/payment/method-renderer/embedded.js
index <HASH>..<HASH> 100755
--- a/view/frontend/web/js/view/payment/method-renderer/embedded.js
+++ b/view/frontend/web/js/view/payment/method-renderer/embedded.js
@@ -198,6 +198,9 @@ define(
// Validate before submission
if (additionalValidators.validate()) {
if (Frames.isCardValid()) {
+ // Start the loader
+ fullScreenLoader.startLoader();
+
// Submit frames form
Frames.submitCard();
}
@@ -255,7 +258,7 @@ define(
publicKey: self.getPublicKey(),
containerSelector: '#cko-form-holder',
theme: ckoTheme,
- debugMode: true,
+ debugMode: CheckoutCom.getPaymentConfig()['debug_mode'],
themeOverride: ckoThemeOverride,
frameActivated: function () {
$('#ckoPlaceOrder').attr("disabled", true);
|
Frontend JS update
Added fullscreen loader to Frames and connected Frames debug mode to module config.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -12,13 +12,9 @@ install_requires = [
'backports.functools_lru_cache; python_version<"3.2"',
'jedi>=0.17.0,<0.18.0',
'python-jsonrpc-server>=0.4.0',
- 'pluggy']
-
-if sys.version_info[0] == 2:
- install_requires.append('ujson<=2.0.3; platform_system!="Windows"')
-else:
- install_requires.append('ujson>=3.0.0')
-
+ 'pluggy',
+ 'ujson<=2.0.3 ; platform_system!="Windows" and python_version<"3.0"',
+ 'ujson>=3.0.0 ; python_version>"3"']
setup(
name='python-language-server',
|
Fix ujson dep for python2 (#<I>)
|
diff --git a/scripts/typescript-declarations/generate.js b/scripts/typescript-declarations/generate.js
index <HASH>..<HASH> 100644
--- a/scripts/typescript-declarations/generate.js
+++ b/scripts/typescript-declarations/generate.js
@@ -81,8 +81,8 @@ async function execute() {
// Replace callback type by simply "function"
replace.sync({
files: TMP_FILE_PATH,
- from: new RegExp("EventEmitter~callback", "g"),
- to: () => "function"
+ from: new RegExp("{EventEmitter~callback}", "g"),
+ to: () => "{function}"
});
// Generate declaration file
|
Inlcude curly brackets in replacement
|
diff --git a/shell/src/main/java/org/jboss/seam/forge/shell/ShellImpl.java b/shell/src/main/java/org/jboss/seam/forge/shell/ShellImpl.java
index <HASH>..<HASH> 100644
--- a/shell/src/main/java/org/jboss/seam/forge/shell/ShellImpl.java
+++ b/shell/src/main/java/org/jboss/seam/forge/shell/ShellImpl.java
@@ -679,11 +679,11 @@ public class ShellImpl implements Shell
try
{
reader.removeCompleter(this.completer);
- reader.addCompleter(tempCompleter);
+ if (tempCompleter!=null) { reader.addCompleter(tempCompleter); }
reader.setHistoryEnabled(false);
reader.setPrompt(message);
String line = readLine();
- reader.removeCompleter(tempCompleter);
+ if (tempCompleter!=null) { reader.removeCompleter(tempCompleter); }
reader.addCompleter(this.completer);
reader.setHistoryEnabled(true);
reader.setPrompt("");
|
fixed NPE when using basic completion (such as the one use for 'install' for facet name)
|
diff --git a/gstreamer.py b/gstreamer.py
index <HASH>..<HASH> 100644
--- a/gstreamer.py
+++ b/gstreamer.py
@@ -102,7 +102,8 @@ class GstPlayer(Player):
try:
self._play(media)
except Exception:
- self.idleCond.notifyAll()
+ with self.idleCond:
+ self.idleCond.notifyAll()
self.idle = True
raise
@@ -124,7 +125,8 @@ class GstPlayer(Player):
self.bin.set_state(gst.STATE_NULL)
with self.idleCond:
self.idle = True
- self.idleCond.notifyAll()
+ with self.idleCond:
+ self.idleCond.notifyAll()
def on_message(self, bus, message):
if message.type == gst.MESSAGE_ERROR:
|
gstreamer: bugfix: forgot acquiring of locks
|
diff --git a/src/plotypus_scripts/plotypus.py b/src/plotypus_scripts/plotypus.py
index <HASH>..<HASH> 100644
--- a/src/plotypus_scripts/plotypus.py
+++ b/src/plotypus_scripts/plotypus.py
@@ -209,7 +209,7 @@ def _print_star(results, max_degree, fmt):
end='\t')
print('\t'.join(map(formatter, coefficients_)),
end='\t')
- trailing_zeros = 2*max_degree + 1 - len(coefficients_)
+ trailing_zeros = 2*max_degree + 1 - len(phase_shifted_coeffs)
if trailing_zeros > 0:
print('\t'.join(map(formatter,
numpy.zeros(trailing_zeros))),
|
Added extra needed trailing zero in output table.
|
diff --git a/src/Three/Bank.php b/src/Three/Bank.php
index <HASH>..<HASH> 100644
--- a/src/Three/Bank.php
+++ b/src/Three/Bank.php
@@ -5,6 +5,18 @@ namespace Billplz\Three;
class Bank extends Request
{
/**
+ * Check Bank Account Number.
+ *
+ * @param string|int $number
+ *
+ * @return \Laravie\Codex\Response
+ */
+ public function account($number)
+ {
+ return $this->send('GET', "check/bank_account_number/{$number}");
+ }
+
+ /**
* Get list of bank for Bank Direct Feature.
*
* @return \Laravie\Codex\Response
diff --git a/src/Three/Check.php b/src/Three/Check.php
index <HASH>..<HASH> 100644
--- a/src/Three/Check.php
+++ b/src/Three/Check.php
@@ -13,6 +13,7 @@ class Check extends Request
*/
public function bankAccount($number)
{
- return $this->send('GET', "check/bank_account_number/{$number}");
+ return $this->client->resource('Bank', $this->getVersion())
+ ->account($number);
}
}
|
Passthrough request to check bank account.
|
diff --git a/jmxtrans-output/jmxtrans-output-core/src/main/java/com/googlecode/jmxtrans/model/output/support/opentsdb/OpenTSDBMessageFormatter.java b/jmxtrans-output/jmxtrans-output-core/src/main/java/com/googlecode/jmxtrans/model/output/support/opentsdb/OpenTSDBMessageFormatter.java
index <HASH>..<HASH> 100644
--- a/jmxtrans-output/jmxtrans-output-core/src/main/java/com/googlecode/jmxtrans/model/output/support/opentsdb/OpenTSDBMessageFormatter.java
+++ b/jmxtrans-output/jmxtrans-output-core/src/main/java/com/googlecode/jmxtrans/model/output/support/opentsdb/OpenTSDBMessageFormatter.java
@@ -66,7 +66,6 @@ public class OpenTSDBMessageFormatter {
private final boolean mergeTypeNamesTags;
private final boolean hostnameTag;
- private final Server server = null;
public OpenTSDBMessageFormatter(@Nonnull ImmutableList<String> typeNames,
@Nonnull ImmutableMap<String, String> tags) throws LifecycleException {
|
....need to be tidier
|
diff --git a/src/MvcCore/Router/RouteMethods.php b/src/MvcCore/Router/RouteMethods.php
index <HASH>..<HASH> 100644
--- a/src/MvcCore/Router/RouteMethods.php
+++ b/src/MvcCore/Router/RouteMethods.php
@@ -287,6 +287,16 @@ trait RouteMethods
if ($errorMsgs) {
//var_dump($this->routes);
$selfClass = version_compare(PHP_VERSION, '5.5', '>') ? self::class : __CLASS__;
+ $debBack = debug_backtrace();
+ $debBackLength = count($debBack);
+ if ($debBackLength > 1) {
+ $debBackSemiFinalRec = $debBack[$debBackLength - 2];
+ $file = str_replace('\\', '/', $debBackSemiFinalRec['file']);
+ $bootstrapFilePath = '/App/Bootstrap.php';
+ if (mb_strpos($file, $bootstrapFilePath) === mb_strlen($file) - mb_strlen($bootstrapFilePath)) {
+ die('['.$selfClass.'] '.implode(' ',$errorMsgs));
+ }
+ }
throw new \InvalidArgumentException('['.$selfClass.'] '.implode(' ',$errorMsgs));
}
}
|
router - duplicate routes exception rendering from bootstrap
|
diff --git a/tests/python_package_test/test_basic.py b/tests/python_package_test/test_basic.py
index <HASH>..<HASH> 100644
--- a/tests/python_package_test/test_basic.py
+++ b/tests/python_package_test/test_basic.py
@@ -1,6 +1,5 @@
# coding: utf-8
import os
-import tempfile
import lightgbm as lgb
import numpy as np
@@ -268,8 +267,7 @@ def test_cegb_affects_behavior(tmp_path):
base = lgb.Booster(train_set=ds)
for k in range(10):
base.update()
- with tempfile.NamedTemporaryFile() as f:
- basename = f.name
+ basename = str(tmp_path / "basename.txt")
base.save_model(basename)
with open(basename, 'rt') as f:
basetxt = f.read()
|
completely remove tempfile from test_basic (#<I>)
|
diff --git a/openquake/calculators/views.py b/openquake/calculators/views.py
index <HASH>..<HASH> 100644
--- a/openquake/calculators/views.py
+++ b/openquake/calculators/views.py
@@ -754,6 +754,16 @@ def view_global_poes(token, dstore):
return rst_table(tbl, header=header)
+@view.add('global_gmfs')
+def view_global_gmfs(token, dstore):
+ """
+ Display GMFs averaged on everything for debugging purposes
+ """
+ imtls = dstore['oqparam'].imtls
+ row = dstore['gmf_data/data']['gmv'].mean(axis=0)
+ return rst_table([row], header=imtls)
+
+
@view.add('mean_disagg')
def view_mean_disagg(token, dstore):
"""
|
Added view global_gmfs [skip CI]
Former-commit-id: 5d<I>e<I>aa6fb<I>fb<I>
|
diff --git a/mapchete/io/raster.py b/mapchete/io/raster.py
index <HASH>..<HASH> 100644
--- a/mapchete/io/raster.py
+++ b/mapchete/io/raster.py
@@ -71,7 +71,7 @@ def read_raster_window(
with rasterio.Env(
**get_gdal_options(gdal_opts, is_remote=path_is_remote(input_file, s3=True))
) as env:
- logger.debug("GDAL options: %s ", env.options)
+ logger.debug("reading %s with GDAL options %s", input_files, env.options)
return _read_raster_window(
input_files,
tile,
@@ -224,7 +224,6 @@ def _get_warped_array(
dst_nodata=None
):
"""Extract a numpy array from a raster file."""
- logger.debug("reading %s", input_file)
try:
return _rasterio_read(
input_file=input_file,
|
more concise log messages when reading raster
|
diff --git a/qtpy/QtWidgets.py b/qtpy/QtWidgets.py
index <HASH>..<HASH> 100644
--- a/qtpy/QtWidgets.py
+++ b/qtpy/QtWidgets.py
@@ -63,7 +63,8 @@ elif os.environ[QT_API] in PYQT4_API:
QPrintPreviewDialog, QPrintPreviewWidget, QPrinter, QPrinterInfo)
# These objects belong to QtCore
- del (QItemSelection, QItemSelectionRange, QSortFilterProxyModel)
+ del (QItemSelection, QItemSelectionModel, QItemSelectionRange,
+ QSortFilterProxyModel)
elif os.environ[QT_API] in PYSIDE_API:
from PySide.QtGui import *
QStyleOptionViewItem = QStyleOptionViewItemV4
@@ -103,6 +104,7 @@ elif os.environ[QT_API] in PYSIDE_API:
QPrintPreviewDialog, QPrintPreviewWidget, QPrinter, QPrinterInfo)
# These objects belong to QtCore
- del (QItemSelection, QItemSelectionRange, QSortFilterProxyModel)
+ del (QItemSelection, QItemSelectionModel, QItemSelectionRange,
+ QSortFilterProxyModel)
else:
raise PythonQtError('No Qt bindings could be found')
|
QtWidgets: Remove QItemSelectionModel for PyQt4 and PySide
- It belongs to QtCore in PyQt5
- This finishes PR #<I>
|
diff --git a/plugin/index.js b/plugin/index.js
index <HASH>..<HASH> 100644
--- a/plugin/index.js
+++ b/plugin/index.js
@@ -16,7 +16,7 @@ const expandImports = (source, resolvePath, reference) => {
let defs = queryAST.definitions
lines.some(line => {
if (line[0] === '#' && line.slice(1).split(' ')[0] === 'import') {
- const importFile = line.slice(1).split(' ')[1].slice(1, -1)
+ const importFile = line.slice(1).split(' ')[1].slice(1, -2)
const fragmentAST = gql`${BabelInlineImportHelper.getContents(importFile, path.resolve(reference, resolvePath))}`
defs = [...defs, ...fragmentAST.definitions]
}
|
Temp fix for Windows
This worked for the one person I had testing for me, but I suspect it will break the package on non-windows systems.. Will investigate later.
|
diff --git a/addon/components/document-title.js b/addon/components/document-title.js
index <HASH>..<HASH> 100644
--- a/addon/components/document-title.js
+++ b/addon/components/document-title.js
@@ -45,7 +45,8 @@ export default Ember.Component.extend({
set(previous, 'showSeparatorBefore', false);
}
set(this, 'showSeparatorAfter', !replace);
- this._morph = buffer.dom.insertMorphBefore(titleTag, previous._morph.start);
+ var firstNode = previous._morph.firstNode || previous._morph.start;
+ this._morph = buffer.dom.insertMorphBefore(titleTag, firstNode);
} else {
set(this, 'showSeparatorBefore', !replace);
this._morph = buffer.dom.appendMorph(titleTag);
|
fix document-title to work on Ember <I>
|
diff --git a/database/factories/CurrencyFactory.php b/database/factories/CurrencyFactory.php
index <HASH>..<HASH> 100644
--- a/database/factories/CurrencyFactory.php
+++ b/database/factories/CurrencyFactory.php
@@ -1,5 +1,5 @@
<?php
-namespace AvoRed\Framework\Database\Factories;
+namespace Database\Factories;
use Illuminate\Database\Eloquent\Factories\Factory;
use Faker\Generator as Faker;
use AvoRed\Framework\Database\Models\Currency;
|
Update CurrencyFactory.php
|
diff --git a/testapps/on_device_unit_tests/test_app/app_flask.py b/testapps/on_device_unit_tests/test_app/app_flask.py
index <HASH>..<HASH> 100644
--- a/testapps/on_device_unit_tests/test_app/app_flask.py
+++ b/testapps/on_device_unit_tests/test_app/app_flask.py
@@ -110,6 +110,7 @@ def loadUrl():
print('asked to open url', args['url'])
activity = get_android_python_activity()
activity.loadUrl(args['url'])
+ return ('', 204)
@app.route('/vibrate')
@@ -122,7 +123,8 @@ def vibrate():
if 'time' not in args:
print('ERROR: asked to vibrate but without time argument')
print('asked to vibrate', args['time'])
- return vibrate_with_pyjnius(int(float(args['time']) * 1000))
+ vibrate_with_pyjnius(int(float(args['time']) * 1000))
+ return ('', 204)
@app.route('/orientation')
@@ -135,4 +137,5 @@ def orientation():
print('ERROR: asked to orient but no dir specified')
return 'No direction specified '
direction = args['dir']
- return set_device_orientation(direction)
+ set_device_orientation(direction)
+ return ('', 204)
|
Return proper HTTP responses in webview testapp
Current Flask throws an exception if a view function returns `None`:
```
python : TypeError: The view function for 'vibrate' did not return a
valid response. The function either returned None or ended without a
return statement.
```
Maybe that was different in the past, but instead a proper response can
be returned. An empty <I> would be fine, but a <I> No Content response
is used since it better represents what's happening.
|
diff --git a/Tests/Controller/Admin/DictionaryControllerTest.php b/Tests/Controller/Admin/DictionaryControllerTest.php
index <HASH>..<HASH> 100755
--- a/Tests/Controller/Admin/DictionaryControllerTest.php
+++ b/Tests/Controller/Admin/DictionaryControllerTest.php
@@ -63,7 +63,10 @@ class DictionaryControllerTest extends AbstractAdminControllerTestCase
public function testGridAction()
{
- $this->client->request('GET', $this->generateUrl('admin.dictionary.grid'));
- $this->assertTrue($this->client->getResponse()->isRedirect($this->generateUrl('admin.dictionary.index', [], true)));
+ $this->client->request('GET', $this->generateUrl('admin.dictionary.grid'), [], [], [
+ 'HTTP_X-Requested-With' => 'XMLHttpRequest',
+ ]);
+
+ $this->assertTrue($this->client->getResponse()->isSuccessful());
}
}
|
Factory fixes, fixed repositories, tests, entities
|
diff --git a/khard/address_book.py b/khard/address_book.py
index <HASH>..<HASH> 100644
--- a/khard/address_book.py
+++ b/khard/address_book.py
@@ -1,4 +1,5 @@
# -*- coding: utf-8 -*-
+"""A simple class to load and manage the vcard files from disk."""
import glob
import logging
@@ -9,6 +10,10 @@ from .carddav_object import CarddavObject
class AddressBook:
+
+ """Holds the contacts inside one address book folder. On disk they are
+ stored in vcard files."""
+
def __init__(self, name, path):
self.loaded = False
self.contact_list = []
|
Add docstrings to khard.address_book
|
diff --git a/cli/command_agent.go b/cli/command_agent.go
index <HASH>..<HASH> 100644
--- a/cli/command_agent.go
+++ b/cli/command_agent.go
@@ -19,12 +19,19 @@ func (c *AgentCommand) Help() string {
func (c *AgentCommand) Run(_ []string, ui Ui) int {
config := &serf.Config{}
+
+ ui.Output("Starting Serf agent...")
serf, err := serf.Create(config)
if err != nil {
ui.Error(fmt.Sprintf("Failed to initialize Serf: %s", err))
return 1
}
+ ui.Output("Serf agent running!")
+ ui.Output("")
+ ui.Output(fmt.Sprintf("Node name: '%s'", config.NodeName))
+ ui.Output(fmt.Sprintf("Bind addr: '%s'", config.MemberlistConfig.BindAddr))
+
graceful, forceful := c.startShutdownWatcher(serf, ui)
select {
case <-graceful:
|
cli: Say that the agent is running
|
diff --git a/src/FieldBuilder.php b/src/FieldBuilder.php
index <HASH>..<HASH> 100644
--- a/src/FieldBuilder.php
+++ b/src/FieldBuilder.php
@@ -32,6 +32,7 @@ namespace StoutLogic\AcfBuilder;
* @method FieldBuilder addGoogleMap(string $name, array $args = [])
* @method FieldBuilder addLink(string $name, array $args = [])
* @method FieldBuilder addTab(string $label, array $args = [])
+ * @method FieldBuilder addRange(string $label, array $args = [])
* @method FieldBuilder addMessage(string $label, string $message, array $args = [])
* @method GroupBuilder addGroup(string $name, array $args = [])
* @method RepeaterBuilder addRepeater(string $name, array $args = [])
|
Added missing annotation for addRange function
addRange was added to FieldsBuilder as part of <I> in <I>, however
individual functions return instances of FieldBuilder, which doesn't
include the function. IDE's display function undefined warnings as a
result.
addRange does however work as intended, so this just adds the annotation
so IDE's can provide functionality like autocompletion
|
diff --git a/app/models/foreman_chef/fact_parser.rb b/app/models/foreman_chef/fact_parser.rb
index <HASH>..<HASH> 100644
--- a/app/models/foreman_chef/fact_parser.rb
+++ b/app/models/foreman_chef/fact_parser.rb
@@ -32,9 +32,9 @@ module ForemanChef
klass.where(args).first || klass.new(args.merge(:description => description, :release_name => release_name)).tap(&:save!)
end
+ # we don't want to parse puppet environment, foreman_chef already has its own environment
def environment
- name = facts['environment'] || Setting[:default_puppet_environment]
- Environment.where(:name => name).first_or_create
+ nil
end
def architecture
|
Fixes #<I> - stop parsing chef environment as puppet environment
|
diff --git a/src/HtmlForm/Elements/Range.php b/src/HtmlForm/Elements/Range.php
index <HASH>..<HASH> 100644
--- a/src/HtmlForm/Elements/Range.php
+++ b/src/HtmlForm/Elements/Range.php
@@ -37,7 +37,10 @@ class Range extends Parents\Textbox
*/
public function __construct($name, $label, $min, $max, $args = array())
{
+ $args["attr"]["min"] = $min;
+ $args["attr"]["max"] = $max;
parent::__construct($name, $label, $args);
+
$this->min = $min;
$this->max = $max;
}
|
Added min and max to attributes array
|
diff --git a/prow/clonerefs/run.go b/prow/clonerefs/run.go
index <HASH>..<HASH> 100644
--- a/prow/clonerefs/run.go
+++ b/prow/clonerefs/run.go
@@ -38,7 +38,11 @@ func (o Options) Run() error {
var err error
env, err = addSSHKeys(o.KeyFiles)
if err != nil {
- return fmt.Errorf("failed to add SSH keys: %v", err)
+ logrus.WithError(err).Error("Failed to add SSH keys.")
+ // Continue on error. Clones will fail with an appropriate error message
+ // that initupload can consume whereas quiting without writing the clone
+ // record log is silent and results in an errored prow job instead of a
+ // failed one.
}
}
|
Make clonerefs write errors to log on ssh error.
|
diff --git a/bin/pfdicom b/bin/pfdicom
index <HASH>..<HASH> 100755
--- a/bin/pfdicom
+++ b/bin/pfdicom
@@ -19,7 +19,7 @@ import pfmisc
from pfmisc._colors import Colors
from pfmisc import other
-str_version = "1.4.16"
+str_version = "1.4.18"
str_desc = Colors.CYAN + """
__ _ _
diff --git a/pfdicom/pfdicom.py b/pfdicom/pfdicom.py
index <HASH>..<HASH> 100755
--- a/pfdicom/pfdicom.py
+++ b/pfdicom/pfdicom.py
@@ -53,7 +53,7 @@ class pfdicom(object):
#
self.str_desc = ''
self.__name__ = "pfdicom"
- self.str_version = '1.4.16'
+ self.str_version = '1.4.18'
# Directory and filenames
self.str_workingDir = ''
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ def readme():
setup(
name = 'pfdicom',
- version = '1.4.16',
+ version = '1.4.18',
description = 'Base module for parsing DICOM files in the pf* family.',
long_description = readme(),
author = 'FNNDSC',
|
Bump for pypi
|
diff --git a/raven.js b/raven.js
index <HASH>..<HASH> 100644
--- a/raven.js
+++ b/raven.js
@@ -25,18 +25,20 @@ Database.prototype.getCollections = function(cb) {
Database.prototype.save = function(collection, doc, cb) {
request.put({
- headers: {'Raven-Entity-Name': collection},
- uri: this.getUrl() + '/docs/' + doc.id,
+ headers: {'Raven-Entity-Name': collection}, // TODO: skip this if no collection string passed in?
+ // TODO: Add 'www-authenticate': 'NTLM' back into headers?
+ uri: this.getUrl() + '/docs/' + doc.id, // TODO: Autogenerate id if not passed in?
json: doc
}, function(error, response, body) {
- console.log({'error': error, 'response': response, 'body': body})
- if (!error && response.statusCode == 200) {
+
+ if (!error && response.statusCode == 201) { // 201 - Created
if (cb) cb(null, response)
- else console.log('No callback: ' + response)
}
else {
- if (cb) cb(error)
- else console.log('No callback: ' + response)
+ if (cb) {
+ if (error) cb(error)
+ else cb(new Error('Unable to create document: ' + response.statusCode + ' - ' + response.body))
+ }
}
})
}
|
little bit of cleanup and todos
|
diff --git a/src/formats/kml/features/KmlNetworkLink.js b/src/formats/kml/features/KmlNetworkLink.js
index <HASH>..<HASH> 100644
--- a/src/formats/kml/features/KmlNetworkLink.js
+++ b/src/formats/kml/features/KmlNetworkLink.js
@@ -108,6 +108,18 @@ define([
return;
}
+ if(this.kmlLink.kmlRefreshMode == "onChange") {
+
+ }
+
+ if(this.kmlLink.kmlRefreshMode == "onInterval") {
+ // Important part is to cleanse this one.
+ }
+
+ if(this.kmlLink.kmlRefreshMode == "onExpire") {
+
+ }
+
if(!this.isDownloading && !this.resolvedFile) {
this.isDownloading = true;
var self = this;
|
Start implementation of refresh for the link.
|
diff --git a/discovery/manager_test.go b/discovery/manager_test.go
index <HASH>..<HASH> 100644
--- a/discovery/manager_test.go
+++ b/discovery/manager_test.go
@@ -51,7 +51,7 @@ func TestTargetUpdatesOrder(t *testing.T) {
expectedTargets: nil,
},
{
- title: "Multips TPs no updates",
+ title: "Multiple TPs no updates",
updates: map[string][]update{
"tp1": {},
"tp2": {},
|
Fix misspell in manager_test.go (#<I>)
|
diff --git a/src/Drupal/DrupalExtension/Context/DrupalContext.php b/src/Drupal/DrupalExtension/Context/DrupalContext.php
index <HASH>..<HASH> 100644
--- a/src/Drupal/DrupalExtension/Context/DrupalContext.php
+++ b/src/Drupal/DrupalExtension/Context/DrupalContext.php
@@ -1,6 +1,6 @@
<?php
-namespace Drupal\DrupalExtension\Context
+namespace Drupal\DrupalExtension\Context;
use Behat\Symfony2Extension\Context\KernelAwareInterface;
use Behat\MinkExtension\Context\MinkContext;
|
Fixing typo in DrupalContext.php.
|
diff --git a/lib/feed2email/feed.rb b/lib/feed2email/feed.rb
index <HASH>..<HASH> 100644
--- a/lib/feed2email/feed.rb
+++ b/lib/feed2email/feed.rb
@@ -14,7 +14,6 @@ require 'feed2email/version'
module Feed2Email
class Feed < Sequel::Model(:feeds)
- plugin :dirty
plugin :timestamps
one_to_many :entries
@@ -38,11 +37,13 @@ module Feed2Email
return
end
+ old_last_modified, old_etag = last_modified, etag
+
# Reset feed caching parameters unless all entries were processed. This
# makes sure the feed will be fetched on next processing.
unless process_entries
- self.last_modified = initial_value(:last_modified)
- self.etag = initial_value(:etag)
+ self.last_modified = old_last_modified
+ self.etag = old_etag
end
self.last_processed_at = Time.now
|
Use instance variables to restore last_modified/etag
Thus removing the dependency of the "dirty" Sequel plugin.
|
diff --git a/wafer/talks/forms.py b/wafer/talks/forms.py
index <HASH>..<HASH> 100644
--- a/wafer/talks/forms.py
+++ b/wafer/talks/forms.py
@@ -148,6 +148,11 @@ class ReviewForm(forms.Form):
super(ReviewForm, self).__init__(*args, **kwargs)
+ review_range =_("(Score range: %(min)d to %(max)d)") % {
+ 'min': settings.WAFER_TALK_REVIEW_SCORES[0],
+ 'max': settings.WAFER_TALK_REVIEW_SCORES[1]
+ }
+
for aspect in ReviewAspect.objects.all():
initial = None
if self.instance:
@@ -155,9 +160,10 @@ class ReviewForm(forms.Form):
initial = self.instance.scores.get(aspect=aspect).value
except Score.DoesNotExist:
initial = None
+ # We can't use label_suffix because we're going through crispy
+ # forms, so we tack the range onto the label
self.fields['aspect_{}'.format(aspect.pk)] = forms.IntegerField(
- initial=initial, label=aspect.name,
- min_value=settings.WAFER_TALK_REVIEW_SCORES[0],
+ initial=initial, label="%s %s" % (aspect.name, review_range),
max_value=settings.WAFER_TALK_REVIEW_SCORES[1])
self.helper = FormHelper(self)
|
Add the review score range to the widget label, so it's obvious to reviewers
|
diff --git a/openpnm/utils/misc.py b/openpnm/utils/misc.py
index <HASH>..<HASH> 100644
--- a/openpnm/utils/misc.py
+++ b/openpnm/utils/misc.py
@@ -5,10 +5,8 @@ import numpy as _np
import scipy as _sp
import time as _time
import copy
-from dataclasses import dataclass
from collections import OrderedDict
from docrep import DocstringProcessor
-from terminaltables import AsciiTable
class Docorator(DocstringProcessor):
|
oops forgot to remove dataclasses import from a file
|
diff --git a/lib/chef/node_map.rb b/lib/chef/node_map.rb
index <HASH>..<HASH> 100644
--- a/lib/chef/node_map.rb
+++ b/lib/chef/node_map.rb
@@ -38,12 +38,12 @@
class Chef
class NodeMap
COLLISION_WARNING_14 = <<~EOH.gsub(/\s+/, " ").strip
- %{type_caps} %{key} from a cookbook is overriding the %{type} from core. Please upgrade your cookbook
+ %{type_caps} %{key} from a cookbook is overriding the %{type} from the client. Please upgrade your cookbook
or remove the cookbook from your run_list before the next major release of Chef.
EOH
COLLISION_WARNING_15 = <<~EOH.gsub(/\s+/, " ").strip
- %{type_caps} %{key} from core is overriding the %{type} from a cookbook. Please upgrade your cookbook
+ %{type_caps} %{key} from the client is overriding the %{type} from a cookbook. Please upgrade your cookbook
or remove the cookbook from your run_list.
EOH
|
replace "core" with "the client"
because users don't grok "core"
|
diff --git a/lib/less/parser/parser.js b/lib/less/parser/parser.js
index <HASH>..<HASH> 100644
--- a/lib/less/parser/parser.js
+++ b/lib/less/parser/parser.js
@@ -704,10 +704,7 @@ var Parser = function Parser(context, imports, fileInfo) {
expressionContainsNamed = true;
}
- // we do not support setting a ruleset as a default variable - it doesn't make sense
- // However if we do want to add it, there is nothing blocking it, just don't error
- // and remove isCall dependency below
- value = (isCall && parsers.detachedRuleset()) || parsers.expression();
+ value = parsers.detachedRuleset() || parsers.expression();
if (!value) {
if (isCall) {
|
parser – fix #<I>: allow detached rulesets as mixin argument defaults
|
diff --git a/src/CouchDB/Database.php b/src/CouchDB/Database.php
index <HASH>..<HASH> 100644
--- a/src/CouchDB/Database.php
+++ b/src/CouchDB/Database.php
@@ -33,6 +33,16 @@ class Database
}
/**
+ * Gets the current connection
+ *
+ * @return Connection
+ */
+ public function getConnection()
+ {
+ return $this->connection;
+ }
+
+ /**
* Find a document by a id.
*
* @param string $id
|
Add getConnection method to Database
|
diff --git a/parseany.go b/parseany.go
index <HASH>..<HASH> 100644
--- a/parseany.go
+++ b/parseany.go
@@ -7,10 +7,10 @@ import (
"unicode"
)
-type DateState int
+type dateState int
const (
- st_START DateState = iota
+ st_START dateState = iota
st_DIGIT
st_DIGITDASH
st_DIGITDASHALPHA
|
state constants dont need to be public
|
diff --git a/signer/signer_test.go b/signer/signer_test.go
index <HASH>..<HASH> 100644
--- a/signer/signer_test.go
+++ b/signer/signer_test.go
@@ -1,7 +1,6 @@
package signer_test
import (
- "fmt"
"github.com/cloudfoundry/bosh-davcli/signer"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
|
Fix imported and not used: "fmt"
|
diff --git a/lib/build-graph.js b/lib/build-graph.js
index <HASH>..<HASH> 100644
--- a/lib/build-graph.js
+++ b/lib/build-graph.js
@@ -11,7 +11,7 @@ function buildGraph(parseTree) {
defaultStack = [{ node: {}, edge: {} }],
id = parseTree.id,
g = new Graph({ directed: isDirected, multigraph: isMultigraph, compound: true });
- g.setGraph(id == null ? {} : {id: id});
+ g.setGraph(id === null ? {} : {id: id});
_.each(parseTree.stmts, function(stmt) { handleStmt(g, stmt, defaultStack); });
return g;
}
diff --git a/test/read-one-test.js b/test/read-one-test.js
index <HASH>..<HASH> 100644
--- a/test/read-one-test.js
+++ b/test/read-one-test.js
@@ -39,7 +39,7 @@ describe("read", function() {
var g = read("digraph foobar {}");
expect(g.nodeCount()).to.equal(0);
expect(g.edgeCount()).to.equal(0);
- expect(g.graph()).to.eql({id: 'foobar'});
+ expect(g.graph()).to.eql({id: "foobar"});
expect(g.isDirected()).to.be.true;
});
|
Fix code style for graph id patch
|
diff --git a/pact/pact-compiler/src/main/java/eu/stratosphere/pact/compiler/plan/OptimizerNode.java b/pact/pact-compiler/src/main/java/eu/stratosphere/pact/compiler/plan/OptimizerNode.java
index <HASH>..<HASH> 100644
--- a/pact/pact-compiler/src/main/java/eu/stratosphere/pact/compiler/plan/OptimizerNode.java
+++ b/pact/pact-compiler/src/main/java/eu/stratosphere/pact/compiler/plan/OptimizerNode.java
@@ -1525,7 +1525,7 @@ public abstract class OptimizerNode implements Visitable<OptimizerNode>
public boolean keepsUniqueProperty(FieldSet uniqueSet, int input) {
for (Integer uniqueField : uniqueSet) {
- if (isFieldKept(uniqueField, input) == false) {
+ if (isFieldKept(input, uniqueField) == false) {
return false;
}
}
|
Fixed bug in uniqueness determination in optimizer node
|
diff --git a/randomized-runner/src/main/java/com/carrotsearch/randomizedtesting/ThreadLeakControl.java b/randomized-runner/src/main/java/com/carrotsearch/randomizedtesting/ThreadLeakControl.java
index <HASH>..<HASH> 100644
--- a/randomized-runner/src/main/java/com/carrotsearch/randomizedtesting/ThreadLeakControl.java
+++ b/randomized-runner/src/main/java/com/carrotsearch/randomizedtesting/ThreadLeakControl.java
@@ -625,7 +625,7 @@ class ThreadLeakControl {
}
b.append("^^==============================================\n");
return b.toString();
- } catch (Exception e) {
+ } catch (Throwable e) {
// Ignore, perhaps not available.
}
return threadStacks(getAllStackTraces());
|
Never fail on missing mx bean,
|
diff --git a/lib/lanes/api/root.rb b/lib/lanes/api/root.rb
index <HASH>..<HASH> 100644
--- a/lib/lanes/api/root.rb
+++ b/lib/lanes/api/root.rb
@@ -38,7 +38,7 @@ module Lanes
end
prefix = Lanes.config.mounted_at + (parent_attribute || '')
- puts "#{prefix}/#{path}"
+
# index
get "#{prefix}/#{path}/?:id?.json", &RequestWrapper.get(model, controller, parent_attribute)
|
remove debugging puts that got checked in
|
diff --git a/aws/resource_aws_sfn_activity_test.go b/aws/resource_aws_sfn_activity_test.go
index <HASH>..<HASH> 100644
--- a/aws/resource_aws_sfn_activity_test.go
+++ b/aws/resource_aws_sfn_activity_test.go
@@ -19,6 +19,7 @@ func TestAccAWSSfnActivity_basic(t *testing.T) {
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
+ ErrorCheck: testAccErrorCheck(t, sfn.EndpointsID),
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSSfnActivityDestroy,
Steps: []resource.TestStep{
@@ -45,6 +46,7 @@ func TestAccAWSSfnActivity_Tags(t *testing.T) {
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
+ ErrorCheck: testAccErrorCheck(t, sfn.EndpointsID),
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSSfnActivityDestroy,
Steps: []resource.TestStep{
|
tests/r/sfn_activity: Add ErrorCheck
|
diff --git a/globus_cli/helpers/printing.py b/globus_cli/helpers/printing.py
index <HASH>..<HASH> 100644
--- a/globus_cli/helpers/printing.py
+++ b/globus_cli/helpers/printing.py
@@ -49,17 +49,23 @@ def print_table(iterable, headers_and_keys, print_headers=True):
# the same order as the headers_and_keys array
# use a special function to handle empty iterable
def get_max_colwidth(kf):
- lengths = [len(str(kf(i))) for i in iterable]
+ def _safelen(x):
+ try:
+ return len(x)
+ except TypeError:
+ return len(str(x))
+ lengths = [_safelen(kf(i)) for i in iterable]
if not lengths:
return 0
else:
return max(lengths)
+
widths = [get_max_colwidth(kf) for kf in keyfuncs]
# handle the case in which the column header is the widest thing
widths = [max(w, len(h)) for w, h in zip(widths, headers)]
# create a format string based on column widths
- format_str = ' | '.join('{:' + str(w) + '}' for w in widths)
+ format_str = six.u(' | '.join('{:' + str(w) + '}' for w in widths))
def none_to_null(val):
if val is None:
|
Fix table printing to handle unicode
This is not sufficient for us to claim broad unicode support, but rather
a patch for something I just encountered.
If there is unicode data in a table we want to print for output, we need
to handle two things:
1. str(value) is unsafe, so only do it on types that don't support
__len__ natively
2. The format string must be unicode in order to format unicode data
|
diff --git a/ServiceProvider.php b/ServiceProvider.php
index <HASH>..<HASH> 100755
--- a/ServiceProvider.php
+++ b/ServiceProvider.php
@@ -113,7 +113,12 @@ abstract class ServiceProvider {
if ($group)
{
- static::$publishGroups[$group] = $paths;
+ if ( ! array_key_exists($group, static::$publishGroups))
+ {
+ static::$publishGroups[$group] = [];
+ }
+
+ static::$publishGroups[$group] = array_merge(static::$publishGroups[$group], $paths);
}
}
@@ -126,6 +131,19 @@ abstract class ServiceProvider {
*/
public static function pathsToPublish($provider = null, $group = null)
{
+ if ($provider and $group)
+ {
+ if (empty(static::$publishes[$provider]))
+ {
+ return [];
+ }
+ if (empty(static::$publishGroups[$group]))
+ {
+ return [];
+ }
+ return array_intersect(static::$publishes[$provider], static::$publishGroups[$group]);
+ }
+
if ($group && array_key_exists($group, static::$publishGroups))
{
return static::$publishGroups[$group];
|
Bugfix for Support: ServiceProvider
- method publish() - merging tagged (marked with group) paths with already registered ones
- method pathsToPublish() - added support for selecting by both provider and group
|
diff --git a/test.js b/test.js
index <HASH>..<HASH> 100644
--- a/test.js
+++ b/test.js
@@ -35,6 +35,22 @@ test('split two lines on two writes', function (t) {
input.end()
})
+test('split four lines on three writes', function (t) {
+ t.plan(2)
+
+ var input = split()
+
+ input.pipe(strcb(function (err, list) {
+ t.error(err)
+ t.deepEqual(list, ['hello', 'world', 'bye', 'world'])
+ }))
+
+ input.write('hello\nwor')
+ input.write('ld\nbye\nwo')
+ input.write('rld')
+ input.end()
+})
+
test('accumulate multiple writes', function (t) {
t.plan(2)
|
test: add a test case for char-grouped streams
Given the other test cases, I could not determine if split supports such a use case in that chunks are split in-line.
|
diff --git a/karma.conf.js b/karma.conf.js
index <HASH>..<HASH> 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -17,9 +17,13 @@ module.exports = function(config) {
browsers: ['ChromeHeadlessNoSandbox', 'ie11'],
+ browserDisconnectTimeout: '60000',
+ browserNoActivityTimeout: '60000',
+
client: {
mocha: {
- reporter: 'html'
+ reporter: 'html',
+ timeout: '60000'
}
},
|
Increase the Karma timeout to 1 minute
|
diff --git a/query/src/test/java/org/infinispan/query/affinity/AffinityRpcTest.java b/query/src/test/java/org/infinispan/query/affinity/AffinityRpcTest.java
index <HASH>..<HASH> 100644
--- a/query/src/test/java/org/infinispan/query/affinity/AffinityRpcTest.java
+++ b/query/src/test/java/org/infinispan/query/affinity/AffinityRpcTest.java
@@ -30,17 +30,13 @@ public class AffinityRpcTest extends BaseAffinityTest {
RpcCollector rpcCollector = new RpcCollector();
- // Force initialization of all shards in all nodes before measuring RPCs due to HSEARCH-2522
- populate(1, 500);
- caches().forEach(Cache::clear);
-
cacheManagers.stream()
.flatMap(cm -> cm.getCacheNames().stream().map(cm::getCache))
.forEach(cache -> replaceRpcManager(cache, rpcCollector));
waitForClusterToForm(indexCaches);
- populate(1, 500);
+ populate(1, 100);
stream(indexCaches).forEach(c -> assertNoRPCs(c, rpcCollector));
}
|
ISPN-<I> Remove workaround in AffinityRpcTest
|
diff --git a/karma.conf.js b/karma.conf.js
index <HASH>..<HASH> 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -34,11 +34,11 @@ module.exports = function (config) {
port: 8080,
- logLevel: config.LOG_INFO,
+ logLevel: config.LOG_DEBUG,
autoWatch: false,
- browsers: ['PhantomJS'],
+ browsers: ['Chrome'],
singleRun: true
});
|
Switched back to Chrome in test suite.
|
diff --git a/ctfile/ctfile.py b/ctfile/ctfile.py
index <HASH>..<HASH> 100644
--- a/ctfile/ctfile.py
+++ b/ctfile/ctfile.py
@@ -587,6 +587,11 @@ class Molfile(CTfile):
"""
return self['Ctab'].hydrogen_atoms
+ @property
+ def as_sdfile(self):
+ """Create ``SDfile`` from ``Molfile``."""
+ return SDfile.from_molfile(self)
+
class SDfile(CTfile):
"""SDfile - each structure-data file contains structures and data for any number
|
Added property that converts "Molfile" into "SDfile".
|
diff --git a/source/rafcon/mvc/controllers/state_transitions.py b/source/rafcon/mvc/controllers/state_transitions.py
index <HASH>..<HASH> 100644
--- a/source/rafcon/mvc/controllers/state_transitions.py
+++ b/source/rafcon/mvc/controllers/state_transitions.py
@@ -499,6 +499,10 @@ class StateTransitionsListController(ExtendedController):
@ExtendedController.observe("change_root_state_type", after=True)
@ExtendedController.observe("change_state_type", after=True)
def after_notification_of_parent_or_state_from_lists(self, model, prop_name, info):
+ # The method causing the change raised an exception, thus nothing was changed
+ if 'result' in info['kwargs']:
+ if isinstance(info['kwargs']['result'], str) and "CRASH" in info['kwargs']['result']:
+ return
# self.notification_logs(model, prop_name, info)
if self.no_update and info.method_name in ["change_state_type" and "change_root_state_type"]:
# print "DO_UNLOCK TRANSITION WIDGET"
|
Check for exception in state_transition observer
The notification method in the state transition controller now checks
for exceptions caused by the changing method. If one occurred, nothing
is being updated.
|
diff --git a/src/modelbase.js b/src/modelbase.js
index <HASH>..<HASH> 100644
--- a/src/modelbase.js
+++ b/src/modelbase.js
@@ -166,7 +166,7 @@ module.exports = function(ngin) {
self.fromList(data, function(err, list) {
// check for a single page request
- if (options.page || !pagination || (pagination && pagination.total_pages === 1)) {
+ if (options.page || _.result(options.query, 'page') || !pagination || (pagination && pagination.total_pages === 1)) {
if (options.page !== 0) list._pagination = pagination
return callback(err, list, resp)
}
|
Check query.page when testing for single page
|
diff --git a/ipuz/structures/direction.py b/ipuz/structures/direction.py
index <HASH>..<HASH> 100644
--- a/ipuz/structures/direction.py
+++ b/ipuz/structures/direction.py
@@ -2,9 +2,9 @@
def validate_direction(direction):
splitted = direction.split(':')
- direction_name = direction
if len(splitted) > 2:
return False
+ direction_name = direction
if len(splitted) <= 2:
direction_name = splitted[0]
return direction_name in (
|
Minor change in logic for direction name calculation
|
diff --git a/code/SVGTemplate.php b/code/SVGTemplate.php
index <HASH>..<HASH> 100755
--- a/code/SVGTemplate.php
+++ b/code/SVGTemplate.php
@@ -48,7 +48,7 @@ class SVGTemplate extends ViewableData
/**
* @var string
*/
- private $custom_base;
+ private $custom_base_path;
/**
* @var array
@@ -123,7 +123,7 @@ class SVGTemplate extends ViewableData
*/
public function customBasePath($path)
{
- $this->custom_base = trim($path, DIRECTORY_SEPARATOR);
+ $this->custom_base_path = trim($path, DIRECTORY_SEPARATOR);
return $this;
}
@@ -203,7 +203,7 @@ class SVGTemplate extends ViewableData
{
$path = BASE_PATH . DIRECTORY_SEPARATOR;
- $path .= ($this->custom_base) ? $this->custom_base : $this->stat('base_path');
+ $path .= ($this->custom_base_path) ? $this->custom_base_path : $this->stat('base_path');
$path .= DIRECTORY_SEPARATOR;
foreach($this->subfolders as $subfolder) {
$path .= $subfolder . DIRECTORY_SEPARATOR;
|
Renaming SVGTemplate::$custom_base to $custom_base_path
|
diff --git a/lib/cli/lib/initiate.js b/lib/cli/lib/initiate.js
index <HASH>..<HASH> 100644
--- a/lib/cli/lib/initiate.js
+++ b/lib/cli/lib/initiate.js
@@ -73,7 +73,7 @@ export default function(options, pkg) {
logger.log();
paddedLog('There seems to be a storybook already available in this project.');
paddedLog('Apply following command to force:\n');
- codeLog(['getstorybook -f']);
+ codeLog(['storybook init -f']);
// Add a new line for the clear visibility.
logger.log();
@@ -173,10 +173,10 @@ export default function(options, pkg) {
default:
paddedLog(`We couldn't detect your project type. (code: ${projectType})`);
paddedLog(
- "Please make sure you are running the `getstorybook` command in your project's root directory."
+ "Please make sure you are running the `storybook init` command in your project's root directory."
);
paddedLog(
- 'You can also install storybook for plain HTML snippets with `getstorybook --html` or follow some of the slow start guides: https://storybook.js.org/basics/slow-start-guide/'
+ 'You can also install storybook for plain HTML snippets with `storybook init --html` or follow some of the slow start guides: https://storybook.js.org/basics/slow-start-guide/'
);
// Add a new line for the clear visibility.
|
Update missed getstorybook occurrences
|
diff --git a/src/Service.php b/src/Service.php
index <HASH>..<HASH> 100644
--- a/src/Service.php
+++ b/src/Service.php
@@ -193,7 +193,7 @@ class Service extends Component
$decodedJson = $this->_getAssetContents($asset);
// Automatic refreshing of Instagram embedded assets every seven days, see issue #114 for why
- if (($decodedJson['providerName'] === 'Instagram') && $this->_hasBeenWeekSince($asset->dateModified)) {
+ if (( strtolower($decodedJson['providerName']) === 'instagram') && $this->_hasBeenWeekSince($asset->dateModified)) {
if ($this->_hasInstagramImageExpired($decodedJson['image'])) {
$decodedJson = $this->_updateInstagramFile($asset, $decodedJson['url']);
} else {
|
Set providerName to lowercase
Apparently the platformName variable is not always stored consistent as capitalized. It varies between "Instagram" and lowercase "instagram". This resulted in some embeds weren't getting refreshed.
|
diff --git a/src/draw/handler/Draw.Marker.js b/src/draw/handler/Draw.Marker.js
index <HASH>..<HASH> 100644
--- a/src/draw/handler/Draw.Marker.js
+++ b/src/draw/handler/Draw.Marker.js
@@ -47,18 +47,18 @@ L.Draw.Marker = L.Draw.Feature.extend({
if (this._map) {
if (this._marker) {
- this._marker.off('click', this._onClick);
+ this._marker.off('click', this._onClick, this);
this._map
- .off('click', this._onClick)
+ .off('click', this._onClick, this)
.removeLayer(this._marker);
delete this._marker;
}
- this._mouseMarker.off('click', this._onClick);
+ this._mouseMarker.off('click', this._onClick, this);
this._map.removeLayer(this._mouseMarker);
delete this._mouseMarker;
- this._map.off('mousemove', this._onMouseMove);
+ this._map.off('mousemove', this._onMouseMove, this);
}
},
|
Pass the context in removeHooks so events will be removed correctly in the latest leaflet build.
|
diff --git a/src/search/FindReplace.js b/src/search/FindReplace.js
index <HASH>..<HASH> 100644
--- a/src/search/FindReplace.js
+++ b/src/search/FindReplace.js
@@ -178,7 +178,7 @@ define(function (require, exports, module) {
if (state.matchIndex !== -1) {
// Convert to 1-based by adding one before showing the index.
findBar.showFindCount(StringUtils.format(Strings.FIND_MATCH_INDEX,
- state.matchIndex + 1, state.marked.length));
+ state.matchIndex + 1, state.resultSet.length));
}
}
}
|
Use resultSet array length for total match count rather than using the length of Marked Text.
|
diff --git a/src/passes/pass.js b/src/passes/pass.js
index <HASH>..<HASH> 100644
--- a/src/passes/pass.js
+++ b/src/passes/pass.js
@@ -65,6 +65,12 @@ export class Pass {
this.quad = quad;
+ if(this.quad !== null) {
+
+ this.quad.frustumCulled = false;
+
+ }
+
/**
* Indicates whether the read and write buffers should be swapped after this
* pass has finished rendering.
@@ -103,8 +109,17 @@ export class Pass {
// Add the camera and the quad to the scene.
if(this.scene !== null) {
- if(this.camera !== null && this.camera.parent === null) { this.scene.add(this.camera); }
- if(this.quad !== null) { this.scene.add(this.quad); }
+ if(this.camera !== null && this.camera.parent === null) {
+
+ this.scene.add(this.camera);
+
+ }
+
+ if(this.quad !== null) {
+
+ this.scene.add(this.quad);
+
+ }
}
|
Don't let the quad be clipped.
See mrdoob/three.js#<I>.
|
diff --git a/src/Collection.php b/src/Collection.php
index <HASH>..<HASH> 100644
--- a/src/Collection.php
+++ b/src/Collection.php
@@ -32,7 +32,7 @@ abstract class Collection extends \Illuminate\Support\Collection
$class = $collection->get($key);
if (class_exists($class)) {
- return new $class;
+ return resolve($class);
}
return null;
|
Resolving collection instances from the container
|
diff --git a/lib/mongoid/field.rb b/lib/mongoid/field.rb
index <HASH>..<HASH> 100644
--- a/lib/mongoid/field.rb
+++ b/lib/mongoid/field.rb
@@ -34,7 +34,7 @@ module Mongoid #:nodoc:
# <tt>Field.new(:score, :default => 0)</tt>
def initialize(name, options = {})
check_name!(name)
- @type = options[:type] || String
+ @type = options[:type] || Object
@name, @default = name, options[:default]
@copyable = (@default.is_a?(Array) || @default.is_a?(Hash))
@options = options
diff --git a/spec/unit/mongoid/field_spec.rb b/spec/unit/mongoid/field_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/unit/mongoid/field_spec.rb
+++ b/spec/unit/mongoid/field_spec.rb
@@ -144,8 +144,8 @@ describe Mongoid::Field do
@field = Mongoid::Field.new(:name)
end
- it "defaults to String" do
- @field.type.should == String
+ it "defaults to Object" do
+ @field.type.should == Object
end
end
|
Changing default field type to Object instead of String
|
diff --git a/src/test/java/org/eclipse/jetty/nosql/memcached/MemcachedTestServer.java b/src/test/java/org/eclipse/jetty/nosql/memcached/MemcachedTestServer.java
index <HASH>..<HASH> 100644
--- a/src/test/java/org/eclipse/jetty/nosql/memcached/MemcachedTestServer.java
+++ b/src/test/java/org/eclipse/jetty/nosql/memcached/MemcachedTestServer.java
@@ -65,8 +65,9 @@ public class MemcachedTestServer extends AbstractTestServer
e.printStackTrace();
}
- _idManager.setScavengeDelay(_scavengePeriod + 1000);
- _idManager.setScavengePeriod(_maxInactivePeriod);
+ _idManager.setScavengeDelay(_scavengePeriod * 1000);
+ _idManager.setScavengePeriod(_maxInactivePeriod);
+ _idManager.setWorkerName("node0");
try
{
|
set workerName for MemcachedSessionIdManager.
|
diff --git a/stackinternal_test.go b/stackinternal_test.go
index <HASH>..<HASH> 100644
--- a/stackinternal_test.go
+++ b/stackinternal_test.go
@@ -31,3 +31,34 @@ func TestCaller(t *testing.T) {
t.Errorf("got line == %v, want line == %v", got, want)
}
}
+
+type fholder struct {
+ f func() CallStack
+}
+
+func (fh *fholder) labyrinth() CallStack {
+ for {
+ return fh.f()
+ }
+}
+
+func TestTrace(t *testing.T) {
+ t.Parallel()
+
+ fh := fholder{
+ f: func() CallStack {
+ cs := Trace()
+ return cs
+ },
+ }
+
+ cs := fh.labyrinth()
+
+ lines := []int{50, 41, 55}
+
+ for i, line := range lines {
+ if got, want := cs[i].line(), line; got != want {
+ t.Errorf("got line[%d] == %v, want line[%d] == %v", i, got, i, want)
+ }
+ }
+}
|
Add additional test for Trace().
|
diff --git a/test/features/pagecontent/content_negotiation.js b/test/features/pagecontent/content_negotiation.js
index <HASH>..<HASH> 100644
--- a/test/features/pagecontent/content_negotiation.js
+++ b/test/features/pagecontent/content_negotiation.js
@@ -49,7 +49,6 @@ describe('Content negotiation', function() {
const wrongContentTypeAccept = currentParsoidContentType
.replace(/text\/html/, 'application/json')
.replace(/\d+\.\d+\.\d+"$/, `${PARSOID_SUPPORTED_DOWNGRADE}"`);
- console.log(wrongContentTypeAccept);
return preq.get({
uri: `${server.config.labsBucketURL}/html/Main_Page`,
headers: {
|
Minor: Remove superfluous console.log()
|
diff --git a/aegea/batch.py b/aegea/batch.py
index <HASH>..<HASH> 100644
--- a/aegea/batch.py
+++ b/aegea/batch.py
@@ -438,7 +438,7 @@ def watch(args):
logger.info("Job %s %s", args.job_id, format_job_status(job_desc["status"]))
last_status = job_desc["status"]
if job_desc["status"] in {"RUNNING", "SUCCEEDED", "FAILED"}:
- logger.info("Job %s log stream: %s", args.job_id, job_desc["container"]["logStreamName"])
+ logger.info("Job %s log stream: %s", args.job_id, job_desc.get("container", {}).get("logStreamName"))
save_job_desc(job_desc)
if job_desc["status"] in {"RUNNING", "SUCCEEDED", "FAILED"}:
args.log_stream_name = job_desc["container"]["logStreamName"]
|
aegea batch watch: fix logic error when job fails before starting
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.