diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/lib/beetle/client.rb b/lib/beetle/client.rb
index <HASH>..<HASH> 100644
--- a/lib/beetle/client.rb
+++ b/lib/beetle/client.rb
@@ -352,7 +352,7 @@ module Beetle
end
def queue_name_for_tracing(queue)
- "trace-#{queue}-#{Beetle.hostname}-#{$$}"
+ "trace-#{queue}-#{Beetle.hostname}"
end
def load_brokers_from_config
|
don't add process id to trace queues to allow testing dedup
|
diff --git a/nomad/job_endpoint.go b/nomad/job_endpoint.go
index <HASH>..<HASH> 100644
--- a/nomad/job_endpoint.go
+++ b/nomad/job_endpoint.go
@@ -1213,10 +1213,10 @@ func validateJobUpdate(old, new *structs.Job) error {
// Transitioning to/from periodic is disallowed
if old.IsPeriodic() && !new.IsPeriodic() {
- return fmt.Errorf("cannot update non-periodic job to being periodic")
+ return fmt.Errorf("cannot update periodic job to being non-periodic")
}
if new.IsPeriodic() && !old.IsPeriodic() {
- return fmt.Errorf("cannot update periodic job to being non-periodic")
+ return fmt.Errorf("cannot update non-periodic job to being periodic")
}
// Transitioning to/from parameterized is disallowed
|
Fix error messages for transitioning jobs to/from periodic
The error messages are flipped; when you transition a job from _not_ being periodic to being periodic you get the message "cannot update periodic job to being non-periodic", and vice versa.
|
diff --git a/tests/cli_test.py b/tests/cli_test.py
index <HASH>..<HASH> 100644
--- a/tests/cli_test.py
+++ b/tests/cli_test.py
@@ -26,7 +26,10 @@ def test_exits_invalid_with_invalid_args():
proc = Popen(('dumb-init', '--yolo', '/bin/true'), stderr=PIPE)
_, stderr = proc.communicate()
assert proc.returncode == 1
- assert stderr == b"dumb-init: unrecognized option '--yolo'\n"
+ assert stderr in (
+ b"dumb-init: unrecognized option '--yolo'\n", # glibc
+ b'dumb-init: unrecognized option: yolo\n', # musl
+ )
@pytest.mark.parametrize('flag', ['-h', '--help'])
|
Loosen assertion a bit for musl
|
diff --git a/generator/templates/tests-mocha/tests/unit/electron.spec.js b/generator/templates/tests-mocha/tests/unit/electron.spec.js
index <HASH>..<HASH> 100644
--- a/generator/templates/tests-mocha/tests/unit/electron.spec.js
+++ b/generator/templates/tests-mocha/tests/unit/electron.spec.js
@@ -1,4 +1,5 @@
-import spectron from 'spectron'
+// eslint-disable-next-line no-undef
+const spectron = __non_webpack_require__('spectron')
import testWithSpectron from 'vue-cli-plugin-electron-builder/lib/testWithSpectron'
import chai from 'chai'
import chaiAsPromised from 'chai-as-promised'
|
fix(generator/mocha): non webpack require spectron
|
diff --git a/mysqldef/time.go b/mysqldef/time.go
index <HASH>..<HASH> 100644
--- a/mysqldef/time.go
+++ b/mysqldef/time.go
@@ -51,9 +51,8 @@ const (
// MaxTime is the maximum for mysql time type.
MaxTime = time.Duration(838*3600+59*60+59) * time.Second
- zeroDatetimeStr = "0000-00-00 00:00:00"
- zeroTimestampStr = "0000-00-00 00:00:00"
- zeroDateStr = "0000-00-00"
+ zeroDatetimeStr = "0000-00-00 00:00:00"
+ zeroDateStr = "0000-00-00"
)
// Zero values for different types.
|
mysqldef: Remove zeroTimestampStr
|
diff --git a/test_proj/manage.py b/test_proj/manage.py
index <HASH>..<HASH> 100755
--- a/test_proj/manage.py
+++ b/test_proj/manage.py
@@ -1,9 +1,15 @@
#!/usr/bin/env python
+
+import os
+import sys
+
+path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
+sys.path.insert(0, path)
+
from django.core.management import execute_manager
try:
import settings # Assumed to be in the same directory.
except ImportError:
- import sys
sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
sys.exit(1)
|
Fixed issue #<I>: more robust test running (thanks to Tom von Schwerdtner for the idea)
|
diff --git a/Testing/Fakes/MailFake.php b/Testing/Fakes/MailFake.php
index <HASH>..<HASH> 100644
--- a/Testing/Fakes/MailFake.php
+++ b/Testing/Fakes/MailFake.php
@@ -24,6 +24,10 @@ class MailFake implements Mailer
*/
public function assertSent($mailable, $callback = null)
{
+ if(is_array($mailable)) {
+ return $this->assertSentTimes($mailable[0], $mailable[1], $callback);
+ }
+
PHPUnit::assertTrue(
$this->sent($mailable, $callback)->count() > 0,
"The expected [{$mailable}] mailable was not sent."
diff --git a/Testing/Fakes/QueueFake.php b/Testing/Fakes/QueueFake.php
index <HASH>..<HASH> 100644
--- a/Testing/Fakes/QueueFake.php
+++ b/Testing/Fakes/QueueFake.php
@@ -24,6 +24,10 @@ class QueueFake extends QueueManager implements Queue
*/
public function assertPushed($job, $callback = null)
{
+ if(is_array($job)) {
+ return $this->assertPushedTimes($mailable[0], $mailable[1], $callback);
+ }
+
PHPUnit::assertTrue(
$this->pushed($job, $callback)->count() > 0,
"The expected [{$job}] job was not pushed."
|
allow number of times to be specified in normal methods
|
diff --git a/core/lib/refinery/application_controller.rb b/core/lib/refinery/application_controller.rb
index <HASH>..<HASH> 100644
--- a/core/lib/refinery/application_controller.rb
+++ b/core/lib/refinery/application_controller.rb
@@ -56,7 +56,7 @@ module Refinery
end
def home_page?
- main_app.root_path =~ /^#{request.path}\/?/
+ main_app.root_path =~ /^#{Regexp.escape(request.path)}\/?/
end
def just_installed?
|
home_page?(): Escape special characters in request.path
Prevents an exception being thrown when the request path evaluates to an
invalid regular expression (i.e. unmatched brackets). This should also
fix a possible security issue in the sense that we were previously
permitting a user to define an arbitrarily complex regex inside the
application.
|
diff --git a/phoebe/frontend/io.py b/phoebe/frontend/io.py
index <HASH>..<HASH> 100644
--- a/phoebe/frontend/io.py
+++ b/phoebe/frontend/io.py
@@ -446,6 +446,11 @@ def load_legacy(filename, add_compute_legacy=True, add_compute_phoebe=True):
if pnew == 'ld_model':
val = val.split(' ')[0]
d['value'] = val[0].lower()+val[1::]
+ # since ld_coeffs is dataset specific make sure there is at least one dataset
+ if lcno != 0 or rvno != 0:
+ eb.set_value_all(check_relevant=False, **d)
+ #now change to take care of bolometric values
+ d['qualifier'] = d['qualifier']+'_bol'
if pnew == 'pot':
#print "dict", d
d['method'] = 'star'
@@ -492,7 +497,6 @@ def load_legacy(filename, add_compute_legacy=True, add_compute_phoebe=True):
d['qualifier'] = 'delta'
d['value'] = val
if len(d) > 0:
-
eb.set_value_all(check_relevant=False, **d)
#print "before", eb['pot@secondary']
#print "rpole before", eb['rpole@secondary']
|
fixed bug. ld_func and ld_func_bol will now load correctly.
|
diff --git a/lib/Session/Redis.php b/lib/Session/Redis.php
index <HASH>..<HASH> 100644
--- a/lib/Session/Redis.php
+++ b/lib/Session/Redis.php
@@ -108,7 +108,7 @@ class Redis implements Driver {
$promisor->fail(new Exception("couldn't acquire lock for new session id", 0, $error));
} else {
$this->locks[$newId] = $token;
- $promisor->succeed($this->unlock($oldId));
+ $promisor->succeed($this->save($oldId, [], 0));
}
});
|
Delete old session on regenerate instead of just unlocking it
|
diff --git a/src/engine/runtime.js b/src/engine/runtime.js
index <HASH>..<HASH> 100644
--- a/src/engine/runtime.js
+++ b/src/engine/runtime.js
@@ -77,7 +77,7 @@ util.inherits(Runtime, EventEmitter);
/**
* How rapidly we try to step threads, in ms.
*/
-Runtime.THREAD_STEP_INTERVAL = 1000 / 30;
+Runtime.THREAD_STEP_INTERVAL = 1000 / 60;
// -----------------------------------------------------------------------------
|
Run threads for <I>fps
|
diff --git a/HTML/Directives/Wrap.php b/HTML/Directives/Wrap.php
index <HASH>..<HASH> 100644
--- a/HTML/Directives/Wrap.php
+++ b/HTML/Directives/Wrap.php
@@ -12,8 +12,9 @@ use Gregwar\RST\Nodes\WrapperNode;
class Wrap extends SubDirective
{
protected $class;
+ protected $uniqid;
- public function __construct($class)
+ public function __construct($class, $uniqid=false)
{
$this->class = $class;
}
@@ -25,6 +26,10 @@ class Wrap extends SubDirective
public function processSub(Parser $parser, $document, $variable, $data, array $options)
{
- return new WrapperNode($document, '<div class="'.$this->class.'">', '</div>');
+ $class = $this->class;
+ if ($this->uniqid) {
+ $class .= ' '.uniqid($this->class);
+ }
+ return new WrapperNode($document, '<div class="'.$class.'">', '</div>');
}
}
|
Adding uniqid option to Wrap
|
diff --git a/nydus/db/routers/__init__.py b/nydus/db/routers/__init__.py
index <HASH>..<HASH> 100644
--- a/nydus/db/routers/__init__.py
+++ b/nydus/db/routers/__init__.py
@@ -16,6 +16,9 @@ class BaseRouter(object):
retryable = False
def get_db(self, cluster, func, *args, **kwargs):
- """Return the first entry in the cluster"""
+ """
+ Return the first entry in the cluster
+ The return value must be iterable
+ """
return range(len(cluster))
|
added clarification on the return type for a router
|
diff --git a/src/Autosuggest.js b/src/Autosuggest.js
index <HASH>..<HASH> 100644
--- a/src/Autosuggest.js
+++ b/src/Autosuggest.js
@@ -525,7 +525,8 @@ export default class Autosuggest extends Component {
}
},
onKeyDown: (event, data) => {
- switch (event.key) {
+ const keyCode = event.key || event.code;
+ switch (keyCode) {
case 'ArrowDown':
case 'ArrowUp':
if (isCollapsed) {
|
Use event.code as a fallback to event.key (#<I>)
|
diff --git a/src/main/java/me/corsin/javatools/string/JEmoji.java b/src/main/java/me/corsin/javatools/string/JEmoji.java
index <HASH>..<HASH> 100644
--- a/src/main/java/me/corsin/javatools/string/JEmoji.java
+++ b/src/main/java/me/corsin/javatools/string/JEmoji.java
@@ -21,7 +21,8 @@ public enum JEmoji {
FIRE(":fire:", 0xF0, 0x9F, 0x94, 0xA5),
NOTES(":notes:", 0xF0, 0x9F, 0x8E, 0xB6),
SPARKLES(":sparkles:", 0xE2, 0x9C, 0xA8),
- WINK(":wink:", 0xF0, 0x9F, 0x98, 0x89);
+ WINK(":wink:", 0xF0, 0x9F, 0x98, 0x89),
+ SPEECH_BALLOON(":speech_balloon:", 0xF0, 0x9F, 0x92, 0xAC);
private final String shortCode;
private final String utf8HexStr;
|
Adding the "speech balloon" emoji
|
diff --git a/lib/kafka/consumer_group.rb b/lib/kafka/consumer_group.rb
index <HASH>..<HASH> 100644
--- a/lib/kafka/consumer_group.rb
+++ b/lib/kafka/consumer_group.rb
@@ -113,9 +113,12 @@ module Kafka
Protocol.handle_error(response.error_code)
end
- rescue ConnectionError, UnknownMemberId, RebalanceInProgress, IllegalGeneration => e
+ rescue ConnectionError, UnknownMemberId, IllegalGeneration => e
@logger.error "Error sending heartbeat: #{e}"
raise HeartbeatError, e
+ rescue RebalanceInProgress => e
+ @logger.warn "Error sending heartbeat: #{e}"
+ raise HeartbeatError, e
rescue NotCoordinatorForGroup
@logger.error "Failed to find coordinator for group `#{@group_id}`; retrying..."
sleep 1
|
log RebalanceInProgress in ConsumerGroup#heartbeat as warning
Resolves #<I>
|
diff --git a/registration/models.py b/registration/models.py
index <HASH>..<HASH> 100644
--- a/registration/models.py
+++ b/registration/models.py
@@ -141,11 +141,14 @@ class RegistrationManager(models.Manager):
"""
for profile in self.all():
- if profile.activation_key_expired():
- user = profile.user
- if not user.is_active:
- user.delete()
-
+ try:
+ if profile.activation_key_expired():
+ user = profile.user
+ if not user.is_active:
+ user.delete()
+ profile.delete()
+ except User.DoesNotExist:
+ profile.delete()
class RegistrationProfile(models.Model):
"""
|
RegistrationProfile actually deletes a profile and not only user in delete_expired_users in it's manager, as documented
|
diff --git a/karaage/cache/usage.py b/karaage/cache/usage.py
index <HASH>..<HASH> 100644
--- a/karaage/cache/usage.py
+++ b/karaage/cache/usage.py
@@ -125,8 +125,5 @@ def get_machine_usage(machine, start, end):
date__range=(start, end)).aggregate(usage=Sum('cpu_usage'), jobs=Count('id'))
cache = MachineCache.objects.create(machine=machine, start=start, end=end, cpu_hours=data['usage'], no_jobs=data['jobs'])
- except MachineCache.MultipleObjectsReturned:
- MachineCache.objects.filter(machine=machine, date=datetime.date.today(), start=start, end=end).delete()
- return get_machine_usage(machine, start, end)
-
+
return cache.cpu_hours, cache.no_jobs
|
Simplify.
Constraints introduced in cd<I>a<I>e5c2d<I>e<I>ca<I>e<I>c3be<I>
should mean that MultipleObjectsReturned never is generated.
Change-Id: I<I>ab0c<I>af<I>d<I>e<I>fa5f6d<I>
|
diff --git a/src/Exscript/workqueue/Job.py b/src/Exscript/workqueue/Job.py
index <HASH>..<HASH> 100644
--- a/src/Exscript/workqueue/Job.py
+++ b/src/Exscript/workqueue/Job.py
@@ -42,12 +42,8 @@ class Job(threading.Thread):
self.local_data)
except Exception, e:
self.exception = e
- if self.debug:
- name = self.action.name or 'no name'
- print 'Job "%s" (%s) failed: %s' % (self.getName(), name, e)
- traceback.print_exc()
- if self.exception is not None:
- self.action.signal_emit('aborted', self.action, e)
- else:
- self.action.signal_emit('succeeded', self.action)
+ self.action.signal_emit('aborted', self.action, e)
+ self.action.signal_emit('completed', self.action)
+ raise
+ self.action.signal_emit('succeeded', self.action)
self.action.signal_emit('completed', self.action)
|
Fix: error reporting when debug level is 0.
|
diff --git a/tests/Unit/CommandBuilderTest.php b/tests/Unit/CommandBuilderTest.php
index <HASH>..<HASH> 100644
--- a/tests/Unit/CommandBuilderTest.php
+++ b/tests/Unit/CommandBuilderTest.php
@@ -22,7 +22,7 @@ class CommandBuilderTest extends ptlisShellCommandTestcase
{
private function readAttribute($object, string $property)
{
- $reflectionObject = new \ReflectionClass($object::class);
+ $reflectionObject = new \ReflectionClass(get_class($object));
$property = $reflectionObject->getProperty($property);
$property->setAccessible(true);
return $property->getValue($object);
|
Fix retrieval of class name in older PHP versions
|
diff --git a/closure/goog/ui/container.js b/closure/goog/ui/container.js
index <HASH>..<HASH> 100644
--- a/closure/goog/ui/container.js
+++ b/closure/goog/ui/container.js
@@ -103,7 +103,7 @@ goog.ui.Container.Orientation = {
/**
- * Allows an alternative element to be set to recieve key events, otherwise
+ * Allows an alternative element to be set to receive key events, otherwise
* defers to the renderer's element choice.
* @type {Element|undefined}
* @private
@@ -455,6 +455,7 @@ goog.ui.Container.prototype.disposeInternal = function() {
this.keyHandler_ = null;
}
+ this.keyEventTarget_ = null;
this.childElementIdMap_ = null;
this.openItem_ = null;
this.renderer_ = null;
|
Cleaned up keyEventTarget_ member of goog.ui.Container on disposal.
R=nicksantos
DELTA=2 (1 added, 0 deleted, 1 changed)
Revision created by MOE tool push_codebase.
MOE_MIGRATION=<I>
git-svn-id: <URL>
|
diff --git a/question/editlib.php b/question/editlib.php
index <HASH>..<HASH> 100644
--- a/question/editlib.php
+++ b/question/editlib.php
@@ -215,9 +215,6 @@ function question_list($course, $categoryid, $quizid=0,
<th nowrap=\"nowrap\" class=\"header\">$strtype</th>";
echo "</tr>\n";
foreach ($questions as $question) {
- if ($question->qtype == RANDOM) {
- //continue;
- }
echo "<tr>\n<td nowrap=\"nowrap\">\n";
if ($quizid) {
echo "<a title=\"$straddtoquiz\" href=\"edit.php?addquestion=$question->id&sesskey=$USER->sesskey\"><img
|
Taking out random question hack that is no longer needed.
|
diff --git a/src/MigrationTool/SqlMigrationTool.php b/src/MigrationTool/SqlMigrationTool.php
index <HASH>..<HASH> 100644
--- a/src/MigrationTool/SqlMigrationTool.php
+++ b/src/MigrationTool/SqlMigrationTool.php
@@ -178,7 +178,10 @@ abstract class SqlMigrationTool extends AbstractMigrationTool
$this->getPhpDataObject()->beginTransaction();
try {
- $result = $this->getPhpDataObject()->exec($migrationData);
+ $statement = $this->getPhpDataObject()->prepare($migrationData);
+ $result = $statement->execute();
+ while ($statement->nextRowset());
+ $statement->closeCursor();
} catch (\Exception $e) {
$result = $e;
}
@@ -205,7 +208,7 @@ abstract class SqlMigrationTool extends AbstractMigrationTool
self::MESSAGE__YOU_HAVE_AN_ERROR_IN_YOUR_SQL_SYNTAX__PATH,
$context
),
- $result->getCode(),
+ intval($result->getCode()),
$result
);
}
|
WIP hot-fixes for MySQL
|
diff --git a/widgets/map/src/main/javascript/mapcore.js b/widgets/map/src/main/javascript/mapcore.js
index <HASH>..<HASH> 100644
--- a/widgets/map/src/main/javascript/mapcore.js
+++ b/widgets/map/src/main/javascript/mapcore.js
@@ -528,6 +528,10 @@ coreMap.Map.prototype.redrawOnResize = function () {
$(window).resize(function () {
me.width = me.determineWidth(me.mapSelector);
me.height = me.determineHeight(me.mapSelector);
+
+ $("canvas").css("height", me.height);
+ $("canvas").css("width", me. width);
+
_.debounce(drawChart, 100);
});
|
NEON-<I> layers now match the reactivity of the map and are not cut off when the window's size changes
|
diff --git a/src/main/java/net/openhft/chronicle/network/WireTcpHandler.java b/src/main/java/net/openhft/chronicle/network/WireTcpHandler.java
index <HASH>..<HASH> 100755
--- a/src/main/java/net/openhft/chronicle/network/WireTcpHandler.java
+++ b/src/main/java/net/openhft/chronicle/network/WireTcpHandler.java
@@ -94,6 +94,7 @@ public abstract class WireTcpHandler implements TcpHandler {
long limit = in.readLimit();
long end = in.readPosition() + length + SIZE_OF_SIZE;
+ assert end <= limit;
long outPos = out.writePosition();
try {
@@ -115,11 +116,17 @@ public abstract class WireTcpHandler implements TcpHandler {
if (written > 0)
return false;
- } catch (Exception e) {
+ } catch (Throwable e) {
LOG.error("", e);
} finally {
in.readLimit(limit);
- in.readPosition(end);
+ try {
+ in.readPosition(end);
+ } catch (Exception e) {
+ throw new IllegalStateException("position: " + end
+ + ", readLimit: " + in.readLimit() + " " + in.toDebugString(), e);
+
+ }
}
return true;
|
CE-<I> Add more diagnostics.
|
diff --git a/test/engine_test.rb b/test/engine_test.rb
index <HASH>..<HASH> 100644
--- a/test/engine_test.rb
+++ b/test/engine_test.rb
@@ -20,6 +20,20 @@ class EngineTest < Test::Unit::TestCase
assert_match /Unsupported file type/, error.message
end
+ should_eventually 'stop as soon as the error threshold is reached' do
+ engine = ETL::Engine.new
+
+ assert_equal 0, engine.errors.size
+
+ engine.process ETL::Control::Control.parse_text <<CTL
+ set_error_threshold 1
+ source :in, { :type => :enumerable, :enumerable => (1..100) }
+ after_read { |row| raise "Failure" }
+CTL
+
+ assert_equal 1, engine.errors.size
+ end
+
end
context 'connection' do
|
Save test-case for issue #<I>.
|
diff --git a/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java b/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java
index <HASH>..<HASH> 100644
--- a/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java
+++ b/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java
@@ -368,6 +368,7 @@ public class LottieAnimationView extends AppCompatImageView {
lottieDrawable.setCallback(this);
boolean isNewComposition = lottieDrawable.setComposition(composition);
+ enableOrDisableHardwareLayer();
if (!isNewComposition) {
// We can avoid re-setting the drawable, and invalidating the view, since the composition
// hasn't changed.
|
Update hardware layer when setComposition is set
When the `LottieDrawable` composition is set, it may autoplay the
animation so we need to update the layer type.
Fixes #<I>
|
diff --git a/pysnmp/entity/rfc3413/ntforg.py b/pysnmp/entity/rfc3413/ntforg.py
index <HASH>..<HASH> 100644
--- a/pysnmp/entity/rfc3413/ntforg.py
+++ b/pysnmp/entity/rfc3413/ntforg.py
@@ -1,4 +1,8 @@
import time
+try:
+ from sys import version_info
+except ImportError:
+ version_info = ( 0, 0 ) # a really early version
from pysnmp.entity.rfc3413 import config
from pysnmp.proto.proxy import rfc2576
from pysnmp.proto.api import v2c
@@ -160,6 +164,8 @@ class NotificationOriginator:
varBinds.append((mibNode.name + (0,), mibNode.syntax))
if additionalVarBinds:
+ if version_info < (1, 6):
+ additionalVarBinds = list(additionalVarBinds)
varBinds.extend(additionalVarBinds)
for varName, varVal in varBinds:
|
python<I> compatibility fix: [].extend() expects a list, not tuple
|
diff --git a/nodeGame.js b/nodeGame.js
index <HASH>..<HASH> 100644
--- a/nodeGame.js
+++ b/nodeGame.js
@@ -6,7 +6,7 @@
var node = exports;
- node.version = '0.7.1';
+ node.version = '0.7.3';
node.verbosity = 0;
|
Document refactored. Seems working ok
|
diff --git a/www/plugins.FileOpener2.js b/www/plugins.FileOpener2.js
index <HASH>..<HASH> 100644
--- a/www/plugins.FileOpener2.js
+++ b/www/plugins.FileOpener2.js
@@ -27,9 +27,9 @@ var exec = require('cordova/exec');
function FileOpener2() {}
FileOpener2.prototype.open = function (fileName, contentType, options) {
- contentType = contentType || '';
+ contentType = contentType || '';
options = options || {};
- exec(callbackContext.success || null, callbackContext.error || null, 'FileOpener2', 'open', [fileName, contentType, false, options.position]);
+ exec(options.success || null, options.error || null, 'FileOpener2', 'open', [fileName, contentType, false, options.position]);
};
FileOpener2.prototype.showOpenWithDialog = function (fileName, contentType, callbackContext) {
|
fix: fixed reference bug in open method
|
diff --git a/tests/functional/test_scoping/test_metamodel_provider3.py b/tests/functional/test_scoping/test_metamodel_provider3.py
index <HASH>..<HASH> 100644
--- a/tests/functional/test_scoping/test_metamodel_provider3.py
+++ b/tests/functional/test_scoping/test_metamodel_provider3.py
@@ -73,6 +73,15 @@ def test_metamodel_provider_advanced_test3_global():
for a in lst:
assert a.ref
+ # check meta classes
+ from textx.scoping.tools import textx_isinstance
+ for a in lst:
+ assert textx_isinstance(a, a_mm["Obj"])
+ assert textx_isinstance(a, b_mm["Obj"])
+ assert textx_isinstance(a, c_mm["Obj"])
+ #fails for some:
+ #assert isinstance(a, a_mm["Obj"])
+
#################################
# END
#################################
|
added instance_of tests (problem indentified; see commented code)
|
diff --git a/app/xmpp/index.js b/app/xmpp/index.js
index <HASH>..<HASH> 100644
--- a/app/xmpp/index.js
+++ b/app/xmpp/index.js
@@ -61,11 +61,40 @@ function xmppStart(core) {
return processor.run();
});
- if (!handled && settings.xmpp.debug.unhandled) {
+ if (handled) {
+ return;
+ }
+
+ if (settings.xmpp.debug.unhandled) {
// Print unhandled request
console.log(' ');
console.log(stanza.root().toString().red);
}
+
+ if (stanza.name !== 'iq') {
+ return;
+ }
+
+ var msg = new Stanza.Iq({
+ type: 'error',
+ id: stanza.attrs.id,
+ to: stanza.attrs.from,
+ from: stanza.attrs.to
+ });
+
+ msg.c('not-implemented', {
+ code: 501,
+ type: 'CANCEL'
+ }).c('feature-not-implemented', {
+ xmlns: 'urn:ietf:params:xml:n:xmpp-stanzas'
+ });
+
+
+ if (settings.xmpp.debug.unhandled) {
+ console.log(msg.root().toString().green);
+ }
+
+ client.send(msg);
});
// On Disconnect event. When a client disconnects
|
Reply to unimplemented XMPP query requests
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,7 @@ test_requirements=[
setup(
name='couchdb-schematics',
license='BSD',
- version='0.2.1-alpha',
+ version='0.3.0',
description='',
author=u'',
author_email='',
@@ -45,10 +45,9 @@ setup(
tests_require=test_requirements,
install_requires=[
'setuptools>=0.8',
- 'schematics>=0.10-1',
- 'CouchDB'
+ 'CouchDB',
+ 'schematics',
] + test_requirements,
dependency_links = [
- 'https://github.com/ryanolson/schematics/tarball/master#egg=schematics-0.10-1'
]
)
|
updated setup to use the main schematics distribution
|
diff --git a/version.go b/version.go
index <HASH>..<HASH> 100644
--- a/version.go
+++ b/version.go
@@ -1,3 +1,3 @@
package nsq
-const VERSION = "0.1.29"
+const VERSION = "0.2.0"
|
update docs; bump to <I>
|
diff --git a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/slf4j/MavenLoggerAdapter.java b/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/slf4j/MavenLoggerAdapter.java
index <HASH>..<HASH> 100644
--- a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/slf4j/MavenLoggerAdapter.java
+++ b/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/slf4j/MavenLoggerAdapter.java
@@ -29,6 +29,11 @@ import org.slf4j.helpers.MessageFormatter;
public class MavenLoggerAdapter extends MarkerIgnoringBase {
/**
+ * The serial version UID for serialization.
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
* A reference to the Maven log.
*/
private final Log log;
|
Added missing serialVersionUID.
|
diff --git a/pysolr.py b/pysolr.py
index <HASH>..<HASH> 100644
--- a/pysolr.py
+++ b/pysolr.py
@@ -864,11 +864,12 @@ class Solr(object):
terms = result.get("terms", {})
res = {}
- # in Solr 1.x the value of terms is a flat list:
- # ["field_name", ["dance",23,"dancers",10,"dancing",8,"dancer",6]]
+ # in Solr 1.x the value of terms is list of elements with the field name
+ # and a flat list of value, count pairs:
+ # ["field_name", ["dance", 23, "dancers", 10, …]]
#
- # in Solr 3.x the value of terms is a dict:
- # {"field_name": ["dance",23,"dancers",10,"dancing",8,"dancer",6]}
+ # in Solr 3+ the value of terms is a dict of field name and a flat list of
+ # value, count pairs: {"field_name": ["dance", 23, "dancers", 10, …]}
if isinstance(terms, (list, tuple)):
terms = dict(zip(terms[0::2], terms[1::2]))
|
Cleanup comment
This suppresses a commented-code warning and also makes it easier to understand
|
diff --git a/pypot/_version.py b/pypot/_version.py
index <HASH>..<HASH> 100644
--- a/pypot/_version.py
+++ b/pypot/_version.py
@@ -1 +1 @@
-__version__ = '2.1.0rc9'
+__version__ = '2.1.0rc10'
|
Prepare for version <I>rc<I>. (hopefully the last one).
|
diff --git a/authority/tests.py b/authority/tests.py
index <HASH>..<HASH> 100644
--- a/authority/tests.py
+++ b/authority/tests.py
@@ -189,7 +189,7 @@ class PerformanceTest(TestCase):
self.check.has_user_perms('foo', self.user, True, True)
-class ExpectedBehaviourTestCase(TestCase):
+class GroupPermissionCacheTestCase(TestCase):
"""
Tests that peg expected behaviour
"""
|
refs #3: changed the name of the test case
|
diff --git a/tests/Messages/RpcTest.php b/tests/Messages/RpcTest.php
index <HASH>..<HASH> 100644
--- a/tests/Messages/RpcTest.php
+++ b/tests/Messages/RpcTest.php
@@ -120,7 +120,7 @@ class RpcTest extends \PHPUnit_Framework_TestCase
Phake::when($messenger)->createLine($this->isInstanceOf(RpcNotify::class))->thenReturn('');
$callbackFired = false;
Phake::when($messenger)->callRpc('foo', $payload, $this->isInstanceOf(Deferred::class))->thenGetReturnByLambda(function ($target, $payload, $deferred) use (&$callbackFired) {
- $deferred->notify([
+ $deferred->progress([
'a',
'b',
'c',
|
Update RpcTest.php
|
diff --git a/lib/active_interaction/filter.rb b/lib/active_interaction/filter.rb
index <HASH>..<HASH> 100644
--- a/lib/active_interaction/filter.rb
+++ b/lib/active_interaction/filter.rb
@@ -14,7 +14,7 @@ module ActiveInteraction
# Describes an input filter for an interaction.
class Filter
# @return [Hash{Symbol => Class}]
- CLASSES = {}
+ CLASSES = {} # rubocop:disable Style/MutableConstant
private_constant :CLASSES
# @return [Hash{Symbol => Filter}]
|
Use pragma to disable mutable constant
|
diff --git a/src/Behat/Mink/Driver/SeleniumDriver.php b/src/Behat/Mink/Driver/SeleniumDriver.php
index <HASH>..<HASH> 100644
--- a/src/Behat/Mink/Driver/SeleniumDriver.php
+++ b/src/Behat/Mink/Driver/SeleniumDriver.php
@@ -424,7 +424,8 @@ if (node.tagName == 'SELECT') {
var i, l = nodes.length;
for (i = 0; i < l; i++) {
if (nodes[i].getAttribute('value') == "$valueEscaped") {
- node.checked = true;
+ nodes[i].checked = true;
+ break;
}
}
}
|
[Selenium Driver ] Check the radio/checkbox with the matching value when multiple nodes with the same name found
|
diff --git a/plugins/commands/serve/util/service_info.rb b/plugins/commands/serve/util/service_info.rb
index <HASH>..<HASH> 100644
--- a/plugins/commands/serve/util/service_info.rb
+++ b/plugins/commands/serve/util/service_info.rb
@@ -14,6 +14,7 @@ module VagrantPlugins
broker: broker
)
if context.metadata["plugin_manager"] && info.broker
+ activated = true
Service::ServiceInfo.manager_tracker.activate do
client = Client::PluginManager.load(
context.metadata["plugin_manager"],
@@ -26,8 +27,10 @@ module VagrantPlugins
return if !block_given?
yield info
ensure
- Service::ServiceInfo.manager_tracker.deactivate do
- Vagrant.plugin("2").disable_remote_manager
+ if activated
+ Service::ServiceInfo.manager_tracker.deactivate do
+ Vagrant.plugin("2").disable_remote_manager
+ end
end
Thread.current.thread_variable_set(:service_info, nil)
end
|
Only deactivate remote plugin manager if activated
|
diff --git a/client/mic.py b/client/mic.py
index <HASH>..<HASH> 100644
--- a/client/mic.py
+++ b/client/mic.py
@@ -2,7 +2,7 @@
"""
The Mic class handles all interactions with the microphone and speaker.
"""
-
+import logging
import tempfile
import wave
import audioop
@@ -26,10 +26,15 @@ class Mic:
mode
acive_stt_engine -- performs STT while Jasper is in active listen mode
"""
+ self._logger = logging.getLogger(__name__)
self.speaker = speaker
self.passive_stt_engine = passive_stt_engine
self.active_stt_engine = active_stt_engine
+ self._logger.info("Initializing PyAudio. ALSA/Jack error messages " +
+ "that pop up during this process are normal an " +
+ "can usually be safely ignored.")
self._audio = pyaudio.PyAudio()
+ self._logger.info("Initialization of PyAudio completed.")
def __del__(self):
self._audio.terminate()
|
Added log message for PyAudio initialization
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,6 @@ setup_params = dict(
long_description=long_description,
url="https://github.com/jaraco/" + name,
packages=setuptools.find_packages(),
- namespace_packages=['rst'],
include_package_data=True,
namespace_packages=name.split('.')[:-1],
install_requires=[
|
Remove now superfluous namespace_packages declaration.
|
diff --git a/fundamentals/mysql/directory_script_runner.py b/fundamentals/mysql/directory_script_runner.py
index <HASH>..<HASH> 100644
--- a/fundamentals/mysql/directory_script_runner.py
+++ b/fundamentals/mysql/directory_script_runner.py
@@ -119,11 +119,12 @@ def directory_script_runner(
scriptList = {}
for d in os.listdir(pathToScriptDirectory):
filePath = os.path.join(pathToScriptDirectory, d)
+ filename = os.path.basename(filePath)
extension = filePath.split(".")[-1]
if os.path.isfile(filePath) and extension == "sql":
modified = datetime.datetime.strptime(time.ctime(
os.path.getmtime(filePath)), "%a %b %d %H:%M:%S %Y")
- scriptList[modified] = filePath
+ scriptList[modified + filename] = filePath
# ORDER THE DICTIONARY BY MODIFIED TIME - OLDEST FIRST
scriptList = collections.OrderedDict(sorted(scriptList.items()))
|
updated file sorting for mysqlSucker
|
diff --git a/modules_v2/tree/module.php b/modules_v2/tree/module.php
index <HASH>..<HASH> 100644
--- a/modules_v2/tree/module.php
+++ b/modules_v2/tree/module.php
@@ -126,6 +126,7 @@ class tree_WT_Module extends WT_Module implements WT_Module_Tab {
break;
case 'getDetails':
+ header('Content-Type: text/html; charset=UTF-8');
$pid = safe_GET('pid');
$i = safe_GET('instance');
$tv = new TreeView($i);
|
#<I> - German Umlaut Problem in interactive tree
|
diff --git a/activerecord/lib/active_record/associations/collection_proxy.rb b/activerecord/lib/active_record/associations/collection_proxy.rb
index <HASH>..<HASH> 100644
--- a/activerecord/lib/active_record/associations/collection_proxy.rb
+++ b/activerecord/lib/active_record/associations/collection_proxy.rb
@@ -42,6 +42,11 @@ module ActiveRecord
@association.load_target
end
+ # Returns +true+ if the association has been loaded, otherwise +false+.
+ #
+ # person.pets.loaded? # => false
+ # person.pets
+ # person.pets.loaded? # => true
def loaded?
@association.loaded?
end
@@ -889,7 +894,7 @@ module ActiveRecord
end
# Returns a new array of objects from the collection. If the collection
- # hasn't been loaded, it fetches the records from the database.
+ # hasn't been loaded, it fetches the records from the database.
#
# class Person < ActiveRecord::Base
# has_many :pets
|
update AR::Associations::CollectionProxy#loaded? documentation [ci skip]
|
diff --git a/fusesoc/section.py b/fusesoc/section.py
index <HASH>..<HASH> 100644
--- a/fusesoc/section.py
+++ b/fusesoc/section.py
@@ -349,8 +349,8 @@ Testbench source type : {source_type}
Verilog top module : {top_module}
"""
return s.format(verilator_options=' '.join(self.verilator_options),
- src_files = ' '.join(self.src_files),
- include_files=' '.join(self.include_files),
+ src_files = ' '.join([f.name for f in self.src_files]),
+ include_files=' '.join([f.name for f in self.include_files]),
define_files=' '.join(self.define_files),
libs=' '.join(self.libs),
tb_toplevel=self.tb_toplevel,
|
Fix core-info for verilator sections
|
diff --git a/lib/puppet/settings.rb b/lib/puppet/settings.rb
index <HASH>..<HASH> 100644
--- a/lib/puppet/settings.rb
+++ b/lib/puppet/settings.rb
@@ -1197,6 +1197,7 @@ Generated on #{Time.now}.
# @return nil
def clear_everything_for_tests()
unsafe_clear(true, true)
+ @configuration_file = nil
@global_defaults_initialized = false
@app_defaults_initialized = false
end
|
(PUP-<I>) Clear configuration_file for tests
The new default_manifest integration spec is parsing actual
configuration files and uncovered that our Settings do not clear the
@configuration_file data when #unsafe_clear is called. This allows
parsed settings to leak across specs.
Specifically dropping the @configuration_file in the test helper
Settings#clear_everything_for_tests, resolves this, without changing the
behavior of the Settings#clear, and through it, the Puppet.clear
methods.
|
diff --git a/classes/phing/listener/XmlLogger.php b/classes/phing/listener/XmlLogger.php
index <HASH>..<HASH> 100755
--- a/classes/phing/listener/XmlLogger.php
+++ b/classes/phing/listener/XmlLogger.php
@@ -142,8 +142,6 @@ class XmlLogger implements BuildLogger {
$elapsedTime = Phing::currentTimeMillis() - $this->buildTimerStart;
- print "The build has finished!\n";
-
$this->buildElement->setAttribute(XmlLogger::TIME_ATTR, DefaultLogger::formatTime($elapsedTime));
if ($event->getException() != null) {
|
Merging branch fix [<I>]
|
diff --git a/src/Kernel.php b/src/Kernel.php
index <HASH>..<HASH> 100644
--- a/src/Kernel.php
+++ b/src/Kernel.php
@@ -453,7 +453,7 @@ class Kernel
if ($this->debug) {
$this->setContainer(new ContainerBuilder(new EnvPlaceholderParameterBag($this->getContainerParameters())));
$this->loadContainerConfiguration();
- $this->container->compile();
+ $this->container->compile(true);
} else {
$filename = $this->getContainerCacheFilename();
@@ -463,7 +463,7 @@ class Kernel
} else {
$this->setContainer(new ContainerBuilder(new EnvPlaceholderParameterBag($this->getContainerParameters())));
$this->loadContainerConfiguration();
- $this->container->compile();
+ $this->container->compile(true);
if ($this->containerIsCacheable()) {
$dumper = new PhpDumper($this->container);
@@ -529,4 +529,4 @@ class Kernel
{
// Optional
}
-}
\ No newline at end of file
+}
|
resolve env placeholder parameter
- env vars where not replaced when container has been compiled in debug mode
- env vars where not replaced when compiling a container in non-debug mode but when loading the cached version on a second call
|
diff --git a/huey/tests/test_api.py b/huey/tests/test_api.py
index <HASH>..<HASH> 100644
--- a/huey/tests/test_api.py
+++ b/huey/tests/test_api.py
@@ -479,7 +479,7 @@ class TestQueue(BaseTestCase):
self.huey.execute(task, seconds(30))
self.assertEqual(state, [res.id, r2.id, r3.id, r4.id])
- state.clear()
+ state = []
def test_scheduling_expires(self):
@self.huey.task()
|
Fix <I> incompatibility in test.
|
diff --git a/spec/request_spec.rb b/spec/request_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/request_spec.rb
+++ b/spec/request_spec.rb
@@ -573,9 +573,9 @@ describe RestClient::Request do
)
@net.should_receive(:ca_path=).with("Certificate Authority Path")
@net.should_receive(:ssl_version=).with('SSLv3')
- @http.stub!(:request)
- @request.stub!(:process_result)
- @request.stub!(:response_log)
+ @http.stub(:request)
+ @request.stub(:process_result)
+ @request.stub(:response_log)
@request.transmit(@uri, 'req', 'payload')
end
@@ -588,9 +588,9 @@ describe RestClient::Request do
)
@net.should_not_receive(:sa_path=).with("Certificate Authority File")
@net.should_receive(:ssl_version=).with('TSLv1')
- @http.stub!(:request)
- @request.stub!(:process_result)
- @request.stub!(:response_log)
+ @http.stub(:request)
+ @request.stub(:process_result)
+ @request.stub(:response_log)
@request.transmit(@uri, 'req', 'payload')
end
end
|
Fix new specs that used deprecated "stub!" method
|
diff --git a/test/test_task.rb b/test/test_task.rb
index <HASH>..<HASH> 100644
--- a/test/test_task.rb
+++ b/test/test_task.rb
@@ -22,18 +22,18 @@ class TestTask < Minitest::Test
FileUtils.mkdir_p File.dirname(@manifest_file)
@manifest = Sprockets::Manifest.new(@assets, @dir, @manifest_file)
- @environment_ran = false
- # Stub Rails environment task
- @rake.define_task Rake::Task, :environment do
- @environment_ran = true
- end
-
Sprockets::Rails::Task.new do |t|
t.environment = @assets
t.manifest = @manifest
t.assets = ['foo.js', 'foo-modified.js']
t.log_level = :fatal
end
+
+ @environment_ran = false
+ # Stub Rails environment task
+ @rake.define_task Rake::Task, :environment do
+ @environment_ran = true
+ end
end
def teardown
|
Ensure environment task is defined after sprockets
|
diff --git a/src/collectors/postgres/postgres.py b/src/collectors/postgres/postgres.py
index <HASH>..<HASH> 100644
--- a/src/collectors/postgres/postgres.py
+++ b/src/collectors/postgres/postgres.py
@@ -112,6 +112,8 @@ class PostgresqlCollector(diamond.collector.Collector):
if database:
conn_args['database'] = database
+ else:
+ conn_args['database'] = 'postgres'
conn = psycopg2.connect(**conn_args)
|
Enable default database for _connect()
In the event you connect with a user that doesn't have it's own
database, set the default to be 'postgres' to enable _get_db_names()
to be able to collect the list of databases.
|
diff --git a/test/test-50-fs-runtime-layer-2/main.js b/test/test-50-fs-runtime-layer-2/main.js
index <HASH>..<HASH> 100644
--- a/test/test-50-fs-runtime-layer-2/main.js
+++ b/test/test-50-fs-runtime-layer-2/main.js
@@ -29,7 +29,7 @@ function bitty (version) {
(8 * (/^(node|v)?11/.test(version))) |
(16 * (/^(node|v)?12/.test(version))) |
(16 * (/^(node|v)?13/.test(version))) |
- (16 * (/^(node|v)?14/.test(version)));
+ (32 * (/^(node|v)?14/.test(version)));
}
const version1 = process.version;
|
decouple node<I> from node<I> in test-<I>-fs-runtime-layer-2
|
diff --git a/src/org/jgroups/protocols/COMPRESS.java b/src/org/jgroups/protocols/COMPRESS.java
index <HASH>..<HASH> 100755
--- a/src/org/jgroups/protocols/COMPRESS.java
+++ b/src/org/jgroups/protocols/COMPRESS.java
@@ -4,6 +4,7 @@ import org.jgroups.Event;
import org.jgroups.Global;
import org.jgroups.Header;
import org.jgroups.Message;
+import org.jgroups.annotations.MBean;
import org.jgroups.annotations.Property;
import org.jgroups.stack.Protocol;
@@ -21,6 +22,7 @@ import java.util.zip.Inflater;
*
* @author Bela Ban
*/
+@MBean(description="Compresses messages to send and uncompresses received messages")
public class COMPRESS extends Protocol {
/* ----------------------------------------- Properties -------------------------------------------------- */
|
added @MBean annotation to be able to expose ops and attrs via JMX
|
diff --git a/samples/RecurringTask.py b/samples/RecurringTask.py
index <HASH>..<HASH> 100755
--- a/samples/RecurringTask.py
+++ b/samples/RecurringTask.py
@@ -7,7 +7,7 @@ This application demonstrates doing something at a regular interval.
import sys
from bacpypes.debugging import bacpypes_debugging, ModuleLogger
-from bacpypes.consolelogging import ConfigArgumentParser
+from bacpypes.consolelogging import ArgumentParser
from bacpypes.core import run
from bacpypes.task import RecurringTask
@@ -46,7 +46,7 @@ class PrairieDog(RecurringTask):
try:
# parse the command line arguments
- parser = ConfigArgumentParser(description=__doc__)
+ parser = ArgumentParser(description=__doc__)
# add an argument for seconds per dog
parser.add_argument('seconds', metavar='N', type=int, nargs='+',
|
this example doesn't need a configuration file
|
diff --git a/emirdrp/tools/continuum_flatfield.py b/emirdrp/tools/continuum_flatfield.py
index <HASH>..<HASH> 100644
--- a/emirdrp/tools/continuum_flatfield.py
+++ b/emirdrp/tools/continuum_flatfield.py
@@ -120,6 +120,10 @@ def main(args=None):
if args.echo:
print('\033[1m\033[31m% ' + ' '.join(sys.argv) + '\033[0m\n')
+ # This code is obsolete
+ raise ValueError('This code is obsolete: use recipe in '
+ 'emirdrp/recipes/spec/flatpix2pix.py')
+
# read calibration structure from JSON file
rectwv_coeff = RectWaveCoeff._datatype_load(args.rectwv_coeff.name)
|
Declare continuum_flatfield.py as obsolete
|
diff --git a/src/bundle/Controller/ContentViewController.php b/src/bundle/Controller/ContentViewController.php
index <HASH>..<HASH> 100644
--- a/src/bundle/Controller/ContentViewController.php
+++ b/src/bundle/Controller/ContentViewController.php
@@ -165,10 +165,10 @@ class ContentViewController extends Controller
if (!$view->getContent()->contentInfo->isTrashed()) {
$this->supplyPathLocations($view);
$this->subitemsContentViewParameterSupplier->supply($view);
+ $this->supplyContentActionForms($view);
}
$this->supplyContentType($view);
- $this->supplyContentActionForms($view);
$this->supplyDraftPagination($view, $request);
$this->supplyCustomUrlPagination($view, $request);
|
EZP-<I>: Exception after sending item from Relation List to Trash
|
diff --git a/shared/login/signup/dumb.js b/shared/login/signup/dumb.js
index <HASH>..<HASH> 100644
--- a/shared/login/signup/dumb.js
+++ b/shared/login/signup/dumb.js
@@ -1,9 +1,9 @@
// @flow
import DeviceName from '../register/set-public-name'
-import Error from './error'
+import Error from './error/index.render'
import HiddenString from '../../util/hidden-string'
import InviteCode from './invite-code.render'
-import Passphrase from './passphrase'
+import Passphrase from './passphrase/index.render'
import RequestInviteSuccess from './request-invite-success.render'
import RequesteInvite from './request-invite.render'
import Success from './success/index.render'
|
Fix broken visdiff using connected components
|
diff --git a/jax/lax.py b/jax/lax.py
index <HASH>..<HASH> 100644
--- a/jax/lax.py
+++ b/jax/lax.py
@@ -556,10 +556,15 @@ def slice(operand, start_indices, limit_indices, strides=None):
<https://www.tensorflow.org/xla/operation_semantics#slice>`_
operator.
"""
- return slice_p.bind(operand, start_indices=tuple(start_indices),
- limit_indices=tuple(limit_indices),
- strides=None if strides is None else tuple(strides),
- operand_shape=operand.shape)
+ if (onp.all(onp.equal(start_indices, 0))
+ and onp.all(onp.equal(limit_indices, operand.shape))
+ and strides is None):
+ return operand
+ else:
+ return slice_p.bind(operand, start_indices=tuple(start_indices),
+ limit_indices=tuple(limit_indices),
+ strides=None if strides is None else tuple(strides),
+ operand_shape=operand.shape)
def dynamic_slice(operand, start_indices, slice_sizes):
"""Wraps XLA's `DynamicSlice
|
avoid generating trivial lax.slice operations
|
diff --git a/ipset/ipset.go b/ipset/ipset.go
index <HASH>..<HASH> 100755
--- a/ipset/ipset.go
+++ b/ipset/ipset.go
@@ -118,12 +118,12 @@ func New(name string, hashtype string, p *Params) (*IPSet, error) {
return nil, err
}
- s := &IPSet{name, hashtype, p.HashFamily, p.HashSize, p.MaxElem, p.Timeout}
+ s := IPSet{name, hashtype, p.HashFamily, p.HashSize, p.MaxElem, p.Timeout}
err := s.createHashSet(name)
if err != nil {
return nil, err
}
- return s, nil
+ return &s, nil
}
// Refresh is used to to overwrite the set with the specified entries.
|
fixed: pointer passed to createHashSet
|
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCItem.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCItem.java
index <HASH>..<HASH> 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCItem.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCItem.java
@@ -148,9 +148,7 @@ public class MUCItem implements NamedElement {
xml.optAttribute("affiliation", getAffiliation());
xml.optAttribute("jid", getJid());
xml.optAttribute("nick", getNick());
- if (role != null && role != MUCRole.none) {
- xml.attribute("role", getRole());
- }
+ xml.optAttribute("role", getRole());
xml.rightAngleBracket();
xml.optElement("reason", getReason());
if (getActor() != null) {
|
Always include role in MUCItem if it's set
As not including "role='none'" when kicking a user will result in an
XMPPErrorException. Also there appears to be nothing in XEP-<I> which
says "if role is not set, then it defaults to 'none'".
|
diff --git a/pkg/kubelet/metrics/metrics.go b/pkg/kubelet/metrics/metrics.go
index <HASH>..<HASH> 100644
--- a/pkg/kubelet/metrics/metrics.go
+++ b/pkg/kubelet/metrics/metrics.go
@@ -77,9 +77,9 @@ func Register(containerCache kubecontainer.RuntimeCache) {
type SyncPodType int
const (
- SyncPodCreate SyncPodType = iota
+ SyncPodSync SyncPodType = iota
SyncPodUpdate
- SyncPodSync
+ SyncPodCreate
)
func (sp SyncPodType) String() string {
|
Make SyncPodSync as the default SyncPodType.
We would like the default to be sync instead of create to easily differentiate
create operations in empty metrics map.
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -624,7 +624,7 @@ enginemill.loadInitializers = function (args) {
module = require(path);
} catch (moduleError) {
if (moduleError.code === 'MODULE_NOT_FOUND') {
- if (moduleError.message.indexOf(module) !== -1) {
+ if (moduleError.message.indexOf('\'' + module + '\'') !== -1) {
throw new Errors.NotFoundError('Initializer module not found: '+ path);
}
throw moduleError;
|
better yet reporting when loading initializers
modified: index.js
|
diff --git a/lib/objectcache.rb b/lib/objectcache.rb
index <HASH>..<HASH> 100644
--- a/lib/objectcache.rb
+++ b/lib/objectcache.rb
@@ -39,5 +39,11 @@ module Ronin
@store = Og.setup(:destroy => false, :evolve_schema => :full, :store => :sqlite, :name => @path)
end
+ protected
+
+ def method_missing(sym,*args)
+ @store.send(sym,*args)
+ end
+
end
end
|
* Added a method missing to allow for more transparent access to the Og store.
|
diff --git a/lib/roar/representer/feature/hypermedia.rb b/lib/roar/representer/feature/hypermedia.rb
index <HASH>..<HASH> 100644
--- a/lib/roar/representer/feature/hypermedia.rb
+++ b/lib/roar/representer/feature/hypermedia.rb
@@ -6,6 +6,8 @@ module Roar
# Adds links methods to the model which can then be used for hypermedia links when
# representing the model.
module Hypermedia # TODO: test me.
+ extend ActiveSupport::Concern
+
def links=(links)
@links = links.collect do |link|
Roar::Representer::XML::Hyperlink.from_attributes(link)
@@ -21,6 +23,22 @@ module Roar
link = find { |l| l.rel.to_s == rel.to_s } and return link.href
end
end
+
+
+ module ClassMethods
+ # Defines an embedded hypermedia link.
+ def link(rel, &block)
+ unless links = representable_attrs.find { |d| d.is_a?(LinksDefinition)}
+ links = LinksDefinition.new(:links, links_definition_options)
+ representable_attrs << links
+ add_reader(links) # TODO: refactor in Roxml.
+ attr_writer(links.accessor)
+ end
+
+ links.rel2block << {:rel => rel, :block => block}
+ end
+ end
+
end
end
end
|
moving hypermedia code to Hypermedia.
|
diff --git a/sharding-core/src/main/java/io/shardingsphere/core/parsing/parser/sql/dql/select/AbstractSelectParser.java b/sharding-core/src/main/java/io/shardingsphere/core/parsing/parser/sql/dql/select/AbstractSelectParser.java
index <HASH>..<HASH> 100755
--- a/sharding-core/src/main/java/io/shardingsphere/core/parsing/parser/sql/dql/select/AbstractSelectParser.java
+++ b/sharding-core/src/main/java/io/shardingsphere/core/parsing/parser/sql/dql/select/AbstractSelectParser.java
@@ -83,10 +83,6 @@ public abstract class AbstractSelectParser implements SQLParser {
protected abstract void parseInternal(SelectStatement selectStatement);
- protected final void parseDistinct() {
- selectClauseParserFacade.getDistinctClauseParser().parse();
- }
-
protected final void parseSelectList(final SelectStatement selectStatement, final List<SelectItem> items) {
selectClauseParserFacade.getSelectListClauseParser().parse(selectStatement, items);
}
|
delete parseDistinct()
|
diff --git a/lib/core/thorinCore.js b/lib/core/thorinCore.js
index <HASH>..<HASH> 100644
--- a/lib/core/thorinCore.js
+++ b/lib/core/thorinCore.js
@@ -1119,7 +1119,6 @@ var _exitSignal = null;
function bindProcessEvents() {
if (this.env === 'development') return;
var self = this;
-
function onSignal(code) {
if (_exitSignal) {
return process.exit(0);
diff --git a/lib/util/util.js b/lib/util/util.js
index <HASH>..<HASH> 100644
--- a/lib/util/util.js
+++ b/lib/util/util.js
@@ -514,7 +514,6 @@ class ThorinUtils {
let targetObj = targetMap[sid];
if (typeof targetObj !== 'object' || !targetObj) continue;
itm[sourceField] = targetObj;
- delete itm[sourceId];
}
// next loop over targets
targetMap = null;
diff --git a/package.json b/package.json
index <HASH>..<HASH> 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "thorin",
"author": "UNLOQ Systems",
- "version": "1.1.39",
+ "version": "1.1.40",
"dependencies": {
"async": "1.4.2",
"camelcase": "2.1.1",
|
mergeItems no longer deletes the source id
|
diff --git a/forms_builder/forms/models.py b/forms_builder/forms/models.py
index <HASH>..<HASH> 100644
--- a/forms_builder/forms/models.py
+++ b/forms_builder/forms/models.py
@@ -27,6 +27,8 @@ FIELD_CHOICES = (
("CharField/django.forms.Textarea", _("Multi line text")),
("EmailField", _("Email")),
("BooleanField", _("Check box")),
+ ("MultipleChoiceField/django.forms.CheckboxSelectMultiple",
+ _("Check boxes")),
("ChoiceField", _("Drop down")),
("MultipleChoiceField", _("Multi select")),
("ChoiceField/django.forms.RadioSelect", _("Radio buttons")),
|
Add multiple check boxes as a field type.
|
diff --git a/tests/TaxonomyArchiveGeneratorTest.php b/tests/TaxonomyArchiveGeneratorTest.php
index <HASH>..<HASH> 100644
--- a/tests/TaxonomyArchiveGeneratorTest.php
+++ b/tests/TaxonomyArchiveGeneratorTest.php
@@ -18,13 +18,15 @@ class TaxonomyArchiveGeneratorTest extends CommandTestBase
$this->copyDirectory('assets/build_test_23/src', '_tmp');
// <Bootstrap Tapestry>
- $tapestry = new Tapestry(new ArrayInput([]));
+ $tapestry = new Tapestry(new ArrayInput([
+ '--site-dir' => __DIR__ . DIRECTORY_SEPARATOR . '_tmp',
+ '--env' => 'testing'
+ ]));
$generator = new Generator($tapestry->getContainer()->get('Compile.Steps'), $tapestry);
- $project = new Project(__DIR__ . DIRECTORY_SEPARATOR . '_tmp', 'testing');
+ /** @var Project $project */
+ $project = $tapestry->getContainer()->get(Project::class);
$project->set('cmd_options', []);
-
- $tapestry->getContainer()->add(Project::class, $project);
$generator->generate($project, new NullOutput);
// </Bootstrap Tapestry>
|
:fire: Bringing test in line with new method of constructing Project
|
diff --git a/code/model/fieldtypes/Markdown.php b/code/model/fieldtypes/Markdown.php
index <HASH>..<HASH> 100644
--- a/code/model/fieldtypes/Markdown.php
+++ b/code/model/fieldtypes/Markdown.php
@@ -56,7 +56,7 @@ class Markdown extends Text {
$curl=curl_init('https://api.github.com/markdown');
curl_setopt($curl, CURLOPT_HEADER, false);
curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
- curl_setopt($curl, CURLOPT_HTTPHEADER, array("Content-type: application/json"));
+ curl_setopt($curl, CURLOPT_HTTPHEADER, array("Content-type: application/json", "User-Agent: curl"));
curl_setopt($curl, CURLOPT_POST, true);
curl_setopt($curl, CURLOPT_POSTFIELDS, $content);
curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
|
Fix bug where github API call would fail because no User-Agent was set on the HTTP Request
|
diff --git a/annis-gui/src/main/java/annis/gui/resultview/VisualizerPanel.java b/annis-gui/src/main/java/annis/gui/resultview/VisualizerPanel.java
index <HASH>..<HASH> 100644
--- a/annis-gui/src/main/java/annis/gui/resultview/VisualizerPanel.java
+++ b/annis-gui/src/main/java/annis/gui/resultview/VisualizerPanel.java
@@ -138,10 +138,10 @@ public class VisualizerPanel extends Panel implements Button.ClickListener
}
compVis = (ComponentVisualizerPlugin) vis;
- this.setWidth("100%");
- label = new Label("KWIC");
- this.setContent(this.visContainer);
- this.visContainer.addComponent(label, "btEntry");
+
+ this.addStyleName(ChameleonTheme.PANEL_BORDERLESS);
+ this.setWidth("100%");
+ this.setContent(this.visContainer);
}
public VisualizerPanel(final ResolverEntry entry, SDocument result,
|
Make the component visualizer borderless.
|
diff --git a/backup/controller/backup_controller.class.php b/backup/controller/backup_controller.class.php
index <HASH>..<HASH> 100644
--- a/backup/controller/backup_controller.class.php
+++ b/backup/controller/backup_controller.class.php
@@ -65,6 +65,16 @@ class backup_controller extends backup implements loggable {
protected $checksum; // Cache @checksumable results for lighter @is_checksum_correct() uses
+ /**
+ * Constructor for the backup controller class.
+ *
+ * @param int $type Type of the backup; One of backup::TYPE_1COURSE, TYPE_1SECTION, TYPE_1ACTIVITY
+ * @param int $id The ID of the item to backup; e.g the course id
+ * @param int $format The backup format to use; Most likely backup::FORMAT_MOODLE
+ * @param bool $interactive Whether this backup will require user interaction; backup::INTERACTIVE_YES or INTERACTIVE_NO
+ * @param int $mode One of backup::MODE_GENERAL, MODE_IMPORT, MODE_SAMESITE, MODE_HUB
+ * @param int $userid The id of the user making the backup
+ */
public function __construct($type, $id, $format, $interactive, $mode, $userid){
$this->type = $type;
$this->id = $id;
@@ -254,6 +264,10 @@ class backup_controller extends backup implements loggable {
return $this->logger;
}
+ /**
+ * Executes the backup
+ * @return void Throws and exception of completes
+ */
public function execute_plan() {
return $this->plan->execute();
}
|
backup MDL-<I> Updating a couple of PHP docs
|
diff --git a/spec/unit/system_spec.rb b/spec/unit/system_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/unit/system_spec.rb
+++ b/spec/unit/system_spec.rb
@@ -407,6 +407,8 @@ describe "Ohai::System" do
E
it "runs all the plugins" do
+ # disable a few slow running plugins
+ Ohai.config[:disabled_plugins] = %i{Packages Virtualbox Ruby}
ohai.run_additional_plugins(@plugins_directory)
expect(ohai.data[:canteloupe][:english][:version]).to eq(2014)
expect(ohai.data[:canteloupe][:french][:version]).to eq(2012)
|
Speedup the slowest spec by running fewer plugins
This spec runs the entire Ohai suite, which can take a bit of time. let's disable the slowest stuff to speed it up a bit.
|
diff --git a/lib/xcodeproj/project/xcproj_helper.rb b/lib/xcodeproj/project/xcproj_helper.rb
index <HASH>..<HASH> 100644
--- a/lib/xcodeproj/project/xcproj_helper.rb
+++ b/lib/xcodeproj/project/xcproj_helper.rb
@@ -83,7 +83,7 @@ module Xcodeproj
@objc_class ||= CoreFoundation.objc_getClass('PBXProject')
end
- XCODE_PATH = Pathname.new('/Applications/Xcode.app/Contents')
+ XCODE_PATH = Pathname.new(`xcode-select -p`).join('../..')
def self.image
Fiddle.dlopen(XCODE_PATH.join('SharedFrameworks/DVTFoundation.framework/DVTFoundation').to_s)
|
Use `xcode-select -p` to determine path.
|
diff --git a/examples/v4/collections/create-a-collection.php b/examples/v4/collections/create-a-collection.php
index <HASH>..<HASH> 100644
--- a/examples/v4/collections/create-a-collection.php
+++ b/examples/v4/collections/create-a-collection.php
@@ -8,7 +8,7 @@ use Billplz\API;
use Billplz\Connect;
$connect = (new Connect('<api-key-here>'))->detectMode();
-//$connect->setMode(true); // true: staging | false: production (default)
+//$connect->setMode(true); // true: production | false: staging (default)
$billplz = new API($connect);
|
Update setMode() description.
Documented values seem to be opposite the actual API.
|
diff --git a/analyzers/EmlParser/parse.py b/analyzers/EmlParser/parse.py
index <HASH>..<HASH> 100755
--- a/analyzers/EmlParser/parse.py
+++ b/analyzers/EmlParser/parse.py
@@ -68,7 +68,7 @@ def parseEml(filepath):
#splited string because it was returning the body inside 'Content-Type'
hParser = email.parser.HeaderParser()
h = str(hParser.parsestr(raw_eml))
- result['headers'] = h[:h.index('Content-Type:')]
+ result['headers'] = h[:h.lower().index('content-type:')]
parsed_eml = eml_parser.eml_parser.decode_email(filepath, include_raw_body=True, include_attachment_data=True)
#parsed_eml['header'].keys() gives:
|
Fix bug emlparser when 'content-type' string in mail is in lower case
Emlparser crashes when the string "Content-Type" is not found. In some cases it's available as "Content-type" or "content-type" , this fixes those cases
|
diff --git a/src/Reporter/Verbose.php b/src/Reporter/Verbose.php
index <HASH>..<HASH> 100644
--- a/src/Reporter/Verbose.php
+++ b/src/Reporter/Verbose.php
@@ -55,6 +55,14 @@ class Verbose extends Terminal
*/
public function end($summary)
{
+ $this->write("\n");
+
+ foreach ($summary->logs() as $log) {
+ if (!$log->passed()) {
+ $this->_report($log);
+ }
+ }
+
$this->write("\n\n");
$this->_reportSummary($summary);
}
|
Report all failures at the end of verbose reporting.
|
diff --git a/django_mock_queries/query.py b/django_mock_queries/query.py
index <HASH>..<HASH> 100644
--- a/django_mock_queries/query.py
+++ b/django_mock_queries/query.py
@@ -228,8 +228,8 @@ def MockSet(*initial_items, **kwargs):
return mock_set
-def MockModel(cls=None, mock_name=None, **attrs):
- mock_attrs = dict(spec=cls, name=mock_name)
+def MockModel(cls=None, mock_name=None, spec_set=None, **attrs):
+ mock_attrs = dict(spec=cls, name=mock_name, spec_set=spec_set)
mock_model = MagicMock(**mock_attrs)
if mock_name:
|
added spec_set to MockModel
|
diff --git a/pg13/__init__.py b/pg13/__init__.py
index <HASH>..<HASH> 100644
--- a/pg13/__init__.py
+++ b/pg13/__init__.py
@@ -1,3 +1,3 @@
import misc,diff,pg,redismodel,syncschema
# don't import pgmock and stubredis -- they're only useful for test mode or nonstandard env (i.e. stubredis on windows)
-__version__ = '0.0.4'
+__version__ = '0.0.5'
|
bumping version (joins didn't work in <I>)
|
diff --git a/_examples/sql/main.go b/_examples/sql/main.go
index <HASH>..<HASH> 100644
--- a/_examples/sql/main.go
+++ b/_examples/sql/main.go
@@ -136,7 +136,7 @@ var sqlParser = participle.MustBuild(&Select{}, sqlLexer)
func main() {
kingpin.Parse()
sql := &Select{}
- err := sqlParser.ParseString(`SELECT u.name, age, date_of_birth AS dob FROM user AS u`, sql)
+ err := sqlParser.ParseString(`SELECT u.name, u.age, u.date_of_birth AS dob FROM user AS u`, sql)
kingpin.FatalIfError(err, "")
repr.Println(sql, repr.Indent(" "), repr.OmitEmpty())
}
|
Added "FROM" support to SQL parser.
|
diff --git a/runtests/mpi/tester.py b/runtests/mpi/tester.py
index <HASH>..<HASH> 100644
--- a/runtests/mpi/tester.py
+++ b/runtests/mpi/tester.py
@@ -373,6 +373,8 @@ class Tester(BaseTester):
# see the faq:
# https://www.open-mpi.org/faq/?category=running#oversubscribing
os.environ['OMPI_MCA_rmaps_base_oversubscribe'] = '1'
+ os.environ['OMPI_MCA_rmaps_base_no_oversubscribe'] = '0'
+ os.environ['OMPI_MCA_mpi_yield_when_idle'] = '1'
os.execvp(mpirun[0], mpirun + cmdargs + additional)
|
Set a few more OMPI parameters related to 'oversubscribe'.
|
diff --git a/core/common/src/test/java/alluxio/worker/block/io/LocalFileBlockWriterTest.java b/core/common/src/test/java/alluxio/worker/block/io/LocalFileBlockWriterTest.java
index <HASH>..<HASH> 100644
--- a/core/common/src/test/java/alluxio/worker/block/io/LocalFileBlockWriterTest.java
+++ b/core/common/src/test/java/alluxio/worker/block/io/LocalFileBlockWriterTest.java
@@ -56,7 +56,7 @@ public final class LocalFileBlockWriterTest {
}
@Test
- public void transferFrom() throws Exception {
+ public void appendByteBuf() throws Exception {
ByteBuf buffer = Unpooled.wrappedBuffer(
BufferUtils.getIncreasingByteBuffer(TEST_BLOCK_SIZE));
buffer.markReaderIndex();
|
Update LocalFileBlockWriterTest.java
|
diff --git a/tests/test_node_tracers.js b/tests/test_node_tracers.js
index <HASH>..<HASH> 100644
--- a/tests/test_node_tracers.js
+++ b/tests/test_node_tracers.js
@@ -126,7 +126,7 @@ module.exports = {
test_espresso: function(test) {
var express = require('express');
var http = require('http');
-
+ var request = require('request');
var a = express();
var s = http.createServer(a);
@@ -142,5 +142,6 @@ module.exports = {
});
s.listen('8001');
+ request.get('http://localhost:8001');
}
};
|
Now with working example- need to call the .get method to trigger the close. Also, we can't call close too early in case the server hasn't had time to set up yet (async and all).
|
diff --git a/apps/Sandbox/bootstrap/contexts/api.php b/apps/Sandbox/bootstrap/contexts/api.php
index <HASH>..<HASH> 100644
--- a/apps/Sandbox/bootstrap/contexts/api.php
+++ b/apps/Sandbox/bootstrap/contexts/api.php
@@ -80,6 +80,10 @@ OK: {
}
ERROR: {
+ if (PHP_SAPI === 'cli') {
+ $app->exceptionHandler->handle($e);
+ exit;
+ }
http_response_code($code);
echo $body;
exit(1);
|
[#<I>] exception is handle by api.php in develop
|
diff --git a/src/Picqer/Financials/Exact/Query/Findable.php b/src/Picqer/Financials/Exact/Query/Findable.php
index <HASH>..<HASH> 100644
--- a/src/Picqer/Financials/Exact/Query/Findable.php
+++ b/src/Picqer/Financials/Exact/Query/Findable.php
@@ -138,6 +138,12 @@ trait Findable
while ($this->connection()->nextUrl !== null)
{
$nextResult = $this->connection()->get($this->connection()->nextUrl);
+
+ // If we have one result which is not an assoc array, make it the first element of an array for the array_merge function
+ if ((bool) count(array_filter(array_keys($nextResult), 'is_string'))) {
+ $nextResult = [ $nextResult ];
+ }
+
$result = array_merge($result, $nextResult);
}
$collection = [ ];
|
Handle next pages single result as an element of array
Handle next page single result from Exact API not delivered as an array of elements by making the single item the first element of an (new) array.
|
diff --git a/keep/utils.py b/keep/utils.py
index <HASH>..<HASH> 100644
--- a/keep/utils.py
+++ b/keep/utils.py
@@ -105,6 +105,13 @@ def pull(ctx, overwrite):
def register():
+
+ if not os.path.exists(dir_path):
+ click.secho("\n[CRITICAL] {0} does not exits.\nPlease run 'keep init',"
+ " and try registering again.\n".format(dir_path),
+ fg="red", err=True)
+ sys.exit(1)
+
# User may not choose to register and work locally.
# Registration is required to push the commands to server
if click.confirm('Proceed to register?', abort=True, default=True):
|
Add check for ~/.keep/ when registering
|
diff --git a/db/seeds.rb b/db/seeds.rb
index <HASH>..<HASH> 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -17,6 +17,9 @@ INSERT INTO pilgrim_cities VALUES
;
'
+ActiveRecord::Base.connection.execute('truncate table pilgrim_countries;')
ActiveRecord::Base.connection.execute(countries)
+ActiveRecord::Base.connection.execute('truncate table pilgrim_states;')
ActiveRecord::Base.connection.execute(states)
+ActiveRecord::Base.connection.execute('truncate table pilgrim_cities;')
ActiveRecord::Base.connection.execute(cities)
\ No newline at end of file
diff --git a/lib/pilgrim/version.rb b/lib/pilgrim/version.rb
index <HASH>..<HASH> 100644
--- a/lib/pilgrim/version.rb
+++ b/lib/pilgrim/version.rb
@@ -1,3 +1,3 @@
module Pilgrim
- VERSION = "0.1.5"
+ VERSION = "0.1.6"
end
|
Add truncates to pilgrim tables before inserts
|
diff --git a/stdeb/util.py b/stdeb/util.py
index <HASH>..<HASH> 100644
--- a/stdeb/util.py
+++ b/stdeb/util.py
@@ -349,7 +349,6 @@ class DebianInfo:
if has_ext_modules:
debinfo.architecture = 'any'
depends.append('${shlibs:Depends}')
- build_deps.extend(['gcc','libc6-dev'])
else:
debinfo.architecture = 'all'
|
revert last change -- anyone building from source should have 'build-essential' installed, which includes gcc and libc6-dev
git-svn-id: <URL>
|
diff --git a/src/string/capitalize.js b/src/string/capitalize.js
index <HASH>..<HASH> 100644
--- a/src/string/capitalize.js
+++ b/src/string/capitalize.js
@@ -4,6 +4,7 @@
*/
/*#ifndef(UMD)*/
"use strict";
+/*global _GPF_START*/ // 0
/*exported _gpfStringCapitalize*/ // Capitalize the string
/*#endif*/
@@ -15,7 +16,8 @@
* @since 0.1.5
*/
function _gpfStringCapitalize (that) {
- return that.charAt(0).toUpperCase() + that.substr(1);
+ var REMAINDER = 1;
+ return that.charAt(_GPF_START).toUpperCase() + that.substring(REMAINDER);
}
/*#ifndef(UMD)*/
|
no-magic-numbers (#<I>)
|
diff --git a/ewma/rate.go b/ewma/rate.go
index <HASH>..<HASH> 100644
--- a/ewma/rate.go
+++ b/ewma/rate.go
@@ -62,7 +62,7 @@ func (r *EwmaRate) Current(now time.Time) float64 {
return 0
}
- if r.Ewma.lastTimestamp == now {
+ if r.Ewma.lastTimestamp == now || now.Before(r.Ewma.lastTimestamp) {
return r.Ewma.Current
}
|
ewma: handle a situation of time going back
or race condition between code reading and updating rates
|
diff --git a/lib/doorkeeper/config.rb b/lib/doorkeeper/config.rb
index <HASH>..<HASH> 100644
--- a/lib/doorkeeper/config.rb
+++ b/lib/doorkeeper/config.rb
@@ -99,7 +99,7 @@ module Doorkeeper
option :resource_owner_authenticator, :as => :authenticate_resource_owner
option :admin_authenticator, :as => :authenticate_admin
option :access_token_expires_in, :default => 7200
- option :authorization_scopes, :as => :scopes, :builder_class => ScopesBuilder
+ option :authorization_scopes, :as => :scopes, :builder_class => ScopesBuilder, :default => Scopes.new
def refresh_token_enabled?
!!@refresh_token_enabled
diff --git a/spec/lib/config_spec.rb b/spec/lib/config_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/lib/config_spec.rb
+++ b/spec/lib/config_spec.rb
@@ -48,6 +48,14 @@ describe Doorkeeper, "configuration" do
subject.scopes[:public].description.should == "Public"
subject.scopes[:public].default.should == true
end
+
+ it "returns empty Scopes collection if no scopes were defined" do
+ Doorkeeper.configure do
+ end
+
+ subject.scopes.should be_a(Doorkeeper::Scopes)
+ subject.scopes.all.should == []
+ end
end
describe "use_refresh_token" do
|
Handle situation when user did not specify any scopes
If user did not specify any scopes in the initializer the application would
by default have empty Scopes collection.
|
diff --git a/pyrogram/client/types/message.py b/pyrogram/client/types/message.py
index <HASH>..<HASH> 100644
--- a/pyrogram/client/types/message.py
+++ b/pyrogram/client/types/message.py
@@ -26,9 +26,6 @@ class Message(Object):
Args:
message_id (``int``):
Unique message identifier inside this chat.
-
- client (:obj:`Client <pyrogram.Client>`, *optional*):
- The client instance this message is bound to.
date (``int``, *optional*):
Date the message was sent in Unix time.
|
Don't document client, is for internal purposes only
|
diff --git a/test/03list.js b/test/03list.js
index <HASH>..<HASH> 100644
--- a/test/03list.js
+++ b/test/03list.js
@@ -53,4 +53,14 @@ describe('list() method tests', function () {
let data = await sftp.list('.');
return expect(data).to.containSubset([{ type: 'd', name: 'testServer' }]);
});
+
+ it('list with ".." path', async function () {
+ let data = await sftp.list('..');
+ return expect(data).to.containSubset([{ type: 'd', name: 'tim' }]);
+ });
+
+ it('list with "../testServer" path', async function () {
+ let data = await sftp.list('../tim');
+ return expect(data).to.containSubset([{ type: 'd', name: 'testServer' }]);
+ });
});
|
Add additional relative path tests to list() method
|
diff --git a/mod/scorm/lib.php b/mod/scorm/lib.php
index <HASH>..<HASH> 100755
--- a/mod/scorm/lib.php
+++ b/mod/scorm/lib.php
@@ -579,6 +579,9 @@ function scorm_startElement($parser, $name, $attrs) {
function scorm_endElement($parser, $name) {
global $scoes,$i,$level,$datacontent,$manifest,$organization,$version;
+
+ $datacontent = trim($datacontent);
+
if ($name == 'ITEM') {
$level--;
}
@@ -618,11 +621,12 @@ function scorm_endElement($parser, $name) {
$version = 'SCORM_1.2';
}
}
-}
+ $datacontent = '';
+}
function scorm_characterData($parser, $data) {
global $datacontent;
- $datacontent = utf8_decode($data);
+ $datacontent .= utf8_decode($data);
}
function scorm_parse($pkgdir,$pkgtype,$scormid){
|
Fixed a problem with altered chars in UTF-8
|
diff --git a/drools-api/src/main/java/org/drools/runtime/rule/PropagationContext.java b/drools-api/src/main/java/org/drools/runtime/rule/PropagationContext.java
index <HASH>..<HASH> 100644
--- a/drools-api/src/main/java/org/drools/runtime/rule/PropagationContext.java
+++ b/drools-api/src/main/java/org/drools/runtime/rule/PropagationContext.java
@@ -9,6 +9,15 @@ public interface PropagationContext {
public static final int RULE_ADDITION = 3;
public static final int RULE_REMOVAL = 4;
public static final int EXPIRATION = 5;
+
+ public static final String[] typeDescr = new String[] {
+ "ASSERTION",
+ "RETRACTION",
+ "MODIFICATION",
+ "RULE_ADDITION",
+ "RULE_REMOVAL",
+ "EXPIRATION"
+ };
public long getPropagationNumber();
|
Improving support for idle and time to next job
git-svn-id: <URL>
|
diff --git a/views/js/ui/modal.js b/views/js/ui/modal.js
index <HASH>..<HASH> 100644
--- a/views/js/ui/modal.js
+++ b/views/js/ui/modal.js
@@ -224,11 +224,15 @@ define(['jquery', 'core/pluginifier', 'core/dataattrhandler'], function ($, Plug
//Calculate the top offset
topOffset = (options.vCenter || modalHeight > windowHeight) ? 40 : (windowHeight - modalHeight) / 2;
// check scroll if element in the scrolled container
- $element.parents().map(function () {
- if (this.tagName !== 'BODY' && this.tagName !== 'HTML') {
- topOffset += parseInt($(this).scrollTop(), 10);
- }
- });
+ // added later: now offset will be increased only if container element doesn't has class no-scroll-offset
+ // as, sometimes, on screens with lesser height part of modal runs under the bottom browser edge
+ if (!$element.parent().hasClass('no-scroll-offset')) {
+ $element.parents().map(function () {
+ if (this.tagName !== 'BODY' && this.tagName !== 'HTML') {
+ topOffset += parseInt($(this).scrollTop(), 10);
+ }
+ });
+ }
to = {
'opacity': '1',
'top': topOffset + 'px'
|
Modal top offset will be now increased only if its direct container has no class 'no-scroll-offset' (added because sometimes modal bottom part runs under the lower edge of browser);
|
diff --git a/ansible_runner/runner_config.py b/ansible_runner/runner_config.py
index <HASH>..<HASH> 100644
--- a/ansible_runner/runner_config.py
+++ b/ansible_runner/runner_config.py
@@ -624,13 +624,6 @@ class RunnerConfig(object):
)
])
- if self.cli_execenv_cmd == 'adhoc':
- new_args.extend([
- "-v", "{}:/runner/project/".format(
- os.path.dirname(self.private_data_dir),
- )
- ])
-
# volume mount inventory into the exec env container if provided at cli
if '-i' in self.cmdline_args:
inventory_file_path = self.cmdline_args[self.cmdline_args.index('-i') + 1]
|
don't mount private_data_dir in container twice (adhoc)
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.