diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/tests/test_repr.py b/tests/test_repr.py
index <HASH>..<HASH> 100644
--- a/tests/test_repr.py
+++ b/tests/test_repr.py
@@ -4,18 +4,21 @@ import six
class ReprTest(unittest.TestCase):
+ """Checks that the string representations of charts and entries are correct.
+ """
+
+ @classmethod
+ def setUpClass(cls):
+ cls.chart = billboard.ChartData("hot-100", date="2010-01-02")
+
def testReprChart(self):
- """Checks that the string representation of a chart is correct."""
- chart = billboard.ChartData("hot-100", date="1996-08-03")
self.assertEqual(
- repr(chart), "billboard.ChartData('hot-100', date='1996-08-03')"
+ repr(self.chart), "billboard.ChartData('hot-100', date='2010-01-02')"
)
def testReprEntry(self):
- """Checks that the string representation of an entry is correct."""
- chart = billboard.ChartData("hot-100", date="2010-01-02")
self.assertEqual(
- repr(chart[0]),
+ repr(self.chart[0]),
"billboard.ChartEntry(title={!r}, artist={!r})".format(
six.text_type("TiK ToK"), six.text_type("Ke$ha")
),
|
Merge tests to reduce number of HTTP requests
|
diff --git a/test/run.js b/test/run.js
index <HASH>..<HASH> 100644
--- a/test/run.js
+++ b/test/run.js
@@ -8,7 +8,7 @@ describe('async-chainable.run() - parallel execution with arrays', function() {
var output = [];
asyncChainable()
- .run([
+ .runArray([
function(next) { output.push('cb1'); next() },
function(next) { output.push('cb2'); next() },
function(next) { output.push('cb3'); next() },
@@ -21,7 +21,7 @@ describe('async-chainable.run() - parallel execution with arrays', function() {
it('should exit on errors', function(done) {
asyncChainable()
- .run([
+ .runArray([
function(next) { next() },
function(next) { next('NOPE') },
function(next) { next() },
|
BUGFIX: Wrong function name after recent funciton rename
|
diff --git a/lib/stream/feed.rb b/lib/stream/feed.rb
index <HASH>..<HASH> 100644
--- a/lib/stream/feed.rb
+++ b/lib/stream/feed.rb
@@ -111,32 +111,23 @@ module Stream
self.make_request(:post, uri, nil, follow_data)
end
- def parse_follow_data(response)
- return {
- 'count' => response['count'],
- 'results' => response['results']
- }
- end
-
- def followers(limit=100, offset=0)
+ def followers(limit=25, offset=0)
uri = "/feed/#{@feed_url}/followers/"
params = {
'offset' => offset,
'limit' => limit
}
- response = self.make_request(:get, uri, params)
- self.parse_follow_data(response)
+ self.make_request(:get, uri, params)
end
- def following(limit=100, offset=0, filter=[])
+ def following(limit=25, offset=0, filter=[])
uri = "/feed/#{@feed_url}/follows/"
params = {
'limit' => limit,
'offset' => offset,
'filter' => filter.join(",")
}
- response = self.make_request(:get, uri, params)
- self.parse_follow_data(response)
+ self.make_request(:get, uri, params)
end
def unfollow(target_feed_id)
|
return <I> feeds by default
|
diff --git a/lnwallet/channel.go b/lnwallet/channel.go
index <HASH>..<HASH> 100644
--- a/lnwallet/channel.go
+++ b/lnwallet/channel.go
@@ -1421,9 +1421,14 @@ func createCommitTx(fundingOutput *wire.TxIn, selfKey, theirKey *btcec.PublicKey
commitTx := wire.NewMsgTx()
commitTx.Version = 2
commitTx.AddTxIn(fundingOutput)
- // TODO(roasbeef): don't make 0 BTC output...
- commitTx.AddTxOut(wire.NewTxOut(int64(amountToSelf), payToUsScriptHash))
- commitTx.AddTxOut(wire.NewTxOut(int64(amountToThem), theirWitnessKeyHash))
+
+ // Avoid creating zero value outputs within the commitment transaction.
+ if amountToSelf != 0 {
+ commitTx.AddTxOut(wire.NewTxOut(int64(amountToSelf), payToUsScriptHash))
+ }
+ if amountToThem != 0 {
+ commitTx.AddTxOut(wire.NewTxOut(int64(amountToThem), theirWitnessKeyHash))
+ }
return commitTx, nil
}
|
lnwallet: never create zero-value outputs within the commitment transaction
|
diff --git a/Components/Helper/OpenSSLHelper.php b/Components/Helper/OpenSSLHelper.php
index <HASH>..<HASH> 100755
--- a/Components/Helper/OpenSSLHelper.php
+++ b/Components/Helper/OpenSSLHelper.php
@@ -28,6 +28,8 @@ class OpenSSLHelper
*/
public static function encrypt($plainText, $key, $cipher)
{
+ $cipher = strtolower($cipher);
+
if (false === in_array($cipher, openssl_get_cipher_methods())) {
throw new \LogicException(sprintf('Cipher %s not supported', $cipher));
}
@@ -52,6 +54,8 @@ class OpenSSLHelper
*/
public static function decrypt($encryptedText, $key, $cipher)
{
+ $cipher = strtolower($cipher);
+
if (false === in_array($cipher, openssl_get_cipher_methods())) {
throw new \LogicException(sprintf('Cipher %s not supported', $cipher));
}
|
fix cipher for openssl <I>
|
diff --git a/tests/Integration/Http/ThrottleRequestsTest.php b/tests/Integration/Http/ThrottleRequestsTest.php
index <HASH>..<HASH> 100644
--- a/tests/Integration/Http/ThrottleRequestsTest.php
+++ b/tests/Integration/Http/ThrottleRequestsTest.php
@@ -44,9 +44,9 @@ class ThrottleRequestsTest extends TestCase
Carbon::now()->addSeconds(58)
);
- try{
+ try {
$response = $this->withoutExceptionHandling()->get('/');
- }catch(\Throwable $e){
+ } catch (\Throwable $e) {
$this->assertEquals(429, $e->getStatusCode());
$this->assertEquals(2, $e->getHeaders()['X-RateLimit-Limit']);
$this->assertEquals(0, $e->getHeaders()['X-RateLimit-Remaining']);
|
Apply fixes from StyleCI (#<I>)
|
diff --git a/src/adapt/layout.js b/src/adapt/layout.js
index <HASH>..<HASH> 100644
--- a/src/adapt/layout.js
+++ b/src/adapt/layout.js
@@ -888,7 +888,6 @@ adapt.layout.Column.prototype.layoutFloat = function(nodeContext) {
// TODO: review if it is good to rely on it
// TODO: position where a real float would have been positioned
adapt.base.setCSSProperty(element, "display", "inline-block");
- adapt.base.setCSSProperty(element, "position", "absolute");
adapt.base.setCSSProperty(element, "left", "auto");
adapt.base.setCSSProperty(element, "right", "auto");
adapt.base.setCSSProperty(element, "top", "auto");
@@ -965,6 +964,7 @@ adapt.layout.Column.prototype.layoutFloat = function(nodeContext) {
if (self.vertical) {
floatBox = adapt.geom.unrotateBox(floatHorBox);
}
+ adapt.base.setCSSProperty(element, "position", "absolute");
adapt.base.setCSSProperty(element, "left",
(floatBox.x1 - self.getLeftEdge() + self.paddingLeft) + "px");
adapt.base.setCSSProperty(element, "top",
|
make float element position: absolute after positioning done
|
diff --git a/lib/beetle/version.rb b/lib/beetle/version.rb
index <HASH>..<HASH> 100644
--- a/lib/beetle/version.rb
+++ b/lib/beetle/version.rb
@@ -1,3 +1,3 @@
module Beetle
- VERSION = "0.4.0"
+ VERSION = "0.4.1"
end
|
bumped version to <I>
|
diff --git a/src/Slick/Database/Adapter/MysqlAdapter.php b/src/Slick/Database/Adapter/MysqlAdapter.php
index <HASH>..<HASH> 100644
--- a/src/Slick/Database/Adapter/MysqlAdapter.php
+++ b/src/Slick/Database/Adapter/MysqlAdapter.php
@@ -83,7 +83,7 @@ class MysqlAdapter extends AbstractAdapter implements AdapterInterface
$dsn,
$this->_username,
$this->_password,
- [PDO::ERRMODE_EXCEPTION]
+ [PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION]
);
$this->_connected = true;
} catch (\Exception $exp) {
|
Fixing the PDO exceptions mode
|
diff --git a/lib/active_scaffold/config/search.rb b/lib/active_scaffold/config/search.rb
index <HASH>..<HASH> 100644
--- a/lib/active_scaffold/config/search.rb
+++ b/lib/active_scaffold/config/search.rb
@@ -42,7 +42,7 @@ module ActiveScaffold::Config
def columns
# we want to delay initializing to the @core.columns set for as long as possible. Too soon and .search_sql will not be available to .searchable?
unless @columns
- self.columns = @core.columns.collect{|c| c.name if c.searchable? and c.column and c.column.text?}.compact
+ self.columns = @core.columns.collect{|c| c.name if @core.columns._inheritable.include?(c.name) and c.searchable? and c.column and c.column.text?}.compact
end
@columns
end
|
Bugfix: ignore_columns settings are not considered for search_columns
(issue <I> by eriko)
|
diff --git a/lib/cms_scanner.rb b/lib/cms_scanner.rb
index <HASH>..<HASH> 100644
--- a/lib/cms_scanner.rb
+++ b/lib/cms_scanner.rb
@@ -106,13 +106,7 @@ module CMSScanner
# depending on the findings / errors
def exit_hook
at_exit do
- if run_error
- exit(NS::ExitCode::CLI_OPTION_ERROR) if run_error.is_a?(OptParseValidator::Error) ||
- run_error.is_a?(OptionParser::ParseError)
-
- exit(NS::ExitCode::INTERRUPTED) if run_error.is_a?(Interrupt)
- exit(NS::ExitCode::ERROR)
- end
+ exit(run_error_exit_code) if run_error
controller = controllers.first
@@ -121,6 +115,16 @@ module CMSScanner
exit(NS::ExitCode::OK)
end
end
+
+ # @return [ Integer ] The exit code related to the run_error
+ def run_error_exit_code
+ return NS::ExitCode::CLI_OPTION_ERROR if run_error.is_a?(OptParseValidator::Error) ||
+ run_error.is_a?(OptionParser::ParseError)
+
+ return NS::ExitCode::INTERRUPTED if run_error.is_a?(Interrupt)
+
+ NS::ExitCode::ERROR
+ end
end
end
|
rework the at_exit hook a bit
|
diff --git a/zipline/examples/dual_ema_talib.py b/zipline/examples/dual_ema_talib.py
index <HASH>..<HASH> 100644
--- a/zipline/examples/dual_ema_talib.py
+++ b/zipline/examples/dual_ema_talib.py
@@ -53,11 +53,11 @@ class DualEMATaLib(TradingAlgorithm):
self.buy = False
self.sell = False
- if self.short_ema > self.long_ema and not self.invested:
+ if (self.short_ema > self.long_ema).all() and not self.invested:
self.order('AAPL', 100)
self.invested = True
self.buy = True
- elif self.short_ema < self.long_ema and self.invested:
+ elif (self.short_ema < self.long_ema).all() and self.invested:
self.order('AAPL', -100)
self.invested = False
self.sell = True
diff --git a/zipline/transforms/batch_transform.py b/zipline/transforms/batch_transform.py
index <HASH>..<HASH> 100644
--- a/zipline/transforms/batch_transform.py
+++ b/zipline/transforms/batch_transform.py
@@ -381,7 +381,7 @@ class BatchTransform(object):
else:
data = self.rolling_panel.get_current()
- if self.supplemental_data:
+ if self.supplemental_data is not None:
for item in data.items:
if item not in self.supplemental_data.items:
continue
|
MAINT: Use more exact boolean checks for pandas structures.
To prepare for being compatible with pandas==<I>, which is stricter
on boolean checks.
|
diff --git a/app/src/js/init.js b/app/src/js/init.js
index <HASH>..<HASH> 100644
--- a/app/src/js/init.js
+++ b/app/src/js/init.js
@@ -222,7 +222,7 @@ var init = {
});
// Check if any records in the overview have been checked, and if so: show action buttons.
- $('.dashboardlisting input:checkbox').click(function () {
+ $('.dashboardlisting input:checkbox[name="checkRow"]').click(function () {
var aItems = getSelectedItems();
if (aItems.length >= 1) {
|
Make row checkbox more selective when en/disabling buttons
|
diff --git a/web/concrete/single_pages/dashboard/reports/statistics.php b/web/concrete/single_pages/dashboard/reports/statistics.php
index <HASH>..<HASH> 100644
--- a/web/concrete/single_pages/dashboard/reports/statistics.php
+++ b/web/concrete/single_pages/dashboard/reports/statistics.php
@@ -66,6 +66,8 @@ defined('C5_EXECUTE') or die("Access Denied.");
<p><?php echo t('Total page versions')?>: <strong><?php echo $totalVersions?></strong></p>
<p><?php echo t('Total pages in edit mode')?>: <strong><?php echo $totalEditMode?></strong></p>
+<br/><br/>
+
<h4><?=t('Five Most Recent Downloads')?></h4>
<table class="table" id="ccm-site-statistics-downloads">
|
light tweaks to statistics but it's still broken
Former-commit-id: e<I>ac8cc1dd<I>cac3cf4ef<I>b0e<I>f
|
diff --git a/test/test_mock_solver_loading.py b/test/test_mock_solver_loading.py
index <HASH>..<HASH> 100644
--- a/test/test_mock_solver_loading.py
+++ b/test/test_mock_solver_loading.py
@@ -7,6 +7,7 @@ import unittest
import requests_mock
import dwave_micro_client
+from dwave_micro_client import InvalidAPIResponseError
try:
import unittest.mock as mock
@@ -135,7 +136,7 @@ class MockSolverLoading(unittest.TestCase):
with requests_mock.mock() as m:
m.get(solver1_url, text=solver_object(solver_name, True))
con = dwave_micro_client.Connection(url, token)
- with self.assertRaises(KeyError):
+ with self.assertRaises(InvalidAPIResponseError):
con.get_solver(solver_name)
def test_load_solver_broken_response(self):
|
Fix unit test for case of a solver with invalid structure
|
diff --git a/test/__init__.py b/test/__init__.py
index <HASH>..<HASH> 100644
--- a/test/__init__.py
+++ b/test/__init__.py
@@ -106,6 +106,7 @@ class TestSendGrid(unittest.TestCase):
self.assertEqual(html, url['html'])
def test_drop_to_header(self):
+ smtpapi = '{}'
m = Mail()
m.add_to('John, Doe <john@email.com>')
m.set_from('doe@email.com')
@@ -113,8 +114,7 @@ class TestSendGrid(unittest.TestCase):
m.set_text('test')
m.add_bcc('John, Doe <john@email.com>')
url = self.sg._build_body(m)
-
- print url
+ self.assertEqual(smtpapi, url['x-smtpapi'])
class SendGridClientUnderTest(SendGridClient):
|
Assert dumps in headers
|
diff --git a/lib/kaminari/sinatra.rb b/lib/kaminari/sinatra.rb
index <HASH>..<HASH> 100644
--- a/lib/kaminari/sinatra.rb
+++ b/lib/kaminari/sinatra.rb
@@ -2,4 +2,6 @@ require 'sinatra/base'
require 'kaminari'
require 'kaminari/helpers/sinatra_helpers'
+ActiveSupport::Deprecation.warn 'Kaminari Sinatra support has been extracted to a separate gem, and will be removed in the next 1.0 release. Please bundle kaminari-sinatra gem.'
+
Kaminari::Hooks.init
|
Extract kaminari-sinatra gem, and warn users to use the gemified adapter
The built-in Sinatra support will be removed from this gem in the <I> release
|
diff --git a/src/adapters/stdOut.js b/src/adapters/stdOut.js
index <HASH>..<HASH> 100644
--- a/src/adapters/stdOut.js
+++ b/src/adapters/stdOut.js
@@ -12,6 +12,13 @@ function configure( config, formatter ) {
error: "red"
}, config.theme );
+ var logType = {
+ info: "info",
+ warn: "warn",
+ debug: "log",
+ error: "error"
+ };
+
colors.setTheme( theme );
adapter = adapter || {
@@ -23,7 +30,7 @@ function configure( config, formatter ) {
msg = data.msg;
}
var timestamp = formatter( config, data );
- console.log( colors[ data.type ]( timestamp, data.namespace || "", msg ) );
+ console[logType[data.type]]( colors[ data.type ]( timestamp, data.namespace || "", msg ) );
},
constraint: function( data ) {
return data.level <= config.level && ( !config.bailIfDebug || ( config.bailIfDebug && !envDebug ) );
|
first hack to use appropriate console method for logging levels
|
diff --git a/kernel_tuner/strategies/firefly_algorithm.py b/kernel_tuner/strategies/firefly_algorithm.py
index <HASH>..<HASH> 100644
--- a/kernel_tuner/strategies/firefly_algorithm.py
+++ b/kernel_tuner/strategies/firefly_algorithm.py
@@ -66,7 +66,7 @@ def tune(runner, kernel_options, device_options, tuning_options):
# compute initial intensities
for j in range(num_particles):
try:
- swarm[i].compute_intensity(_cost_func)
+ swarm[j].compute_intensity(_cost_func)
except util.StopCriterionReached as e:
if tuning_options.verbose:
print(e)
|
fix computation of initial scores in firefly
|
diff --git a/lib/disney/couchbaseChannel.js b/lib/disney/couchbaseChannel.js
index <HASH>..<HASH> 100644
--- a/lib/disney/couchbaseChannel.js
+++ b/lib/disney/couchbaseChannel.js
@@ -30,6 +30,8 @@ const sLongPollDelay = Symbol('Long Poll Restart Delay');
// size of batches to fetch docs in
const docFetchBatchSize = 500;
+const longPollTimeout = 1000 * 60 * 5; // 5 minutes
+
// current (< 2.x) User-Agent
// https://github.com/couchbase/couchbase-lite-android/blob/5bffb9f80db52946b543d6dec03f1cb2d7b6de50/shared/src/main/java/com/couchbase/lite/internal/replicator/CBLWebSocket.java#L351
const CouchbaseLiteUserAgent = 'CouchbaseLite/1.3 (1.4.1/8a21c5927a273a038fb3b66ec29c86425e871b11)';
@@ -51,9 +53,9 @@ function DoLongPoll() {
}, {
json: true,
headers: this.HTTPHeaders,
- // timeout long-poll after a minute
- response_timeout: 1000 * 60,
- read_timeout: 1000 * 60,
+ // timeout long-poll after 5 minutes
+ response_timeout: longPollTimeout,
+ read_timeout: longPollTimeout,
}).then((resp) => {
// check for success
if (resp.statusCode !== 200) {
|
[~] Set longpoll timeout to 5 minutes
|
diff --git a/users.go b/users.go
index <HASH>..<HASH> 100644
--- a/users.go
+++ b/users.go
@@ -246,7 +246,7 @@ func (api *Client) GetUserIdentityContext(ctx context.Context) (*UserIdentityRes
// SetUserPhoto changes the currently authenticated user's profile image
func (api *Client) SetUserPhoto(ctx context.Context, image string, params UserSetPhotoParams) error {
- return api.SetUserPhoto(context.Background(), image, params)
+ return api.SetUserPhotoContext(context.Background(), image, params)
}
// SetUserPhotoContext changes the currently authenticated user's profile image using a custom context
|
Fix bug wherein users.SetUserPhoto was calling itself recursively.
|
diff --git a/redis_metrics/utils.py b/redis_metrics/utils.py
index <HASH>..<HASH> 100644
--- a/redis_metrics/utils.py
+++ b/redis_metrics/utils.py
@@ -10,9 +10,9 @@ def metric(slug, num=1, **kwargs):
_r.metric(slug, num)
-def gague(slug, current_value):
- """Set a value for a Guage"""
- _r.gague(slug, current_value)
+def gauge(slug, current_value):
+ """Set a value for a Gauge"""
+ _r.gauge(slug, current_value)
def _dates(num):
|
Fixed the spelling of ``gauge`` again.
|
diff --git a/lib/fog/dynect/requests/dns/get_record.rb b/lib/fog/dynect/requests/dns/get_record.rb
index <HASH>..<HASH> 100644
--- a/lib/fog/dynect/requests/dns/get_record.rb
+++ b/lib/fog/dynect/requests/dns/get_record.rb
@@ -60,7 +60,7 @@ module Fog
records = zone[:records][type].select { |record| record[:fqdn] == fqdn }
response.body = {
"status" => "success",
- "data" => records.collect { |record| "/REST/ARecord/#{record[:zone][:zone]}/#{record[:fqdn]}/#{record[:record_id]}" },
+ "data" => records.collect { |record| "/REST/#{record[:type]}Record/#{record[:zone][:zone]}/#{record[:fqdn]}/#{record[:record_id]}" },
"job_id" => Fog::Dynect::Mock.job_id,
"msgs" => [{
"INFO" => "detail: Found #{records.size} record",
|
[dynect|dns] accidentally hardcoded the record type in the mocked data.
|
diff --git a/src/hamster/widgets/facttree.py b/src/hamster/widgets/facttree.py
index <HASH>..<HASH> 100644
--- a/src/hamster/widgets/facttree.py
+++ b/src/hamster/widgets/facttree.py
@@ -321,6 +321,7 @@ class FactTree(graphics.Scene, gtk.Scrollable):
return facts_ids.index(self.current_fact.id)
def on_mouse_down(self, scene, event):
+ self.on_mouse_move(None, event)
self.grab_focus()
if self.hover_fact:
if self.hover_fact == self.current_fact:
|
call on_mouse_move in on_mouse_down
otherwise the hover information is sometimes not up to date
|
diff --git a/sling/core/commons/src/main/java/com/composum/sling/clientlibs/service/DefaultClientlibService.java b/sling/core/commons/src/main/java/com/composum/sling/clientlibs/service/DefaultClientlibService.java
index <HASH>..<HASH> 100644
--- a/sling/core/commons/src/main/java/com/composum/sling/clientlibs/service/DefaultClientlibService.java
+++ b/sling/core/commons/src/main/java/com/composum/sling/clientlibs/service/DefaultClientlibService.java
@@ -754,7 +754,7 @@ public class DefaultClientlibService implements ClientlibService {
} else if (new FileHandle(resourceAsAdmin).isValid() && !new FileHandle(resourceAsUser).isValid()) {
buf.append("ERROR: Content resource not readable: ").append(resourceAsAdmin.getPath()).append("\n");
}
- } else {
+ } else if (!resourceFolder.getOptional()) {
buf.append("ERROR: can't find element ").append(ref.path)
.append(" of resource folder ").append(resourceFolder.resource.getPath()).append("\n");
}
|
CMP-<I> Don't present missing optional resources as error
|
diff --git a/dclab/rtdc_dataset/fmt_tdms/naming.py b/dclab/rtdc_dataset/fmt_tdms/naming.py
index <HASH>..<HASH> 100644
--- a/dclab/rtdc_dataset/fmt_tdms/naming.py
+++ b/dclab/rtdc_dataset/fmt_tdms/naming.py
@@ -35,6 +35,8 @@ dclab2tdms = {
"pos_y": "y",
"size_x": "ax2",
"size_y": "ax1",
+ "temp": "temp",
+ "amb_temp": "amb_temp",
}
# Add lower-case userdef features
|
Update naming.py
Add keys for ambient and sample temperature during measurement
|
diff --git a/core/src/main/java/hudson/util/AtomicFileWriter.java b/core/src/main/java/hudson/util/AtomicFileWriter.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/hudson/util/AtomicFileWriter.java
+++ b/core/src/main/java/hudson/util/AtomicFileWriter.java
@@ -149,7 +149,7 @@ public class AtomicFileWriter extends Writer {
integrityOnClose = false;
}
- core = new FileChannelWriter(tmpPath, charset, integrityOnFlush, integrityOnClose, StandardOpenOption.WRITE);
+ core = new FileChannelWriter(tmpPath, charset, integrityOnFlush, integrityOnClose, StandardOpenOption.WRITE, StandardOpenOption.CREATE);
}
@Override
|
Fix JENKINS-<I>
Add StandardOpenOption.CREATE flag to create FileChannelWriter to avoid full fs flush and 5sec log operation on creating empty file with CephFS as a storage
|
diff --git a/hammer.js b/hammer.js
index <HASH>..<HASH> 100644
--- a/hammer.js
+++ b/hammer.js
@@ -25,16 +25,16 @@ function HammerPlugin(game, opts) {
};
HammerPlugin.prototype.enable = function() {
- this.registry.registerItem('hammerIron', {
+ this.registry.registerItem('hammer', {
itemTexture: 'items/iron_pickaxe', // TODO
- displayName: 'Iron Hammer',
+ displayName: 'Hammer',
toolClass: 'pickaxe',
});
if (this.recipes) {
this.recipes.registerPositional([
['ingotIron', 'ingotIron', 'ingotIron'],
['ingotIron', 'stick', 'ingotIron'],
- [undefined, 'stick', undefined]], ['hammerIron']);
+ [undefined, 'stick', undefined]], ['hammer']);
}
this.mine.on('break', this.break.bind(this));
};
@@ -55,7 +55,7 @@ var around = function(cb) {
HammerPlugin.prototype.break = function(target) {
var heldItem = this.hotbar.held();
- if (!heldItem || heldItem.item !== 'hammerIron') return;
+ if (!heldItem || heldItem.item !== 'hammer') return;
console.log(target);
around(function(dx, dy, dz) {
|
Rename item to just 'hammer' (drop iron)
|
diff --git a/esm-webpack-plugin.js b/esm-webpack-plugin.js
index <HASH>..<HASH> 100644
--- a/esm-webpack-plugin.js
+++ b/esm-webpack-plugin.js
@@ -52,6 +52,7 @@ function exportsForModule(module, libVar) {
exports += `export default ${libVar};\nexport { ${libVar} };\n`
}
return `
+${libVar} === undefined && ${exports.length > 0 && namedExports.length > 0} && console.error('esm-webpack-plugin: nothing exported!');
${exports}${
namedExports.length ?
`\nexport {\n${namedExports.join(",\n")}\n}` :
|
Add output console error code for when no exports are exposed
|
diff --git a/lang/en_utf8/form.php b/lang/en_utf8/form.php
index <HASH>..<HASH> 100644
--- a/lang/en_utf8/form.php
+++ b/lang/en_utf8/form.php
@@ -15,7 +15,7 @@ $string['err_rangelength']='You must enter between {$a->format[0]} and {$a->form
$string['err_required']='You must supply a value here.';
$string['nomethodforaddinghelpbutton'] = 'There is no method for adding a help button to form element $a->name (class $a->classname)';
$string['nonexistentformelements'] = 'Trying to add help buttons to nonexistent form elements : $a';
-$string['requiredelement'] = 'Required field.';
+$string['requiredelement'] = 'Required field';
$string['general'] = 'General Settings';
$string['modstandardels']='Common Module Settings';
$string['miscellaneoussettings']='Miscellaneous Settings';
|
MDL-<I> Remove dot from "Required field." string
|
diff --git a/pandas/core/frame.py b/pandas/core/frame.py
index <HASH>..<HASH> 100644
--- a/pandas/core/frame.py
+++ b/pandas/core/frame.py
@@ -8325,7 +8325,6 @@ Wild 185.0
result = result.iloc[0].rename(None)
return result
- data = self
if numeric_only is None:
data = self
values = data.values
|
CLN: Remove unused assignment (#<I>)
|
diff --git a/activerecord/lib/active_record/tasks/database_tasks.rb b/activerecord/lib/active_record/tasks/database_tasks.rb
index <HASH>..<HASH> 100644
--- a/activerecord/lib/active_record/tasks/database_tasks.rb
+++ b/activerecord/lib/active_record/tasks/database_tasks.rb
@@ -78,7 +78,7 @@ module ActiveRecord
each_current_configuration(environment) { |configuration|
create configuration
}
- ActiveRecord::Base.establish_connection environment
+ ActiveRecord::Base.establish_connection(environment.to_sym)
end
def drop(*arguments)
|
Cast env to symbol, fixes deprecation warning
Warning:
DEPRECATION WARNING: Passing a string to ActiveRecord::Base.establish_connection for a configuration lookup is deprecated, please pass a symbol (:development) instead.
|
diff --git a/src/utils/processing/get-convertible-texture-ids.js b/src/utils/processing/get-convertible-texture-ids.js
index <HASH>..<HASH> 100644
--- a/src/utils/processing/get-convertible-texture-ids.js
+++ b/src/utils/processing/get-convertible-texture-ids.js
@@ -8,7 +8,16 @@ export default function getConvertibleTextureKeys(storageId) {
var url = getUrlFromStorageId(storageId)
return loadData3d(url)
- .then(getTextureKeys)
+ .then(function(data3d) {
+
+ return getTextureKeys(data3d, {
+ filter: function (storageId, type, format, material, data3d) {
+ // use source maps only
+ return format === 'source' ? storageId : false
+ }
+ })
+
+ })
.then(function(textures) {
return textures.map(getStorageIdFromUrl)
})
|
filter texture keys to include only source maps
|
diff --git a/lib/omnibus/whitelist.rb b/lib/omnibus/whitelist.rb
index <HASH>..<HASH> 100644
--- a/lib/omnibus/whitelist.rb
+++ b/lib/omnibus/whitelist.rb
@@ -152,6 +152,7 @@ MAC_WHITELIST_LIBS = [
/Foundation/,
/IOKit$/,
/Tk$/,
+ /libbrotlidec\.1\.dylib/,
/libutil\.dylib/,
/libffi\.dylib/,
/libncurses\.5\.4\.dylib/,
|
Fix mac_x-<I> failure for chef-workstation
|
diff --git a/tools/builder/rollup.js b/tools/builder/rollup.js
index <HASH>..<HASH> 100644
--- a/tools/builder/rollup.js
+++ b/tools/builder/rollup.js
@@ -314,6 +314,7 @@ async function createCompat(name) {
{
loose: true,
useBuiltIns: 'entry',
+ corejs: 3,
modules: false,
shippedProposals: true,
targets: compatTarget,
|
mute babel warning during compat build
|
diff --git a/components/place-under-ng/place-under-ng.js b/components/place-under-ng/place-under-ng.js
index <HASH>..<HASH> 100644
--- a/components/place-under-ng/place-under-ng.js
+++ b/components/place-under-ng/place-under-ng.js
@@ -87,7 +87,7 @@ const module = angular.module('Ring.place-under', []);
* rg-place-under=".some-selector" = selector to point target element
* place-top-offset="1" = offset in pixels
*/
-module.directive('rgPlaceUnder', function ($timeout, getClosestElementWithCommonParent) {
+module.directive('rgPlaceUnder', function ($window, getClosestElementWithCommonParent) {
const DEBOUNCE_INTERVAL = 10;
const HEIGHT_CHECK_INTERVAL = 50;
@@ -110,7 +110,7 @@ module.directive('rgPlaceUnder', function ($timeout, getClosestElementWithCommon
function waitForNonZeroHeight(element) {
return new Promise(resolve => {
function checkElementHeight() {
- element.offsetHeight === 0 ? $timeout(checkElementHeight, HEIGHT_CHECK_INTERVAL) : resolve();
+ element.offsetHeight === 0 ? $window.setTimeout(checkElementHeight, HEIGHT_CHECK_INTERVAL) : resolve();
}
checkElementHeight();
|
JPS-<I> use native setTimeout because we don't want to trigger digest while just checking element height
Former-commit-id: 9c1c<I>a<I>b<I>a<I>f<I>da0d<I>fe<I>e4
|
diff --git a/lib/fastlane/runner.rb b/lib/fastlane/runner.rb
index <HASH>..<HASH> 100644
--- a/lib/fastlane/runner.rb
+++ b/lib/fastlane/runner.rb
@@ -8,7 +8,8 @@ module Fastlane
return_val = nil
- Dir.chdir(Fastlane::FastlaneFolder.path || Dir.pwd) do # the file is located in the fastlane folder
+ path_to_use = Fastlane::FastlaneFolder.path || Dir.pwd
+ Dir.chdir(path_to_use) do # the file is located in the fastlane folder
@before_all.call(key) if @before_all
return_val = nil
@@ -24,7 +25,9 @@ module Fastlane
return return_val
rescue => ex
- @error.call(key, ex) if @error # notify the block
+ Dir.chdir(path_to_use) do
+ @error.call(key, ex) if @error # notify the block
+ end
raise ex
end
|
Fixed problem with error block running in the wrong folder context
|
diff --git a/src/VuFindCode/ISBN.php b/src/VuFindCode/ISBN.php
index <HASH>..<HASH> 100644
--- a/src/VuFindCode/ISBN.php
+++ b/src/VuFindCode/ISBN.php
@@ -134,7 +134,16 @@ class ISBN
*/
public static function normalizeISBN($raw)
{
- return preg_replace('/[^0-9X]/', '', strtoupper($raw));
+ // First strip out illegal characters:
+ $pass1 = preg_replace('/[^0-9X]/', '', strtoupper($raw));
+ if (strlen($pass1) < 2) {
+ return $pass1;
+ }
+
+ // Now make sure we only have an X at the end:
+ $check = substr($pass1, -1);
+ $isbn = substr($pass1, 0, strlen($pass1) - 1);
+ return preg_replace('/[^0-9]/', '', $isbn) . $check;
}
/**
|
Clean inappropriately-positioned X characters.
|
diff --git a/test_apps/test_app/test/ens_spec.js b/test_apps/test_app/test/ens_spec.js
index <HASH>..<HASH> 100644
--- a/test_apps/test_app/test/ens_spec.js
+++ b/test_apps/test_app/test/ens_spec.js
@@ -17,22 +17,28 @@ config({
"args": ["$ENSRegistry", rootNode],
"onDeploy": [
`ENSRegistry.methods.setOwner('${rootNode}', web3.eth.defaultAccount).send().then(() => {
- ENSRegistry.methods.setResolver('${rootNode}', "$Resolver").send();
- Resolver.methods.setAddr('${rootNode}', '${address}').send();
- })`
+ ENSRegistry.methods.setResolver('${rootNode}', "$Resolver").send();
+ Resolver.methods.setAddr('${rootNode}', '${address}').send().then(() => {
+ global.ensTestReady = true;
+ });
+ });`
]
}
}
});
contract("ENS", function () {
- this.timeout(0);
+ this.timeout(1000);
before(function (done) {
// Wait for onDeploy to finish
- setTimeout(function () {
+ const wait = setInterval(() => {
+ if (!global.ensTestReady) {
+ return;
+ }
+ clearInterval(wait);
done();
- }, 500);
+ });
});
it("should have registered embark.eth", async function () {
|
use setInterval to wait for deploy complete
|
diff --git a/lib/cache/get.js b/lib/cache/get.js
index <HASH>..<HASH> 100644
--- a/lib/cache/get.js
+++ b/lib/cache/get.js
@@ -4,7 +4,7 @@ module.exports = function (cache, type, index) {
var group = cache[type];
var cached = group.items[index];
if (cached && cached.time) {
- if (group.permanent) {
+ if (!group.permanent) {
var passed = Date.now() / 1000 - cached.time;
if (passed > group.expire) {
return false;
|
Fix
Well... apparently the cache was never really enabled
Oops
|
diff --git a/src/UnderConstructionServiceProvider.php b/src/UnderConstructionServiceProvider.php
index <HASH>..<HASH> 100644
--- a/src/UnderConstructionServiceProvider.php
+++ b/src/UnderConstructionServiceProvider.php
@@ -26,7 +26,7 @@ class UnderConstructionServiceProvider extends ServiceProvider
$this->commands('LarsJanssen\UnderConstruction\Commands\SetCodeCommand');
$this->mergeConfigFrom(__DIR__.'/../config/under-construction.php', 'under-construction');
- $this->app->bind('TransFormer', function ($app) {
+ $this->app->bind('TransFormer', function($app) {
return new TransFormer();
});
@@ -38,7 +38,7 @@ class UnderConstructionServiceProvider extends ServiceProvider
],
];
- $this->getRouter()->group($routeConfig, function ($router) {
+ $this->getRouter()->group($routeConfig, function($router) {
$router->post('check', [
'uses' => 'CodeController@check',
'as' => 'underconstruction.check',
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on <URL>
|
diff --git a/source/Application/Controller/Admin/SystemInfoController.php b/source/Application/Controller/Admin/SystemInfoController.php
index <HASH>..<HASH> 100644
--- a/source/Application/Controller/Admin/SystemInfoController.php
+++ b/source/Application/Controller/Admin/SystemInfoController.php
@@ -61,8 +61,7 @@ class SystemInfoController extends \OxidEsales\Eshop\Application\Controller\Admi
echo("<br><br>");
phpinfo();
- $sMessage = ob_get_contents();
- ob_end_clean();
+ $sMessage = ob_get_clean();
\OxidEsales\Eshop\Core\Registry::getUtils()->showMessageAndExit($sMessage);
} else {
|
OXDEV-<I> Output buffer usage improvement
|
diff --git a/src/Metrics/Subscription.php b/src/Metrics/Subscription.php
index <HASH>..<HASH> 100644
--- a/src/Metrics/Subscription.php
+++ b/src/Metrics/Subscription.php
@@ -23,6 +23,7 @@ class Subscription extends AbstractModel
{
protected $id;
+ protected $external_id;
protected $plan;
protected $quantity;
protected $mrr;
|
Support external_id on Metrics Subscriptions
|
diff --git a/javascript/UploadField.js b/javascript/UploadField.js
index <HASH>..<HASH> 100644
--- a/javascript/UploadField.js
+++ b/javascript/UploadField.js
@@ -102,10 +102,13 @@
this.fileupload($.extend(true,
{
formData: function(form) {
-
+ var idVal = $(form).find(':input[name=ID]').val();
+ if(!idVal) {
+ idVal = 0;
+ }
return [
{name: 'SecurityID', value: $(form).find(':input[name=SecurityID]').val()},
- {name: 'ID', value: $(form).find(':input[name=ID]').val()}
+ {name: 'ID', value: idVal}
];
},
errorMessages: {
|
BUGFIX: UploadField does not work on DataObjects
|
diff --git a/Tone/component/Envelope.js b/Tone/component/Envelope.js
index <HASH>..<HASH> 100644
--- a/Tone/component/Envelope.js
+++ b/Tone/component/Envelope.js
@@ -179,6 +179,18 @@ define(["Tone/core/Tone", "Tone/signal/Signal"], function(Tone){
};
/**
+ * trigger the attack and release after a sustain time
+ * @param {Tone.Time} duration the duration of the note
+ * @param {Tone.Time=} time the time of the attack
+ * @param {number=} velocity the velocity of the note
+ */
+ Tone.Envelope.prototype.triggerAttackRelease = function(duration, time, velocity) {
+ time = this.toSeconds(time);
+ this.triggerAttack(time, velocity);
+ this.triggerRelease(time + this.toSeconds(duration));
+ };
+
+ /**
* borrows the connect method from {@link Tone.Signal}
*
* @function
|
triggerAttackRelease on Envelope
|
diff --git a/lib/drizzlepac/adriz_versions.py b/lib/drizzlepac/adriz_versions.py
index <HASH>..<HASH> 100644
--- a/lib/drizzlepac/adriz_versions.py
+++ b/lib/drizzlepac/adriz_versions.py
@@ -10,4 +10,4 @@ else:
__version__ = '1.0.0'
__full_version__ = __version__+sversion
-__vdate__ = '25-May-2012'
+__vdate__ = '30-May-2012'
|
Update version date for drizzlepac to reflect change made to support OPUS pipeline operations; specifically, static mask filenames now partially randomly generated.
git-svn-id: <URL>
|
diff --git a/lib/arbetsformedlingen/api/results/ad_result.rb b/lib/arbetsformedlingen/api/results/ad_result.rb
index <HASH>..<HASH> 100644
--- a/lib/arbetsformedlingen/api/results/ad_result.rb
+++ b/lib/arbetsformedlingen/api/results/ad_result.rb
@@ -7,6 +7,8 @@ module Arbetsformedlingen
# @param [API::Response] response
# @return [Values::Ad]
def self.build(response)
+ return build_empty(response) unless response.success?
+
response_data = response.json
data = response_data.fetch('platsannons')
@@ -35,6 +37,10 @@ module Arbetsformedlingen
# private
+ def self.build_empty(response)
+ Values::Ad.new(response: response)
+ end
+
def self.build_terms(data)
Values::Terms.new(
duration: data.fetch('varaktighet'),
|
Return empty Values::Ad object if response is not success
|
diff --git a/Testing/Fakes/NotificationFake.php b/Testing/Fakes/NotificationFake.php
index <HASH>..<HASH> 100644
--- a/Testing/Fakes/NotificationFake.php
+++ b/Testing/Fakes/NotificationFake.php
@@ -232,9 +232,24 @@ class NotificationFake implements NotificationDispatcher, NotificationFactory
$notification->id = Str::uuid()->toString();
}
+ $notifiableChannels = $channels ?: $notification->via($notifiable);
+
+ if (method_exists($notification, 'shouldSend')) {
+ $notifiableChannels = array_filter(
+ $notifiableChannels,
+ function ($channel) use ($notification, $notifiable) {
+ return $notification->shouldSend($notifiable, $channel) !== false;
+ }
+ );
+
+ if (empty($notifiableChannels)) {
+ continue;
+ }
+ }
+
$this->notifications[get_class($notifiable)][$notifiable->getKey()][get_class($notification)][] = [
'notification' => $notification,
- 'channels' => $channels ?: $notification->via($notifiable),
+ 'channels' => $notifiableChannels,
'notifiable' => $notifiable,
'locale' => $notification->locale ?? $this->locale ?? value(function () use ($notifiable) {
if ($notifiable instanceof HasLocalePreference) {
|
[8.x] Notification assertions respect `shouldSend` method on notification (#<I>)
* added `shouldSend` support to notification assertions
* changed count to empty
|
diff --git a/polyaxon_schemas/polyaxonfile/specification.py b/polyaxon_schemas/polyaxonfile/specification.py
index <HASH>..<HASH> 100644
--- a/polyaxon_schemas/polyaxonfile/specification.py
+++ b/polyaxon_schemas/polyaxonfile/specification.py
@@ -389,8 +389,13 @@ class GroupSpecification(BaseSpecification):
@cached_property
def experiments_def(self):
- concurrent_experiments = self.settings.concurrent_experiments if self.settings else 1
- return self.matrix_space, concurrent_experiments
+ if self.settings:
+ concurrent_experiments = self.settings.concurrent_experiments
+ search_method = self.settings.search_method
+ else:
+ concurrent_experiments = 1
+ search_method = None
+ return self.matrix_space, concurrent_experiments, search_method
@cached_property
def matrix_declarations(self):
|
Add search method to experiment_def
|
diff --git a/docker/examples/stats/stats.go b/docker/examples/stats/stats.go
index <HASH>..<HASH> 100644
--- a/docker/examples/stats/stats.go
+++ b/docker/examples/stats/stats.go
@@ -11,7 +11,8 @@ import (
// Retrieve global email statistics
// GET /stats
-func Retrieveglobalemailstatistics() {
+// RetrieveGlobalEmailStatistics demonstrates how to retrieve e-mail statistics.
+func RetrieveGlobalEmailStatistics() {
apiKey := os.Getenv("SENDGRID_API_KEY")
host := "http://localhost:4010"
request := sendgrid.GetRequest(apiKey, "/v3/stats", host)
|
convert to camelcase for readability and add godoc
|
diff --git a/h2o-core/src/main/java/water/H2O.java b/h2o-core/src/main/java/water/H2O.java
index <HASH>..<HASH> 100644
--- a/h2o-core/src/main/java/water/H2O.java
+++ b/h2o-core/src/main/java/water/H2O.java
@@ -681,7 +681,10 @@ final public class H2O {
StringBuilder ua = new StringBuilder();
if (source.contains("Safari")) {
- ua.append("Safari");
+ ua.append("safari");
+ }
+ else if (source.contains("Python")) {
+ ua.append("python");
}
else {
for (int i = 0; i < source.length(); i++) {
|
Do a pretty parsing of python user agent for calc of model name.
|
diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentInner.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentInner.java
index <HASH>..<HASH> 100644
--- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentInner.java
+++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentInner.java
@@ -18,7 +18,7 @@ public class DeploymentInner {
/**
* The deployment properties.
*/
- @JsonProperty(value = "properties")
+ @JsonProperty(value = "properties", required = true)
private DeploymentProperties properties;
/**
|
Regenerated Resources (#<I>)
|
diff --git a/lib/Github/Api/Organization/Members.php b/lib/Github/Api/Organization/Members.php
index <HASH>..<HASH> 100644
--- a/lib/Github/Api/Organization/Members.php
+++ b/lib/Github/Api/Organization/Members.php
@@ -10,13 +10,20 @@ use Github\Api\AbstractApi;
*/
class Members extends AbstractApi
{
- public function all($organization, $type = null)
+ public function all($organization, $type = null, $filter = 'all')
{
+ $parameters = array();
+ $path = 'orgs/'.rawurlencode($organization).'/';
if (null === $type) {
- return $this->get('orgs/'.rawurlencode($organization).'/members');
+ $path .= 'members';
+ if (null !== $filter) {
+ $parameters['filter'] = $filter;
+ }
+ } else {
+ $path .= 'public_members';
}
- return $this->get('orgs/'.rawurlencode($organization).'/public_members');
+ return $this->get($path, $parameters);
}
public function show($organization, $username)
|
Add support for filtering organisation members by 2FA status
|
diff --git a/javaobj.py b/javaobj.py
index <HASH>..<HASH> 100644
--- a/javaobj.py
+++ b/javaobj.py
@@ -315,6 +315,9 @@ class JavaString(str):
"""
Represents a Java String
"""
+ def __hash__(self):
+ return str.__hash__(self)
+
def __eq__(self, other):
if not isinstance(other, str):
return False
@@ -1421,7 +1424,7 @@ class DefaultObjectTransformer(object):
new_object = self.JavaMap()
java_object.copy(new_object)
- for i in range((len(java_object.annotations) - 1) / 2):
+ for i in range((len(java_object.annotations) - 1) // 2):
new_object[java_object.annotations[i * 2 + 1]] = \
java_object.annotations[i * 2 + 2]
|
Small corrections due to tests
- JavaString is now hashable
- Use an integer-division reading annotations
|
diff --git a/shaderdef/stage.py b/shaderdef/stage.py
index <HASH>..<HASH> 100644
--- a/shaderdef/stage.py
+++ b/shaderdef/stage.py
@@ -43,7 +43,7 @@ class Stage(object):
self._return_type = get_output_interface(func)
def declare_inputs(self, lines):
- for name, param_type in self._params.items():
+ for name, param_type in sorted(self._params.items()):
# TODO(nicholasbishop): dedup with return type
origin = getattr(param_type, '__origin__', None)
array = None
|
Add sorting to make output deterministic
|
diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index <HASH>..<HASH> 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -21,7 +21,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
autoSelfClosers: {'area': true, 'base': true, 'br': true, 'col': true, 'command': true,
'embed': true, 'frame': true, 'hr': true, 'img': true, 'input': true,
'keygen': true, 'link': true, 'meta': true, 'param': true, 'source': true,
- 'track': true, 'wbr': true},
+ 'track': true, 'wbr': true, 'menuitem': true},
implicitlyClosed: {'dd': true, 'li': true, 'optgroup': true, 'option': true, 'p': true,
'rp': true, 'rt': true, 'tbody': true, 'td': true, 'tfoot': true,
'th': true, 'tr': true},
|
[xml mode] Mark <menuitem> as self-closing tag
Closes #<I>
|
diff --git a/src/Library/Usage.php b/src/Library/Usage.php
index <HASH>..<HASH> 100644
--- a/src/Library/Usage.php
+++ b/src/Library/Usage.php
@@ -36,7 +36,7 @@ class Usage {
* @access private
* @var string
*/
- private $gaId = 'UA-1501988-42';
+ private $gaId;
/**
* An array of page prefixes to load usage tracking on.
@@ -60,6 +60,8 @@ class Usage {
Filter::add( $this );
self::$filtersAdded = true;
}
+
+ $this->gaId = Configs::get( 'gaId' );
}
/**
diff --git a/src/library.global.php b/src/library.global.php
index <HASH>..<HASH> 100644
--- a/src/library.global.php
+++ b/src/library.global.php
@@ -136,4 +136,8 @@ return array(
'priority' => 'core',
),
),
+
+
+ // Google Analytics ID, used by the Usage class.
+ 'gaId' => 'UA-1501988-42',
);
|
Move ga id to config file
|
diff --git a/lib/sbsm/request.rb b/lib/sbsm/request.rb
index <HASH>..<HASH> 100644
--- a/lib/sbsm/request.rb
+++ b/lib/sbsm/request.rb
@@ -80,6 +80,9 @@ module SBSM
'drbsession_uri' => @drb_uri,
'session_path' => '/',
}
+ if unparsed_uri =~ /pointer/
+ return
+ end
if(is_crawler?)
sleep 2.0
sid = [ENV['DEFAULT_FLAVOR'], @cgi.params['language'], @cgi.user_agent].join('-')
|
Drop any request containing pointer in it
|
diff --git a/lib/environment.js b/lib/environment.js
index <HASH>..<HASH> 100644
--- a/lib/environment.js
+++ b/lib/environment.js
@@ -13,6 +13,8 @@ module.exports = {
string_decoder: {preferBuiltin: true, glob: true},
buffer: {expose: 'buffer', glob: true},
url: {preferBuiltin: true, glob: true},
+ punycode: {preferBuiltin: true, glob: true},
+ querystring: {preferBuiltin: true, glob: true},
'liquid-json': {expose: 'json', glob: true},
'crypto-js': {glob: true},
atob: {glob: true},
|
Added punycode and querystring to the sandbox
|
diff --git a/gnotty/server.py b/gnotty/server.py
index <HASH>..<HASH> 100755
--- a/gnotty/server.py
+++ b/gnotty/server.py
@@ -159,7 +159,8 @@ def run():
print "Could not kill any daemons"
return
if settings.DAEMON:
- kill(pid_file)
+ if kill(pid_file):
+ print "Running daemon killed"
daemonize(pid_file)
serve_forever()
|
Show a message when a current daemon is killed by starting a new one.
|
diff --git a/spyder/plugins/projects/projecttypes/__init__.py b/spyder/plugins/projects/projecttypes/__init__.py
index <HASH>..<HASH> 100644
--- a/spyder/plugins/projects/projecttypes/__init__.py
+++ b/spyder/plugins/projects/projecttypes/__init__.py
@@ -61,12 +61,16 @@ class BaseProject(object):
def set_recent_files(self, recent_files):
"""Set a list of files opened by the project."""
- for recent_file in recent_files[:]:
- if not os.path.isfile(recent_file):
- recent_files.remove(recent_file)
- recent_files = [os.path.relpath(recent_file, self.root_path)
- for recent_file in recent_files]
- files = list(OrderedDict.fromkeys(recent_files))
+ processed_recent_files = []
+ for recent_file in recent_files:
+ if os.path.isfile(recent_file):
+ try:
+ relative_recent_file = os.path.relpath(
+ recent_file, self.root_path)
+ processed_recent_files.append(relative_recent_file)
+ except ValueError:
+ processed_recent_files.append(recent_file)
+ files = list(OrderedDict.fromkeys(processed_recent_files))
self.config.set('main', 'recent_files', files)
def get_recent_files(self):
|
Projects: Handle relative paths for recent files on different mounts
|
diff --git a/test/integration/index.js b/test/integration/index.js
index <HASH>..<HASH> 100644
--- a/test/integration/index.js
+++ b/test/integration/index.js
@@ -204,7 +204,7 @@ describe('Stream client', function () {
});
it('add activity', function (done) {
- var activity = {'actor': 1, 'verb': 'add', 'object': 1};
+ var activity = {'actor': 'test-various:characters', 'verb': 'add', 'object': 1, 'tweet': 'hello world'};
function get(error, response, body) {
var activityId = body['id'];
user1.get({'limit': 1}, function(error, response, body) {
|
a bit more extensive testing on add activity
|
diff --git a/src/components/chips/Chips.js b/src/components/chips/Chips.js
index <HASH>..<HASH> 100644
--- a/src/components/chips/Chips.js
+++ b/src/components/chips/Chips.js
@@ -118,18 +118,19 @@ export class Chips extends Component {
onKeyDown(event) {
const inputValue = event.target.value;
+ const values = this.props.value || [];
switch(event.which) {
//backspace
case 8:
- if (this.inputElement.value.length === 0 && this.props.value && this.props.value.length > 0) {
- this.removeItem(event, this.props.value.length - 1);
+ if (this.inputElement.value.length === 0 && values.length > 0) {
+ this.removeItem(event, values.length - 1);
}
break;
//enter
case 13:
- if (inputValue && inputValue.trim().length && (!this.props.max || this.props.max > this.props.value.length)) {
+ if (inputValue && inputValue.trim().length && (!this.props.max || this.props.max > values.length)) {
this.addItem(event, inputValue, true);
}
break;
|
Fixed #<I> - Chips is not working when the initial value sets 'null'
|
diff --git a/jlib-core/src/main/java/org/jlib/core/collection/ContainsKeyCacheMap.java b/jlib-core/src/main/java/org/jlib/core/collection/ContainsKeyCacheMap.java
index <HASH>..<HASH> 100644
--- a/jlib-core/src/main/java/org/jlib/core/collection/ContainsKeyCacheMap.java
+++ b/jlib-core/src/main/java/org/jlib/core/collection/ContainsKeyCacheMap.java
@@ -65,7 +65,6 @@ import com.google.common.collect.ForwardingMap;
* // dicouraged by clean coders
* value = map.get(key);
* if (value != null) {
- * value = map.get(key);
* // commands with value
* }
* else {
|
using Guava ForwardingMap instead of DelegatingMap
|
diff --git a/salt/fileclient.py b/salt/fileclient.py
index <HASH>..<HASH> 100644
--- a/salt/fileclient.py
+++ b/salt/fileclient.py
@@ -228,6 +228,7 @@ class Client(object):
# go through the list of all files finding ones that are in
# the target directory and caching them
for fn_ in self.file_list(saltenv):
+ fn_ = salt.utils.locales.sdecode(fn_)
if fn_.strip() and fn_.startswith(path):
if salt.utils.check_include_exclude(
fn_, include_pat, exclude_pat):
diff --git a/salt/fileserver/__init__.py b/salt/fileserver/__init__.py
index <HASH>..<HASH> 100644
--- a/salt/fileserver/__init__.py
+++ b/salt/fileserver/__init__.py
@@ -551,7 +551,8 @@ class Fileserver(object):
if 'path' not in load or 'saltenv' not in load:
return ''
- fnd = self.find_file(load['path'], load['saltenv'])
+ fnd = self.find_file(salt.utils.locales.sdecode(load['path']),
+ load['saltenv'])
if not fnd.get('back'):
return ''
fstr = '{0}.file_hash'.format(fnd['back'])
|
Decode unicode names in fileclient/server
Closes #<I>
|
diff --git a/lib/nominatim/search.rb b/lib/nominatim/search.rb
index <HASH>..<HASH> 100644
--- a/lib/nominatim/search.rb
+++ b/lib/nominatim/search.rb
@@ -149,5 +149,23 @@ module Nominatim
self
end
+ # Limit results to certain type, instead of trying to match
+ # all possible matches.
+ #
+ # Possible values:
+ # - settlement
+ # - country
+ # - city
+ # - state
+ #
+ # This feature is not in official Nominatim documentation.
+ #
+ # @param type Type to restrict to
+ # @return [Nominatim::Search]
+ def featuretype(type)
+ @criteria[:featuretype] = type
+ self
+ end
+
end
end
|
Added undocumented criteria featuretype to Search.
This allows restriction by certain area feature, like city,
so results from another city specified in the query won’t
be mixed to the result. For some reason this feature is not
documented in public API doc of Nominatim.
|
diff --git a/udiskie/prompt.py b/udiskie/prompt.py
index <HASH>..<HASH> 100644
--- a/udiskie/prompt.py
+++ b/udiskie/prompt.py
@@ -146,6 +146,7 @@ def get_password_gui(device):
return None
+@Coroutine.from_generator_function
def get_password_tty(device):
"""Get the password to unlock a device from terminal."""
# TODO: make this a TRUE async
|
Fix bug with get_password_tty
|
diff --git a/datasette/cli.py b/datasette/cli.py
index <HASH>..<HASH> 100644
--- a/datasette/cli.py
+++ b/datasette/cli.py
@@ -550,7 +550,9 @@ def serve(
)
# De-duplicate files so 'datasette db.db db.db' only attaches one /db
- files = list(dict.fromkeys(files))
+ files_seen = set()
+ deduped_files = [f for f in files if f not in files_seen and not files_seen.add(f)]
+ files = deduped_files
try:
ds = Datasette(files, **kwargs)
|
Use de-dupe idiom that works with Python <I>, refs #<I>
|
diff --git a/demo.py b/demo.py
index <HASH>..<HASH> 100755
--- a/demo.py
+++ b/demo.py
@@ -2,6 +2,7 @@
import argparse
import re
+import logging
from miflora.miflora_poller import MiFloraPoller, \
MI_CONDUCTIVITY, MI_MOISTURE, MI_LIGHT, MI_TEMPERATURE, MI_BATTERY
@@ -18,6 +19,7 @@ def valid_miflora_mac(mac, pat=re.compile(r"C4:7C:8D:[0-9A-F]{2}:[0-9A-F]{2}:[0-
parser = argparse.ArgumentParser()
parser.add_argument('mac', type=valid_miflora_mac)
parser.add_argument('--backend', choices=['gatttool', 'bluepy'], default='gatttool')
+parser.add_argument('-v', '--verbose', action='store_const', const=True)
args = parser.parse_args()
backend = None
@@ -28,6 +30,9 @@ elif args.backend == 'bluepy':
else:
raise Exception('unknown backend: {}'.format(args.backend))
+if args.verbose:
+ logging.basicConfig(level=logging.DEBUG)
+
poller = MiFloraPoller(args.mac, backend)
print("Getting data from Mi Flora")
|
added "-v" flag to demo.py to print debug output to console. (#<I>)
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -168,6 +168,7 @@ def _filter_requirements(lines_iter, filter_names=None,
REQ_UPPER_BOUNDS = {
'bcolz': '<1',
'pandas': '<0.19',
+ 'networkx': '<2.0',
}
|
MAINT: networkx 2 changes the behavior of out_degree
|
diff --git a/kconfiglib.py b/kconfiglib.py
index <HASH>..<HASH> 100644
--- a/kconfiglib.py
+++ b/kconfiglib.py
@@ -1381,6 +1381,11 @@ class Config(object):
def _eval_expr(self, expr):
"""Evaluates an expression and returns one of the tristate values "n",
"m" or "y"."""
+
+ # Handles e.g. an "x if y" condition where the "if y" part is missing.
+ if expr is None:
+ return "y"
+
res = self._eval_expr_2(expr)
if res == "m":
@@ -1395,9 +1400,6 @@ class Config(object):
return res
def _eval_expr_2(self, expr):
- if expr is None:
- return "y"
-
if isinstance(expr, Symbol):
# Non-bool/tristate symbols are always "n" in a tristate sense,
# regardless of their value
|
Move 'expr is None' check up to _eval_expr().
None should never appear as a subexpression.
|
diff --git a/niworkflows/reports/tests/test_core.py b/niworkflows/reports/tests/test_core.py
index <HASH>..<HASH> 100644
--- a/niworkflows/reports/tests/test_core.py
+++ b/niworkflows/reports/tests/test_core.py
@@ -214,3 +214,30 @@ def test_generated_reportlets(bids_sessions, ordering):
assert reportlets_num == expected_reportlets_num == out_figs
else:
assert reportlets_num < expected_reportlets_num == out_figs
+
+
+@pytest.mark.parametrize(
+ "subject_id,out_html", [
+ ('sub-01', 'sub-01.html'),
+ ('sub-sub1', 'sub-sub1.html'),
+ ('01', 'sub-01.html'),
+ ('sub1', 'sub-sub1.html'),
+ ]
+)
+def test_subject_id(tmp_path, subject_id, out_html):
+ reports = tmp_path / 'reports'
+ Path(
+ reports
+ / 'fmriprep'
+ / (subject_id if subject_id.startswith('sub-') else f'sub-{subject_id}')
+ ).mkdir(parents=True)
+
+ report = Report(
+ str(tmp_path),
+ 'myuniqueid',
+ reportlets_dir=reports,
+ subject_id=subject_id,
+ packagename='fmriprep',
+ )
+ assert report.subject_id[:4] != 'sub-'
+ assert report.out_filename == out_html
|
TST: add basic test to ensure subject ID is not stripped
|
diff --git a/google-cloud-debugger/test/google/cloud/debugger/backoff_test.rb b/google-cloud-debugger/test/google/cloud/debugger/backoff_test.rb
index <HASH>..<HASH> 100644
--- a/google-cloud-debugger/test/google/cloud/debugger/backoff_test.rb
+++ b/google-cloud-debugger/test/google/cloud/debugger/backoff_test.rb
@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+require "helper"
describe Google::Cloud::Debugger::Backoff do
let(:backoff) { Google::Cloud::Debugger::Backoff.new }
|
Fix intermittent debugger backoff test failures (#<I>)
|
diff --git a/telebot/handler_backends.py b/telebot/handler_backends.py
index <HASH>..<HASH> 100644
--- a/telebot/handler_backends.py
+++ b/telebot/handler_backends.py
@@ -5,7 +5,7 @@ import threading
from telebot import apihelper
-class HandlerBackend:
+class HandlerBackend(object):
"""
Class for saving (next step|reply) handlers
"""
|
Change class from new-style class to object class
|
diff --git a/spyder/plugins/editor/widgets/codeeditor.py b/spyder/plugins/editor/widgets/codeeditor.py
index <HASH>..<HASH> 100644
--- a/spyder/plugins/editor/widgets/codeeditor.py
+++ b/spyder/plugins/editor/widgets/codeeditor.py
@@ -1677,7 +1677,7 @@ class CodeEditor(TextEditBaseWidget):
data = block.userData()
if data and data.code_analysis:
for warning in data.code_analysis:
- warnings.append([warning[-1], block.blockNumber()])
+ warnings.append([warning[-1], block.blockNumber() + 1])
block = block.next()
return warnings
|
Editor: Fix line number of warning actions
|
diff --git a/ryu/app/simple_switch.py b/ryu/app/simple_switch.py
index <HASH>..<HASH> 100644
--- a/ryu/app/simple_switch.py
+++ b/ryu/app/simple_switch.py
@@ -84,7 +84,7 @@ class SimpleSwitch(app_manager.RyuApp):
def _port_status_handler(self, ev):
msg = ev.msg
reason = msg.reason
- port_no = msg.port_no
+ port_no = msg.desc.port_no
ofproto = msg.datapath.ofproto
if reason == ofproto.OFPPR_ADD:
|
simple_switch: fix port_status_handler
port_no is not a member of msg, but a member of msg.desc.
|
diff --git a/lib/nox-server.js b/lib/nox-server.js
index <HASH>..<HASH> 100644
--- a/lib/nox-server.js
+++ b/lib/nox-server.js
@@ -211,8 +211,6 @@ exports.nox = function(requirefun, cookiename, logfun, uglify) {
logfun('serving nox-client.js for ' + page.url + '\n');
- res.writeHead(200, { 'Content-Type': 'text/javascript', 'Cache-Control': 'no-cache' });
-
var result = [];
async.waterfall([
function(wfcb) {
@@ -323,13 +321,18 @@ exports.nox = function(requirefun, cookiename, logfun, uglify) {
wfcb();
},
function(wfcb) {
+ res.writeHead(200, { 'Content-Type': 'text/javascript',
+ 'Cache-Control': 'no-cache' });
res.end(result);
wfcb();
}
], function(err) {
- if( err )
+ if( err ) {
+ res.writeHead(500);
+ res.end();
logfun('error creating ' + page.url +
'/nox-client.js:' + err + '\n');
+ }
});
}
|
give <I> response in error cases
|
diff --git a/pkg/kube/client.go b/pkg/kube/client.go
index <HASH>..<HASH> 100644
--- a/pkg/kube/client.go
+++ b/pkg/kube/client.go
@@ -274,7 +274,8 @@ func (c *Client) Update(namespace string, originalReader, targetReader io.Reader
originalInfo := original.Get(info)
if originalInfo == nil {
- return fmt.Errorf("no resource with the name %q found", info.Name)
+ kind := info.Mapping.GroupVersionKind.Kind
+ return fmt.Errorf("no %s with the name %q found", kind, info.Name)
}
if err := updateResource(c, info, originalInfo.Object, force, recreate); err != nil {
|
Show kind in resource-not-found-in-release error
This error occures when resource is not found in helm release:
`Error: UPGRADE FAILED: no resource with the name "redis-cluster-sentinel" found`
Changed to:
`Error: UPGRADE FAILED: no ConfigMap with the name "redis-cluster-sentinel" found`
So now that resource can easily be found in cluster.
|
diff --git a/Filter/AssetsUrl.php b/Filter/AssetsUrl.php
index <HASH>..<HASH> 100644
--- a/Filter/AssetsUrl.php
+++ b/Filter/AssetsUrl.php
@@ -40,7 +40,7 @@ class AssetsUrl implements FilterInterface, HashableInterface
$fs = new Filesystem();
$resource = $matches['resource'];
- preg_match("/(\@{1,2})([A-Z][A-Za-z\_]*)/", $resource, $matches);
+ preg_match("/(\@{1,2})([A-Z][A-Za-z0-9\_\-]*)/", $resource, $matches);
if ($resource{1} == "@") {
$resource = substr($resource, 1);
@@ -72,7 +72,7 @@ class AssetsUrl implements FilterInterface, HashableInterface
return $resource;
};
- $pattern = "/(?P<resource>\@{1,2}[A-Za-z\_]+Bundle[A-Za-z\_\.\/\-]*)/";
+ $pattern = "/(?P<resource>\@{1,2}[A-Za-z\_]+Bundle[A-Za-z0-9\_\.\/\-]*)/";
$asset->setContent(preg_replace_callback($pattern, $callback, $content));
}
|
Fix in AssetsUrl - there was no support for numbers
|
diff --git a/system/rake-support/share/rails-template.rb b/system/rake-support/share/rails-template.rb
index <HASH>..<HASH> 100644
--- a/system/rake-support/share/rails-template.rb
+++ b/system/rake-support/share/rails-template.rb
@@ -27,7 +27,7 @@ else
initializer("session_store.rb") do
<<-INIT
# Configure the TorqueBox Servlet-based session store.
-# Provides for server-based, in-memory, cluster-compatible sessions.
+# Provides for server-based, in-memory, cluster-compatible sessions
#{app_const}.config.session_store TorqueBox::Session::ServletStore if defined?(TorqueBox::Session::ServletStore)
INIT
end
@@ -41,7 +41,7 @@ initializer("active_record_handle_async.rb") do
# end
#
# a_model_instance.background.another_method
-if defined?(TorqueBox::Messaging)
+if defined?(TorqueBox::Messaging) && defined?(ActiveRecord::Base)
require 'torquebox/messaging/embedded_tasks'
ActiveRecord::Base.send(:include, TorqueBox::Messaging::EmbeddedTasks )
end
|
Check for ActiveRecord::Base before trying to include EmbeddedTasks.
|
diff --git a/pirc522/__init__.py b/pirc522/__init__.py
index <HASH>..<HASH> 100644
--- a/pirc522/__init__.py
+++ b/pirc522/__init__.py
@@ -43,7 +43,7 @@ class RFID(object):
irq = threading.Event()
def __init__(self, bus=0, device=0, speed=1000000, pin_rst=22,
- pin_ce=0, pin_irq=18):
+ pin_ce=0, pin_irq=18, pin_mode=GPIO.BOARD):
self.pin_rst = pin_rst
self.pin_ce = pin_ce
self.pin_irq = pin_irq
@@ -52,7 +52,7 @@ class RFID(object):
self.spi.open(bus, device)
self.spi.max_speed_hz = speed
- GPIO.setmode(GPIO.BOARD)
+ GPIO.setmode(pin_mode)
GPIO.setup(pin_rst, GPIO.OUT)
GPIO.setup(pin_irq, GPIO.IN, pull_up_down=GPIO.PUD_UP)
GPIO.add_event_detect(pin_irq, GPIO.FALLING,
|
Variable GPIO.setmode
Let user decide which pinout should be used
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
setup(
name='pyshould',
description='Should style asserts based on pyhamcrest',
- version='0.4.0',
+ version='0.5.0',
url='https://github.com/drslump/pyshould',
author='Ivan -DrSlump- Montes',
author_email='drslump@pollinimini.net',
|
Upped version to <I>
|
diff --git a/src/Ingruz/Rest/Controllers/RestDingoController.php b/src/Ingruz/Rest/Controllers/RestDingoController.php
index <HASH>..<HASH> 100644
--- a/src/Ingruz/Rest/Controllers/RestDingoController.php
+++ b/src/Ingruz/Rest/Controllers/RestDingoController.php
@@ -134,7 +134,9 @@ class RestDingoController extends Controller implements RestControllerInterface
return $this->respondNotProcessable('Unable to delete the selected '.ucfirst($this->baseClass));
}
- return $this->baseClass.' deleted successfully';
+ $message = $this->baseClass.' deleted successfully';
+
+ return compact('message');
}
/**
|
Change response to DELETE requests in Dingo Controller
|
diff --git a/lib/daemon/runner.js b/lib/daemon/runner.js
index <HASH>..<HASH> 100644
--- a/lib/daemon/runner.js
+++ b/lib/daemon/runner.js
@@ -22,7 +22,7 @@ function Runner(conf) {
this.db_poll_stop = this._dbconn.listenTask(function(err, task) {
if (err) {
logger.debug("Runner: Error polling database:", err)
- this.stop(1);
+ that.stop(1);
}
// check default controller on a best effort basis
|
Fixed undefined this error in runner
|
diff --git a/base/db/migrate/20120621135650_add_comment_count_to_activity_object.rb b/base/db/migrate/20120621135650_add_comment_count_to_activity_object.rb
index <HASH>..<HASH> 100644
--- a/base/db/migrate/20120621135650_add_comment_count_to_activity_object.rb
+++ b/base/db/migrate/20120621135650_add_comment_count_to_activity_object.rb
@@ -6,7 +6,13 @@ class AddCommentCountToActivityObject < ActiveRecord::Migration
ActivityObject.reset_column_information
ActivityObject.all.each do |ao|
- ao.comment_count = Activity.includes(:activity_objects).where('activity_objects.object_type' => "Comment").where(:ancestry => [ao.activities.first.id]).size
+ parent_activity = ao.activities.first
+
+ # Actors have not parent activities
+ next if parent_activity.blank?
+
+ ao.comment_count = Activity.includes(:activity_objects).where('activity_objects.object_type' => "Comment").where(:ancestry => [parent_activity.id]).size
+
ao.save! if ao.comment_count > 0
end
|
Fix add_comment_count migration
Heads-up @rafaelgg
|
diff --git a/metadata.go b/metadata.go
index <HASH>..<HASH> 100644
--- a/metadata.go
+++ b/metadata.go
@@ -1050,7 +1050,7 @@ func (fm *ForceMetadata) MakeZip(files ForceMetadataFiles) (zipdata []byte, err
zipper := zip.NewWriter(zipfile)
for name, data := range files {
name = filepath.ToSlash(name)
- wr, err := zipper.Create(fmt.Sprintf("unpackaged%s%s", string(os.PathSeparator), name))
+ wr, err := zipper.Create(fmt.Sprintf("unpackaged/%s", name))
if err != nil {
return nil, err
}
|
Fix Zip File Creation on Windows
Use forward slash for paths to files added to the zip file being
deployed. Per the archive/zip documentation, Writer.Create only allows
forward slashes.
Fixes "No package.xml found" error when using `force push` on windows.
|
diff --git a/src/Traits/DateTimeTrait.php b/src/Traits/DateTimeTrait.php
index <HASH>..<HASH> 100755
--- a/src/Traits/DateTimeTrait.php
+++ b/src/Traits/DateTimeTrait.php
@@ -32,7 +32,7 @@ trait DateTimeTrait
*
* @return string
*/
- public function createdAt($timeAgo = false, $format = 'l jS \\of F Y'): string
+ public function createdAt($timeAgo = false, $format = 'd.m.Y'): string
{
return $timeAgo ? $this->getTimeAgo($this->created_at) : $this->created_at->format($format);
}
@@ -43,7 +43,7 @@ trait DateTimeTrait
*
* @return string
*/
- public function updatedAt($timeAgo = false, $format = 'l jS \\of F Y'): string
+ public function updatedAt($timeAgo = false, $format = 'd.m.Y'): string
{
return $timeAgo ? $this->getTimeAgo($this->updated_at) : $this->updated_at->format($format);
}
@@ -54,7 +54,7 @@ trait DateTimeTrait
*
* @return string
*/
- public function deletedAt($timeAgo = false, $format = 'l jS \\of F Y'): string
+ public function deletedAt($timeAgo = false, $format = 'd.m.Y'): string
{
return $timeAgo ? $this->getTimeAgo($this->deleted_at) : $this->deleted_at->format($format);
}
|
Use dmY as default date format
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -73,7 +73,7 @@ setup(name='b2handle',
'in the EUDAT project.'),
long_description=long_description,
classifiers=[
- 'Development Status :: 4 - Beta',
+ 'Development Status :: 5 - Production/Stable',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
|
Change development status classifier from beta to prod/stable
|
diff --git a/km3pipe/db.py b/km3pipe/db.py
index <HASH>..<HASH> 100644
--- a/km3pipe/db.py
+++ b/km3pipe/db.py
@@ -329,10 +329,7 @@ class DBManager(object):
cookie_str = str(cookie, 'utf-8') # Python 3
except TypeError:
cookie_str = str(cookie) # Python 2
- print("The following permanent session cookie has been stored in "
- "~/.km3net and will be used from now on to authenticate with "
- "the KM3NeT Oracle DB:\n\n"
- " {0}\n\n".format(cookie_str))
+ log.debug("Session cookie: {0}".format(cookie_str))
config.set('DB', 'session_cookie', cookie_str)
self.restore_ression(cookie)
|
log.debug instead of print. we dont want to confuse the user
|
diff --git a/lib/i18n/tasks/logging.rb b/lib/i18n/tasks/logging.rb
index <HASH>..<HASH> 100644
--- a/lib/i18n/tasks/logging.rb
+++ b/lib/i18n/tasks/logging.rb
@@ -25,6 +25,9 @@ module I18n::Tasks::Logging
def log_stderr(*args)
MUTEX.synchronize do
+ # 1. We don't want output from different threads to get intermixed.
+ # 2. StringIO is currently not thread-safe (blows up) on JRuby:
+ # https://github.com/jruby/jruby/issues/4417
$stderr.puts(*args)
end
end
|
Explain on why the mutex is needed in logging.rb
Reference <URL>
|
diff --git a/src/styles/style_manager.js b/src/styles/style_manager.js
index <HASH>..<HASH> 100755
--- a/src/styles/style_manager.js
+++ b/src/styles/style_manager.js
@@ -212,7 +212,7 @@ StyleManager.mix = function (style, styles) {
// Track which styles were mixed into this one
for (let s of sources) {
- style.mixed[s] = true;
+ style.mixed[s.name] = true;
}
}
sources.push(style);
|
fix population of style's set of `mixed` styles
|
diff --git a/lib/barby/outputter/cairo_outputter.rb b/lib/barby/outputter/cairo_outputter.rb
index <HASH>..<HASH> 100644
--- a/lib/barby/outputter/cairo_outputter.rb
+++ b/lib/barby/outputter/cairo_outputter.rb
@@ -1,3 +1,4 @@
+require 'barby/outputter'
require 'cairo'
require 'stringio'
diff --git a/lib/barby/outputter/png_outputter.rb b/lib/barby/outputter/png_outputter.rb
index <HASH>..<HASH> 100644
--- a/lib/barby/outputter/png_outputter.rb
+++ b/lib/barby/outputter/png_outputter.rb
@@ -1,3 +1,4 @@
+require 'barby/outputter'
require 'png'
module Barby
|
Require Outputter parent class for Png- and CairoOutputter
|
diff --git a/config/environment.js b/config/environment.js
index <HASH>..<HASH> 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -6,6 +6,9 @@ module.exports = function(environment /*, appConfig */) {
'Nunito:400,700',
'Nunito Sans:400,600,700'
],
+ moment: {
+ includeLocales: ['es', 'fr'],
+ },
EmberENV: {
EXTEND_PROTOTYPES: {
String: true,
diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js
index <HASH>..<HASH> 100644
--- a/tests/dummy/config/environment.js
+++ b/tests/dummy/config/environment.js
@@ -52,10 +52,6 @@ module.exports = function(environment) {
// ]
}
},
- moment: {
- includeLocales: ['es', 'fr'],
- includeTimezone: 'all',
- },
EmberENV: {
FEATURES: {
// Here you can enable experimental features on an ember canary build
|
Ship moment config to consuming app
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ setup(
# Versions should comply with PEP440. For a discussion on single-sourcing
# the version across setup.py and the project code, see
# http://packaging.python.org/en/latest/tutorial.html#version
- version='1.0.10',
+ version='1.0.11',
url='https://github.com/mjirik/io3d',
author='Miroslav Jirik',
author_email='miroslav.jirik@gmail.com',
|
version with fixed read of more then <I> files with no extension
|
diff --git a/src/Koldy/Http/Mime.php b/src/Koldy/Http/Mime.php
index <HASH>..<HASH> 100644
--- a/src/Koldy/Http/Mime.php
+++ b/src/Koldy/Http/Mime.php
@@ -932,6 +932,7 @@ class Mime
'wmx' => 'video/x-ms-wmx',
'wmz' => 'application/x-msmetafile',
'woff' => 'application/x-font-woff',
+ 'woff2' => 'application/font-woff2',
'wpd' => 'application/vnd.wordperfect',
'wpl' => 'application/vnd.ms-wpl',
'wps' => 'application/vnd.ms-works',
|
Added mime type for woff2 file type
|
diff --git a/main.js b/main.js
index <HASH>..<HASH> 100644
--- a/main.js
+++ b/main.js
@@ -174,11 +174,9 @@ CrispCache.prototype.set = function (key, value, options, callback) {
options = {};
}
// Set default options
- options = Object.assign({
- staleTtl: this._getDefaultStaleTtl(),
- expiresTtl: this._getDefaultExpiresTtl(),
- size: 1
- }, options);
+ 'staleTtl' in options || (options.staleTtl = this._getDefaultStaleTtl());
+ 'expiresTtl' in options || (options.expiresTtl = this._getDefaultExpiresTtl());
+ 'size' in options || (options.size = 1);
if (options.expiresTtl > 0) {
var cacheEntry = new CacheEntry({
|
Fix failing Node v0.x tests
|
diff --git a/packages/api-generator/src/helpers/variables.js b/packages/api-generator/src/helpers/variables.js
index <HASH>..<HASH> 100644
--- a/packages/api-generator/src/helpers/variables.js
+++ b/packages/api-generator/src/helpers/variables.js
@@ -192,8 +192,8 @@ const VSelect = {
props: {
parent: 'VueComponent',
item: 'object',
- on: 'object',
- attrs: 'object',
+ on: 'object // Only needed when providing your own v-list-item',
+ attrs: 'object // Only needed when providing your own v-list-item',
},
source: 'v-select',
},
|
docs(VSelect): update information on the item slot
on and attrs are only needed if the user has a root v-list-item in the item slot
resolves #<I>
|
diff --git a/src/foremast/awslambda/cloudwatch_log_event/cloudwatch_log_event.py b/src/foremast/awslambda/cloudwatch_log_event/cloudwatch_log_event.py
index <HASH>..<HASH> 100644
--- a/src/foremast/awslambda/cloudwatch_log_event/cloudwatch_log_event.py
+++ b/src/foremast/awslambda/cloudwatch_log_event/cloudwatch_log_event.py
@@ -50,7 +50,7 @@ def create_cloudwatch_log_event(app_name, env, region, rules):
LOG.critical('Filter name is required and no filter_name is defined!')
raise InvalidEventConfiguration('Filter name is required and no filter_name is defined!')
- if not filter_pattern:
+ if filter_pattern is None:
LOG.critical('Filter pattern is required and no filter_pattern is defined!')
raise InvalidEventConfiguration('Filter pattern is required and no filter_pattern is defined!')
|
fix: changed logic to accept blank filter pattern
|
diff --git a/src/plugins/plugin.streaming.js b/src/plugins/plugin.streaming.js
index <HASH>..<HASH> 100644
--- a/src/plugins/plugin.streaming.js
+++ b/src/plugins/plugin.streaming.js
@@ -12,8 +12,6 @@ export default function(Chart) {
var realTimeScale = Chart.scaleService.getScaleConstructor('realtime');
- var refreshTimerID;
-
function removeOldData(scale, lower, data, datasetIndex) {
var i, ilen;
@@ -64,7 +62,7 @@ export default function(Chart) {
id: 'streaming',
afterInit: function(chart, options) {
- refreshTimerID = setInterval(function() {
+ chart.refreshTimerID = setInterval(function() {
onRefresh(chart);
}, options.refresh);
},
@@ -127,6 +125,8 @@ export default function(Chart) {
},
destroy: function(chart) {
+ var refreshTimerID = chart.refreshTimerID;
+
if (refreshTimerID) {
clearInterval(refreshTimerID);
}
|
Make each chart keep its refresh timer ID
|
diff --git a/test/fixtures/es6-export.js b/test/fixtures/es6-export.js
index <HASH>..<HASH> 100644
--- a/test/fixtures/es6-export.js
+++ b/test/fixtures/es6-export.js
@@ -4,4 +4,4 @@ export function exportTest() {
export default function exportTestDefault() {
return gettext('Hi from an ES6 export default!');
-}
\ No newline at end of file
+}
diff --git a/test/fixtures/es6-import.js b/test/fixtures/es6-import.js
index <HASH>..<HASH> 100644
--- a/test/fixtures/es6-import.js
+++ b/test/fixtures/es6-import.js
@@ -2,4 +2,4 @@ import exportTestDefault, { exportTest } from './es6-export';
const fromDefaultExport = exportTestDefault(); // should be ignored
const fromExport = exportTest(); // should be ignored
-gettext('Hi from ES6 file with import!');
\ No newline at end of file
+gettext('Hi from ES6 file with import!');
|
Add new lines at the end of fixture files
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.