diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/src/Html5Video/Html5Video.php b/src/Html5Video/Html5Video.php
index <HASH>..<HASH> 100644
--- a/src/Html5Video/Html5Video.php
+++ b/src/Html5Video/Html5Video.php
@@ -64,7 +64,7 @@ class Html5Video {
* @param object $cache Cache object to store ffmpeg settings
*/
function __construct($config = array(), $process = null, $cache = null) {
- $this->config = array_merge((array) $config, $this->defaults);
+ $this->config = array_merge($this->defaults, (array) $config);
$this->config['profile.dirs'] = (array) $this->config['profile.dirs'];
$this->config['profile.dirs'][] = __DIR__ . DIRECTORY_SEPARATOR . 'Profiles';
|
Fix config merging in constructor
|
diff --git a/swarm/api/http/server.go b/swarm/api/http/server.go
index <HASH>..<HASH> 100644
--- a/swarm/api/http/server.go
+++ b/swarm/api/http/server.go
@@ -115,7 +115,11 @@ func handler(w http.ResponseWriter, r *http.Request, a *api.Api) {
switch {
case r.Method == "POST" || r.Method == "PUT":
- key, err := a.Store(r.Body, r.ContentLength, nil)
+ if r.Header.Get("content-length") == "" {
+ http.Error(w, "Missing Content-Length header in request.", http.StatusBadRequest)
+ return
+ }
+ key, err := a.Store(io.LimitReader(r.Body, r.ContentLength), r.ContentLength, nil)
if err == nil {
glog.V(logger.Debug).Infof("Content for %v stored", key.Log())
} else {
|
swarm/api/http: reject requests without content-length
|
diff --git a/bids/variables/io.py b/bids/variables/io.py
index <HASH>..<HASH> 100644
--- a/bids/variables/io.py
+++ b/bids/variables/io.py
@@ -365,7 +365,7 @@ def _load_tsv_variables(layout, suffix, dataset=None, columns=None,
for f in files:
- _data = pd.read_csv(f.path, sep='\t')
+ _data = f.get_df(include_timing=False)
# Entities can be defined either within the first column of the .tsv
# file (for entities that vary by row), or from the full file path
|
load DFs via BIDSDataFile; closes #<I>
|
diff --git a/src/Elcodi/CurrencyBundle/Entity/Money.php b/src/Elcodi/CurrencyBundle/Entity/Money.php
index <HASH>..<HASH> 100644
--- a/src/Elcodi/CurrencyBundle/Entity/Money.php
+++ b/src/Elcodi/CurrencyBundle/Entity/Money.php
@@ -77,6 +77,10 @@ class Money extends StubMoney implements MoneyInterface
*/
public function setCurrency(CurrencyInterface $currency)
{
+ $this->wrappedMoney = new WrappedMoney(
+ $this->amount,
+ new WrappedCurrency($currency->getIso())
+ );
$this->currency = $currency;
return $this;
@@ -101,6 +105,12 @@ class Money extends StubMoney implements MoneyInterface
*/
public function setAmount($amount)
{
+ $amount = intval($amount);
+
+ $this->wrappedMoney = new WrappedMoney(
+ $amount,
+ new WrappedCurrency($this->currency->getIso())
+ );
$this->amount = $amount;
return $this;
@@ -113,6 +123,7 @@ class Money extends StubMoney implements MoneyInterface
*/
public function getAmount()
{
+ //var_dump($this->wrappedMoney->getAmount());
return $this->wrappedMoney->getAmount();
}
|
Setters for Money value object
Although setters for individual fields should not be allowed
in value objects, it was necessary to implement setCurrency and
setAmount in order to make the class collaborate with a Symfony
form types. Internally, the Form component uses setters to "attach" form
data to entity classes, so public setters were needed
|
diff --git a/lib/data_mapper/resource.rb b/lib/data_mapper/resource.rb
index <HASH>..<HASH> 100644
--- a/lib/data_mapper/resource.rb
+++ b/lib/data_mapper/resource.rb
@@ -350,13 +350,7 @@ module DataMapper
#-
# @api public
def repository(name = nil, &block)
- if name
- DataMapper.repository(name, &block)
- elsif Repository.context.last
- DataMapper.repository(nil, &block)
- else
- DataMapper.repository(default_repository_name, &block)
- end
+ DataMapper.repository( Repository.context.last ? nil : name || default_repository_name ,&block)
end
##
|
cleaned up Resource::ClassMethods#repository
|
diff --git a/pkg/setting/provider.go b/pkg/setting/provider.go
index <HASH>..<HASH> 100644
--- a/pkg/setting/provider.go
+++ b/pkg/setting/provider.go
@@ -49,6 +49,8 @@ type Provider interface {
// RegisterReloadHandler registers a handler for validation and reload
// of configuration updates tied to a specific section
RegisterReloadHandler(section string, handler ReloadHandler)
+ // IsFeatureToggleEnabled checks if the feature's toggle is enabled
+ IsFeatureToggleEnabled(name string) bool
}
// Section is a settings section copy
@@ -129,6 +131,10 @@ func (o *OSSImpl) Section(section string) Section {
func (OSSImpl) RegisterReloadHandler(string, ReloadHandler) {}
+func (o OSSImpl) IsFeatureToggleEnabled(name string) bool {
+ return o.Cfg.FeatureToggles[name]
+}
+
type keyValImpl struct {
key *ini.Key
}
|
Settings: Add a method to Provider interface to check if a feature is enabled (#<I>)
* Settings: Add method to Provider interface to get feature toggles
* Apply review comment
|
diff --git a/lib/chef/formatters/base.rb b/lib/chef/formatters/base.rb
index <HASH>..<HASH> 100644
--- a/lib/chef/formatters/base.rb
+++ b/lib/chef/formatters/base.rb
@@ -213,7 +213,7 @@ class Chef
end
def deprecation(message, location=caller(2..2)[0])
- Chef.log_deprecation("#{message} at #{location}")
+ Chef::Log.deprecation("#{message} at #{location}")
end
end
|
I think this was a bad search-and-replace, causes an infinite loop.
|
diff --git a/tests/test_menu_launcher.py b/tests/test_menu_launcher.py
index <HASH>..<HASH> 100644
--- a/tests/test_menu_launcher.py
+++ b/tests/test_menu_launcher.py
@@ -273,22 +273,12 @@ def test_running_menu():
# go to logs menu
child.sendline('1')
child.expect('Return to System Commands menu')
- # go to containers menu
- child.sendline('1')
- child.expect('error')
- # kill child
- child.close()
- # create new child
- child1 = pexpect.spawn(cmd)
- child1.timeout = 600
- # expect Main Menu
- child1.expect('Exit')
- # go to System Commands
- child.sendline('5')
- child.expect('Return to Vent menu')
- # go to logs menu
- child.sendline('1')
- child.expect('Return to System Commands menu')
+
+ # # go to containers menu
+ # child.sendline('1')
+ # # curses blows up because the length of the menu exceeds the terminal size
+ # child.expect('error')
+
# go to namespace menu
child.sendline('2')
child.expect('Please select a namespace:')
|
identified issue with logs > container logs; commenting out until solved in menu_launcher.
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -1 +1 @@
-module.exports = new (require('./lib/logtrail'));
\ No newline at end of file
+module.exports = new (require('./lib/logtrail'));
diff --git a/lib/formatters/default.js b/lib/formatters/default.js
index <HASH>..<HASH> 100644
--- a/lib/formatters/default.js
+++ b/lib/formatters/default.js
@@ -15,13 +15,14 @@ exports.format = function (entry, type, args, stack) {
}
if (this._confs.timestamps && this._confs.timestamps.enabled) {
- now = ' ' + moment().format(this._confs.timestamps.format).grey;
+ now = moment().format(this._confs.timestamps.format).grey;
}
if (this._confs.stacktrace) {
- stacktrace = path.relative(this._confs.basedir, stack[0].getFileName()) + ':' + stack[0].getLineNumber();
+ stacktrace = path.relative(this._confs.basedir, stack[0].getFileName()) +
+ ':' + stack[0].getLineNumber();
stacktrace = stacktrace.grey;
}
- return util.format('%s%s %s\n', stacktrace, now, matter);
-}
\ No newline at end of file
+ return util.format('%s %s %s\n', now, stacktrace, matter);
+}
|
just some cosmetic changes to formatters
move along, nothing to see here
|
diff --git a/Tests/Functional/TestKernel.php b/Tests/Functional/TestKernel.php
index <HASH>..<HASH> 100644
--- a/Tests/Functional/TestKernel.php
+++ b/Tests/Functional/TestKernel.php
@@ -16,9 +16,9 @@ namespace Hackzilla\Bundle\TicketBundle\Tests\Functional;
use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
use Hackzilla\Bundle\TicketBundle\HackzillaTicketBundle;
use Hackzilla\Bundle\TicketBundle\Model\TicketMessageWithAttachment;
-use Hackzilla\Bundle\TicketBundle\Tests\Functional\Entity\Ticket;
-use Hackzilla\Bundle\TicketBundle\Tests\Functional\Entity\TicketMessage;
-use Hackzilla\Bundle\TicketBundle\Tests\Functional\Entity\User;
+use Hackzilla\Bundle\TicketBundle\Tests\Fixtures\Entity\Ticket;
+use Hackzilla\Bundle\TicketBundle\Tests\Fixtures\Entity\TicketMessage;
+use Hackzilla\Bundle\TicketBundle\Tests\Fixtures\Entity\User;
use Knp\Bundle\PaginatorBundle\KnpPaginatorBundle;
use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
|
Update use statements to reflect entities moved to fixtures
|
diff --git a/lib/providers/MongoDB.Provider.js b/lib/providers/MongoDB.Provider.js
index <HASH>..<HASH> 100644
--- a/lib/providers/MongoDB.Provider.js
+++ b/lib/providers/MongoDB.Provider.js
@@ -97,9 +97,11 @@ function MongoDB(config) {
// uniform error messages
this.missing_data_err = "Missing 'data' argument.";
- this.missing_data_id_err = "Missing 'data._id' property.";
+ this.missing_data_id_err = "Missing 'data._id' argument.";
this.missing_key_err = "Missing 'key' argument.";
this.missing_callback_err = "Missing 'callback' argument.";
+ this.callback_not_an_Object_err = "Argument 'data' must be of type Object.";
+ this.callback_not_an_Array_err = "Argument 'data' must be of type Array.";
this.callback_not_a_function_err = "Argument 'callback' must be of type Function.";
this.no_connection_err = "There is no open connection to the dabase server. Call connect function first.";
|
Renamed and added new error constant messages
|
diff --git a/Service/OS/AndroidGCMNotification.php b/Service/OS/AndroidGCMNotification.php
index <HASH>..<HASH> 100644
--- a/Service/OS/AndroidGCMNotification.php
+++ b/Service/OS/AndroidGCMNotification.php
@@ -49,11 +49,12 @@ class AndroidGCMNotification implements OSNotificationServiceInterface
* Constructor
*
* @param $apiKey
+ * @param MultiCurl $client (optional)
*/
- public function __construct($apiKey)
+ public function __construct($apiKey, MultiCurl $client = null)
{
$this->apiKey = $apiKey;
- $this->browser = new Browser(new MultiCurl());
+ $this->browser = new Browser($client ?: new MultiCurl());
}
/**
|
Allowing injecting a client
I've been having problems with GCM timeouts, this allows me to configure a
client with a reasonable timeout and inject it
|
diff --git a/src/Cyscon.php b/src/Cyscon.php
index <HASH>..<HASH> 100644
--- a/src/Cyscon.php
+++ b/src/Cyscon.php
@@ -1,6 +1,7 @@
<?php
namespace AbuseIO\Parsers;
+
use AbuseIO\Models\Incident;
/**
@@ -48,7 +49,7 @@ class Cyscon extends Parser
$report = array_combine($matches[1], $matches[2]);
if ($this->hasRequiredFields($report) === true) {
- // Event has all requirements met, filter and add!
+ // incident has all requirements met, filter and add!
$report = $this->applyFilters($report);
$report['domain'] = preg_replace('/^www\./', '', $report['domain']);
@@ -66,7 +67,7 @@ class Cyscon extends Parser
$incident->timestamp = strtotime($report['last_seen']);
$incident->information = json_encode($report);
- $this->events[] = $incident;
+ $this->incidents[] = $incident;
}
} else { // Unable to build report
$this->warningCount++;
|
refactor event to incident to prevent model confusion
|
diff --git a/replicaset/replicaset_test.go b/replicaset/replicaset_test.go
index <HASH>..<HASH> 100644
--- a/replicaset/replicaset_test.go
+++ b/replicaset/replicaset_test.go
@@ -400,9 +400,9 @@ func (s *MongoSuite) TestIsReadyMinority(c *gc.C) {
c.Check(ready, jc.IsFalse)
}
-func (s *MongoSuite) TestIsReadyConnectionDropped(c *gc.C) {
+func (s *MongoSuite) checkConnectionFailure(c *gc.C, failure error) {
s.PatchValue(&getCurrentStatus,
- func(session *mgo.Session) (*Status, error) { return nil, io.EOF },
+ func(session *mgo.Session) (*Status, error) { return nil, failure },
)
session := s.root.MustDial()
defer session.Close()
@@ -413,6 +413,10 @@ func (s *MongoSuite) TestIsReadyConnectionDropped(c *gc.C) {
c.Check(ready, jc.IsFalse)
}
+func (s *MongoSuite) TestIsReadyConnectionDropped(c *gc.C) {
+ s.checkConnectionFailure(c, io.EOF)
+}
+
func (s *MongoSuite) TestIsReadyError(c *gc.C) {
failure := errors.New("failed!")
s.PatchValue(&getCurrentStatus,
|
Factor out checkConnectionFailure.
|
diff --git a/html_text/html_text.py b/html_text/html_text.py
index <HASH>..<HASH> 100644
--- a/html_text/html_text.py
+++ b/html_text/html_text.py
@@ -138,7 +138,7 @@ def etree_to_text(tree,
def selector_to_text(sel, guess_punct_space=True, guess_layout=True):
- """ Convert a cleaned selector to text.
+ """ Convert a cleaned parsel.Selector to text.
See html_text.extract_text docstring for description of the approach
and options.
"""
|
DOC make it more explicit selector_to_text is parsel-specific
|
diff --git a/CHANGES.md b/CHANGES.md
index <HASH>..<HASH> 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-0.11 (unreleased)
+0.11 (2018-11-14)
-----------------
- Fixed the home button in the toolbar to reset limits in addition to the
diff --git a/glue_vispy_viewers/version.py b/glue_vispy_viewers/version.py
index <HASH>..<HASH> 100644
--- a/glue_vispy_viewers/version.py
+++ b/glue_vispy_viewers/version.py
@@ -1 +1 @@
-__version__ = '0.11.dev0'
+__version__ = '0.11'
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -40,7 +40,7 @@ for subpackage in ['antialias', 'arrowheads', 'arrows', 'collections',
install_requires = ['numpy',
'pyopengl',
- 'glue-core>=0.12',
+ 'glue-core>=0.14',
'qtpy',
'scipy',
'astropy>=1.1',
|
Preparing release <I>
|
diff --git a/src/I18n/TranslatorRegistry.php b/src/I18n/TranslatorRegistry.php
index <HASH>..<HASH> 100644
--- a/src/I18n/TranslatorRegistry.php
+++ b/src/I18n/TranslatorRegistry.php
@@ -145,7 +145,9 @@ class TranslatorRegistry extends TranslatorLocator
return $this->registry[$name][$locale] = $this->_getTranslator($name, $locale);
}
- $key = "translations.$name.$locale";
+ // Cache keys cannot contain / if they go to file engine.
+ $keyName = str_replace('/', '.', $name);
+ $key = "translations.{$keyName}.{$locale}";
$translator = $this->_cacher->get($key);
if (!$translator || !$translator->getPackage()) {
$translator = $this->_getTranslator($name, $locale);
|
Fix invalid key in TranslatorRegistry.
|
diff --git a/src/ai-did-you-mean-this/setup.py b/src/ai-did-you-mean-this/setup.py
index <HASH>..<HASH> 100644
--- a/src/ai-did-you-mean-this/setup.py
+++ b/src/ai-did-you-mean-this/setup.py
@@ -44,8 +44,7 @@ setup(
# TODO: Update author and email, if applicable
author="Christopher O'Toole",
author_email='chotool@microsoft.com',
- # TODO: consider pointing directly to your source code instead of the generic repo
- url='https://github.com/Azure/azure-cli-extensions/ai-did-you-mean-this',
+ url='https://github.com/Azure/azure-cli-extensions/tree/master/src/ai-did-you-mean-this',
long_description=README + '\n\n' + HISTORY,
license='MIT',
classifiers=CLASSIFIERS,
|
Fix broken URL in setup.py file (#<I>)
|
diff --git a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
index <HASH>..<HASH> 100644
--- a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
+++ b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
@@ -1494,13 +1494,8 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
* </p>
*
* @param listener the listener to add.
- * @throws StreamManagementNotEnabledException if Stream Management is not enabled.
*/
- public void addStanzaAcknowledgedListener(PacketListener listener) throws StreamManagementNotEnabledException {
- // Prevent users from adding callbacks that will never get removed
- if (!smWasEnabledAtLeastOnce) {
- throw new StreamManagementException.StreamManagementNotEnabledException();
- }
+ public void addStanzaAcknowledgedListener(PacketListener listener) {
stanzaAcknowledgedListeners.add(listener);
}
|
Make addStanzaAck…Listener() not throw
users may want to add listeners before the connection is connected. The
comment was also wrong, those listeners never got auto removed.
|
diff --git a/quickbooks/objects/purchaseorder.py b/quickbooks/objects/purchaseorder.py
index <HASH>..<HASH> 100644
--- a/quickbooks/objects/purchaseorder.py
+++ b/quickbooks/objects/purchaseorder.py
@@ -50,6 +50,7 @@ class PurchaseOrder(DeleteMixin, QuickbooksManagedObject, QuickbooksTransactionE
self.DueDate = None
self.ExchangeRate = 1
self.GlobalTaxCalculation = "TaxExcluded"
+ self.Memo = None
self.TxnTaxDetail = None
self.VendorAddr = None
|
Added memo field
Memo field mapped to "Your message to vendor" in UI
|
diff --git a/app/models/manager_refresh/inventory_object.rb b/app/models/manager_refresh/inventory_object.rb
index <HASH>..<HASH> 100644
--- a/app/models/manager_refresh/inventory_object.rb
+++ b/app/models/manager_refresh/inventory_object.rb
@@ -4,7 +4,7 @@ module ManagerRefresh
attr_reader :inventory_collection, :data
delegate :manager_ref, :base_class_name, :model_class, :to => :inventory_collection
- delegate :[], :to => :data
+ delegate :[], :[]=, :to => :data
def initialize(inventory_collection, data)
@inventory_collection = inventory_collection
@@ -85,12 +85,6 @@ module ManagerRefresh
!inventory_collection.saved?
end
- def []=(key, value)
- data[key] = value
- inventory_collection.actualize_dependency(key, value)
- value
- end
-
def allowed_writers
return [] unless model_class
|
We don't need to actualize dependendencies per assignement
We don't need to actualize dependendencies per assignement, it's
being solved in the separate scanning step.
(transferred from ManageIQ/manageiq@5be<I>f7a0d<I>a<I>d9c1a<I>e3d<I>a4fb<I>b1)
|
diff --git a/mockserver-core/src/main/java/org/mockserver/logging/MockServerLogger.java b/mockserver-core/src/main/java/org/mockserver/logging/MockServerLogger.java
index <HASH>..<HASH> 100644
--- a/mockserver-core/src/main/java/org/mockserver/logging/MockServerLogger.java
+++ b/mockserver-core/src/main/java/org/mockserver/logging/MockServerLogger.java
@@ -117,6 +117,7 @@ public class MockServerLogger {
}
public static boolean isEnabled(final Level level) {
- return logLevel() != null && level.toInt() >= logLevel().toInt();
+ return (logLevel() == null && level.toInt() >= Level.WARN.toInt())
+ || (logLevel() != null && level.toInt() >= logLevel().toInt());
}
}
|
ensured WARN and ERROR is logged even if logLevel not yet initialised
|
diff --git a/lib/rescue_from_duplicate/active_record/extension.rb b/lib/rescue_from_duplicate/active_record/extension.rb
index <HASH>..<HASH> 100644
--- a/lib/rescue_from_duplicate/active_record/extension.rb
+++ b/lib/rescue_from_duplicate/active_record/extension.rb
@@ -45,7 +45,7 @@ module RescueFromDuplicate::ActiveRecord
def exception_handler(exception)
columns = exception_columns(exception)
return unless columns
- columns.sort!
+ columns = columns.sort
self.class._rescue_from_duplicate_handlers.detect do |handler|
handler.rescue? && columns == handler.columns
|
Do not mutate Active Record internal data
|
diff --git a/app/models/ample_assets/file.rb b/app/models/ample_assets/file.rb
index <HASH>..<HASH> 100644
--- a/app/models/ample_assets/file.rb
+++ b/app/models/ample_assets/file.rb
@@ -69,12 +69,12 @@ module AmpleAssets
:uid => attachment_uid,
:filename => attachment_name,
:document => is_doc? ? 'true' : 'false',
- :orientation => orientation,
+ :orientation => (is_image? ? orientation : nil),
:mime_type => attachment_mime_type,
:keywords => search_terms,
:url => attachment.url,
:gravity => attachment_gravity,
- :size => "#{attachment.width}x#{attachment.height}",
+ :size => (is_image? ? "#{attachment.width}x#{attachment.height}" : nil),
:sizes => { :tn => thumbnail, :md => medium }
}
end
|
Only reference orientation & dimensions for images.
|
diff --git a/passphrase/calc.py b/passphrase/calc.py
index <HASH>..<HASH> 100644
--- a/passphrase/calc.py
+++ b/passphrase/calc.py
@@ -50,10 +50,6 @@ def entropy_bits(
# Some NumPy replacements
counts = [lst.count(x) for x in lst]
probs = [c / n_lst for c in counts]
- n_classes = len([x for x in probs if x != 0])
-
- if n_classes <= 1:
- return 0.0
# Compute entropy
entropy = 0.0
|
Remove unused code from calc
That piece of code was not being used, and the condition never
reached: for `n_classes` to be <=1, `probs` had to be just 1
element because no element could ever be 0, given that each
element is a quotient, and the dividend is never 0. And for
`probs` to be just 1 element, `counts` should also be, which is
prevented by a previous check.
|
diff --git a/src/htmlminifier.js b/src/htmlminifier.js
index <HASH>..<HASH> 100644
--- a/src/htmlminifier.js
+++ b/src/htmlminifier.js
@@ -76,7 +76,9 @@
function canRemoveAttributeQuotes(value) {
// http://mathiasbynens.be/notes/unquoted-attribute-values
- return (/^[^\x20\t\n\f\r"'`=<>]+$/).test(value) && !(/\/$/ ).test(value);
+ return (/^[^\x20\t\n\f\r"'`=<>]+$/).test(value) && !(/\/$/ ).test(value) &&
+ // make sure trailing slash is not interpreted as HTML self-closing tag
+ !(/\/$/).test(value);
}
function attributesInclude(attributes, attribute) {
|
Added a comment to make the reason behind the expression more verbose
|
diff --git a/src/saml2/attribute_resolver.py b/src/saml2/attribute_resolver.py
index <HASH>..<HASH> 100644
--- a/src/saml2/attribute_resolver.py
+++ b/src/saml2/attribute_resolver.py
@@ -55,21 +55,18 @@ class AttributeResolver(object):
:return: A dictionary with all the collected information about the
subject
"""
- extended_identity = {}
+ result = []
for member in vo_members:
for ass in self.metadata.attribute_services(member):
for attr_serv in ass.attribute_service:
log and log.info("Send attribute request to %s" % \
attr_serv.location)
- (resp, issuer,
- not_on_or_after) = self.saml2client.attribute_query(
+ session_info = self.saml2client.attribute_query(
subject_id,
issuer,
attr_serv.location,
sp_name_qualifier=sp_name_qualifier,
format=name_id_format, log=log)
- if resp:
- # unnecessary
- del resp["__userid"]
- extended_identity[issuer] = (not_on_or_after, resp)
- return extended_identity
\ No newline at end of file
+ if session_info:
+ result.append(session_info)
+ return result
\ No newline at end of file
|
completed the update to follow changes in saml2.client
|
diff --git a/user/selector/lib.php b/user/selector/lib.php
index <HASH>..<HASH> 100644
--- a/user/selector/lib.php
+++ b/user/selector/lib.php
@@ -737,7 +737,6 @@ class group_members_selector extends groups_user_selector_base {
list($wherecondition, $params) = $this->search_sql($search, 'u');
list($sort, $sortparams) = users_order_by_sql('u', $search, $this->accesscontext);
- $orderby = ' ORDER BY ' . $sort;
$roles = groups_get_members_by_role($this->groupid, $this->courseid,
$this->required_fields_sql('u') . ', gm.component',
|
MDL-<I> gropus UI: delete unused var.
|
diff --git a/sos/plugins/lvm2.py b/sos/plugins/lvm2.py
index <HASH>..<HASH> 100644
--- a/sos/plugins/lvm2.py
+++ b/sos/plugins/lvm2.py
@@ -22,8 +22,8 @@ class Lvm2(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
plugin_name = 'lvm2'
option_list = [("lvmdump", 'collect an lvmdump tarball', 'fast', False),
- ("lvmdump-a", 'use the -a option of lvmdump (implies the ' \
- + '"lvmdump" option)', 'slow', False)]
+ ("lvmdump-am", 'use the -a -m options of lvmdump ' \
+ '(implies the "lvmdump" option)', 'slow', False)]
def do_lvmdump(self):
"""Collects an lvmdump in standard format with optional metadata
|
Make lvm2 plugin lvmdump option collect metadata
The lvmdump-a option currently collects 'advanced' data but not
raw metadata. Since it's off by default and the metadata is often
of interest in support cases rename the option to lvmdump-am and
have it also pass the '-m' (raw metadata) option to the lvmdump
script.
|
diff --git a/app/assets/javascripts/sidebar.js b/app/assets/javascripts/sidebar.js
index <HASH>..<HASH> 100644
--- a/app/assets/javascripts/sidebar.js
+++ b/app/assets/javascripts/sidebar.js
@@ -28,16 +28,6 @@ var bind_sortable = function() {
helper: "clone",
revert: "invalid"
});
- $('.fake_button').on('ajax:beforeSend', function(e, xhr, settings) {
-
- console.log('BS befr');
- settings.data = $(this).parents('.active').find('input').serializeArray();
- console.log('BS after');
- });
- $('.fake_button').on('ajax:after', function(e, xhr, settings) {
- console.log('after');
- });
-
}
$(document).ready(function() {
bind_sortable();
|
Remove fake_button stuff from js
|
diff --git a/lib/cmd/handshake/client-capabilities.js b/lib/cmd/handshake/client-capabilities.js
index <HASH>..<HASH> 100644
--- a/lib/cmd/handshake/client-capabilities.js
+++ b/lib/cmd/handshake/client-capabilities.js
@@ -48,7 +48,7 @@ module.exports.init = function (opts, info) {
capabilities |= Capabilities.DEPRECATE_EOF;
}
- if (opts.database) {
+ if (opts.database && info.serverCapabilities & Capabilities.CONNECT_WITH_DB) {
capabilities |= Capabilities.CONNECT_WITH_DB;
}
|
[misc] ensure that connecting to database only if server has capability
|
diff --git a/wcomponents-core/src/main/java/com/github/bordertech/wcomponents/WDialog.java b/wcomponents-core/src/main/java/com/github/bordertech/wcomponents/WDialog.java
index <HASH>..<HASH> 100755
--- a/wcomponents-core/src/main/java/com/github/bordertech/wcomponents/WDialog.java
+++ b/wcomponents-core/src/main/java/com/github/bordertech/wcomponents/WDialog.java
@@ -3,6 +3,7 @@ package com.github.bordertech.wcomponents;
import com.github.bordertech.wcomponents.util.I18nUtilities;
import java.io.Serializable;
import java.text.MessageFormat;
+import java.util.List;
/**
* <p>
@@ -320,6 +321,11 @@ public class WDialog extends AbstractWComponent implements Container, AjaxTarget
return super.getIndexOfChild(childComponent);
}
+ @Override
+ public List<WComponent> getChildren() {
+ return super.getChildren();
+ }
+
/**
* @return a String representation of this component, for debugging purposes.
*/
|
Add getChildren() to Container API
|
diff --git a/merge.go b/merge.go
index <HASH>..<HASH> 100644
--- a/merge.go
+++ b/merge.go
@@ -271,11 +271,6 @@ func deepMerge(dst, src reflect.Value, visited map[uintptr]*visit, depth int, co
}
default:
mustSet := (isEmptyValue(dst) || overwrite) && (!isEmptyValue(src) || overwriteWithEmptySrc)
- v := fmt.Sprintf("%v", src)
- if v == "TestIssue106" {
- fmt.Println(mustSet)
- fmt.Println(dst.CanSet())
- }
if mustSet {
if dst.CanSet() {
dst.Set(src)
|
fixed issue #<I> by removing unused old test code
|
diff --git a/lib/oar/scripting.rb b/lib/oar/scripting.rb
index <HASH>..<HASH> 100644
--- a/lib/oar/scripting.rb
+++ b/lib/oar/scripting.rb
@@ -51,6 +51,10 @@ module OAR
Script.job
end # def:: job
+ def oarstat
+ Script.oarstat
+ end # def:: oarstat
+
end # module:: Scripting
end # module:: OAR
diff --git a/lib/oar/scripting/script.rb b/lib/oar/scripting/script.rb
index <HASH>..<HASH> 100644
--- a/lib/oar/scripting/script.rb
+++ b/lib/oar/scripting/script.rb
@@ -57,6 +57,10 @@ class OAR::Scripting::Script
@@steps
end # def:: self.steps
+ def self.oarstat
+ @@oarstat ||= JSON.parse(%x[oarstat -f -j @@job[:id] -J])[@@job[:id]]
+ end # def:: self.oarstat
+
def self.execute
@@steps.sort! { |a,b| a[:order] <=> b[:order] }
@@steps.each do |step|
|
Add oarstat method executed only one time and only if necessary
|
diff --git a/eZ/Publish/Core/Base/Exceptions/UnauthorizedException.php b/eZ/Publish/Core/Base/Exceptions/UnauthorizedException.php
index <HASH>..<HASH> 100644
--- a/eZ/Publish/Core/Base/Exceptions/UnauthorizedException.php
+++ b/eZ/Publish/Core/Base/Exceptions/UnauthorizedException.php
@@ -39,7 +39,7 @@ class UnauthorizedException extends APIUnauthorizedException implements Httpable
$this->setParameters(['%module%' => $module, '%function%' => $function]);
if ($properties) {
- $this->setMessageTemplate("User does not have access to '%function%' '%module%' with: %with%'");
+ $this->setMessageTemplate("User does not have access to '%function%' '%module%' with: %with%");
$with = [];
foreach ($properties as $name => $value) {
$with[] = "{$name} '{$value}'";
|
EZP-<I>: Fixed typo in UnauthorizedException message (#<I>)
|
diff --git a/jsont.js b/jsont.js
index <HASH>..<HASH> 100644
--- a/jsont.js
+++ b/jsont.js
@@ -50,6 +50,9 @@ function transform(obj,rules) {
elements[i] = elements[i].replaceAll('[*]','['+o+']'); //specify the current index
elements[i] = elements[i].replaceAll('self','');
elements[i] = jpath.fetchFromObject(obj,elements[i]);
+ if (Array.isArray(elements[i])) {
+ elements[i] = elements[i].join(''); // avoid commas being output
+ }
}
obj[newObjName] = elements.join('');
if (!isArray) continue;
|
Avoid commas being output when arrays concatenated
|
diff --git a/bakery/tasks.py b/bakery/tasks.py
index <HASH>..<HASH> 100644
--- a/bakery/tasks.py
+++ b/bakery/tasks.py
@@ -325,14 +325,10 @@ def process_project(project, log):
:param project: :class:`~bakery.models.Project` instance
:param log: :class:`~bakery.utils.RedisFd` as log
"""
- # login — user login
- # project_id - database project_id
-
- copy_and_rename_ufos_process(project, log)
-
- # autoprocess is set after setup is completed once
+ # setup is set after 'bake' button is first pressed
if project.config['local'].get('setup', None):
log.write('Bake Begins!\n', prefix = 'Header: ')
+ copy_and_rename_ufos_process(project, log)
generate_fonts_process(project, log)
ttfautohint_process(project, log)
ttx_process(project, log)
|
Move copy_and_rename_ufos_process() inside bake process in process_project()
|
diff --git a/airflow/providers/exasol/hooks/exasol.py b/airflow/providers/exasol/hooks/exasol.py
index <HASH>..<HASH> 100644
--- a/airflow/providers/exasol/hooks/exasol.py
+++ b/airflow/providers/exasol/hooks/exasol.py
@@ -19,6 +19,7 @@
from contextlib import closing
from typing import Any, Dict, List, Optional, Tuple, Union
+import pandas as pd
import pyexasol
from pyexasol import ExaConnection
@@ -63,7 +64,9 @@ class ExasolHook(DbApiHook):
conn = pyexasol.connect(**conn_args)
return conn
- def get_pandas_df(self, sql: Union[str, list], parameters: Optional[dict] = None, **kwargs) -> None:
+ def get_pandas_df(
+ self, sql: Union[str, list], parameters: Optional[dict] = None, **kwargs
+ ) -> pd.DataFrame:
"""
Executes the sql and returns a pandas dataframe
@@ -76,7 +79,8 @@ class ExasolHook(DbApiHook):
:type kwargs: dict
"""
with closing(self.get_conn()) as conn:
- conn.export_to_pandas(sql, query_params=parameters, **kwargs)
+ df = conn.export_to_pandas(sql, query_params=parameters, **kwargs)
+ return df
def get_records(
self, sql: Union[str, list], parameters: Optional[dict] = None
|
ExasolHook get_pandas_df does not return pandas dataframe but None (#<I>)
closes #<I>
ExasolHook get_pandas_df does not return pandas dataframe but None
|
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/executor/FetchFromIndexStep.java b/core/src/main/java/com/orientechnologies/orient/core/sql/executor/FetchFromIndexStep.java
index <HASH>..<HASH> 100755
--- a/core/src/main/java/com/orientechnologies/orient/core/sql/executor/FetchFromIndexStep.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/sql/executor/FetchFromIndexStep.java
@@ -72,13 +72,14 @@ public class FetchFromIndexStep extends AbstractExecutionStep {
}
long begin = profilingEnabled ? System.nanoTime() : 0;
try {
- Map.Entry<Object, OIdentifiable> currentEntry = nextEntry;
+ Object key = nextEntry.getKey();
+ OIdentifiable value = nextEntry.getValue();
fetchNextEntry();
localCount++;
OResultInternal result = new OResultInternal();
- result.setProperty("key", currentEntry.getKey());
- result.setProperty("rid", currentEntry.getValue());
+ result.setProperty("key", key);
+ result.setProperty("rid", value);
ctx.setVariable("$current", result);
return result;
} finally {
|
Fix wrong key results on SELECT FROM index:x
|
diff --git a/tests/class-hyphenator-test.php b/tests/class-hyphenator-test.php
index <HASH>..<HASH> 100644
--- a/tests/class-hyphenator-test.php
+++ b/tests/class-hyphenator-test.php
@@ -355,7 +355,6 @@ class Hyphenator_Test extends Testcase {
* @uses PHP_Typography\Text_Parser\Token
* @uses PHP_Typography\Strings::functions
* @uses PHP_Typography\Strings::mb_str_split
- * @uses \mb_convert_encoding
*/
public function test_hyphenate_wrong_encoding() {
$this->h->set_language( 'de' );
@@ -457,8 +456,6 @@ class Hyphenator_Test extends Testcase {
* @covers ::hyphenate_word
* @covers ::lookup_word_pattern
*
- * @uses ReflectionClass
- * @uses ReflectionProperty
* @uses PHP_Typography\Hyphenator\Trie_Node
* @uses PHP_Typography\Text_Parser\Token
* @uses PHP_Typography\Strings::functions
@@ -502,7 +499,6 @@ class Hyphenator_Test extends Testcase {
* @covers ::convert_hyphenation_exception_to_pattern
*
* @uses PHP_Typography\Strings::functions
- * @uses \mb_convert_encoding
*/
public function test_convert_hyphenation_exception_to_pattern_unknown_encoding() {
$h = $this->h;
|
Tests: Remove invalid @uses annotations (for PHP-internal constructs)
|
diff --git a/src/main/java/org/jboss/pressgang/ccms/filter/builder/TopicFilterQueryBuilder.java b/src/main/java/org/jboss/pressgang/ccms/filter/builder/TopicFilterQueryBuilder.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/jboss/pressgang/ccms/filter/builder/TopicFilterQueryBuilder.java
+++ b/src/main/java/org/jboss/pressgang/ccms/filter/builder/TopicFilterQueryBuilder.java
@@ -38,7 +38,10 @@ public class TopicFilterQueryBuilder extends BaseTopicFilterQueryBuilder<Topic>
final String[] components = fieldStringValue.split(":");
if (components.length == 2) {
try {
- addExistsCondition(getMatchingMinHash(Integer.parseInt(components[0]), Float.parseFloat(components[1])));
+ final Subquery<Topic> subQuery = getMatchingMinHash(Integer.parseInt(components[0]), Float.parseFloat(components[1]));
+ if (subQuery != null) {
+ addExistsCondition(subQuery);
+ }
} catch (final NumberFormatException ex) {
}
|
Added the ability to search for an equal min hash
|
diff --git a/repository/googledocs/repository.class.php b/repository/googledocs/repository.class.php
index <HASH>..<HASH> 100644
--- a/repository/googledocs/repository.class.php
+++ b/repository/googledocs/repository.class.php
@@ -122,6 +122,8 @@ class repository_googledocs extends repository {
return $dir.$file;
}
-
+ public function supported_filetypes() {
+ return array('document');
+ }
}
//Icon from: http://www.iconspedia.com/icon/google-2706.html
|
"REPOSITORY, GDOCS/MDL-<I>, tell filepicker gdocs support documents only"
|
diff --git a/src/Validator/InputValidator.php b/src/Validator/InputValidator.php
index <HASH>..<HASH> 100644
--- a/src/Validator/InputValidator.php
+++ b/src/Validator/InputValidator.php
@@ -244,7 +244,7 @@ class InputValidator
];
foreach ($type->getFields() as $fieldName => $inputField) {
- $mapping['properties'][$fieldName] = $inputField->config['validation'];
+ $mapping['properties'][$fieldName] = $inputField->config['validation'] ?? [];
}
return $this->buildValidationTree(new ValidationNode($type, null, $parent, $this->resolverArgs), $mapping, $value);
|
Fix bug in validator
Fix the bug described in #<I>
|
diff --git a/lib/event_sourcery/event_store/event_sink.rb b/lib/event_sourcery/event_store/event_sink.rb
index <HASH>..<HASH> 100644
--- a/lib/event_sourcery/event_store/event_sink.rb
+++ b/lib/event_sourcery/event_store/event_sink.rb
@@ -1,3 +1,5 @@
+require 'forwardable'
+
module EventSourcery
module EventStore
class EventSink
diff --git a/spec/support/event_helpers.rb b/spec/support/event_helpers.rb
index <HASH>..<HASH> 100644
--- a/spec/support/event_helpers.rb
+++ b/spec/support/event_helpers.rb
@@ -1,3 +1,5 @@
+require 'securerandom'
+
module EventHelpers
def new_event(aggregate_id: SecureRandom.uuid, type: 'test_event', body: {}, id: nil, version: 1, created_at: nil, uuid: SecureRandom.uuid)
EventSourcery::Event.new(id: id,
|
Add explicit requires
The test suite won't pass on my machine without these requires.
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -144,6 +144,21 @@ function redisStore(args) {
return value !== null && value !== undefined;
};
+ self.getClient = function(cb) {
+ connect(function (err, conn) {
+ if (err) {
+ return cb && cb(err);
+ }
+ cb(null, {
+ client: conn,
+ done: function(done) {
+ pool.release(conn);
+ if (done && typeof done === 'function') done();
+ }
+ });
+ });
+ };
+
return self;
}
|
adds 'getClient' method which provides access to the native redis client
|
diff --git a/lib/components/connector.js b/lib/components/connector.js
index <HASH>..<HASH> 100644
--- a/lib/components/connector.js
+++ b/lib/components/connector.js
@@ -218,7 +218,7 @@ var bindEvents = function(self, socket) {
socket.on('message', function(msg) {
var dmsg = msg;
if(self.decode) {
- dmsg = self.decode(msg);
+ dmsg = self.decode.call(self, msg, session);
} else if(self.connector.decode) {
dmsg = self.connector.decode(msg);
}
|
modify custom decoder to be able to do more work.
|
diff --git a/pipenv/cli/command.py b/pipenv/cli/command.py
index <HASH>..<HASH> 100644
--- a/pipenv/cli/command.py
+++ b/pipenv/cli/command.py
@@ -313,9 +313,11 @@ def lock(
"""Generates Pipfile.lock."""
from ..core import ensure_project, do_init, do_lock
# Ensure that virtualenv is available.
+ # Note that we don't pass clear on to ensure_project as it is also
+ # handled in do_lock
ensure_project(
three=state.three, python=state.python, pypi_mirror=state.pypi_mirror,
- warn=(not state.quiet), site_packages=state.site_packages, clear=state.clear
+ warn=(not state.quiet), site_packages=state.site_packages,
)
if state.installstate.requirementstxt:
do_init(
|
Don't pass clear along to ensure_project during lock
|
diff --git a/phy/io/kwik/model.py b/phy/io/kwik/model.py
index <HASH>..<HASH> 100644
--- a/phy/io/kwik/model.py
+++ b/phy/io/kwik/model.py
@@ -392,6 +392,15 @@ class KwikModel(BaseModel):
params = {}
for attr in self._kwik.attrs(path):
params[attr] = self._kwik.read_attr(path, attr)
+ # Make sure all params are there.
+ default_params = {}
+ settings = _load_default_settings()
+ default_params.update(settings['traces'])
+ default_params.update(settings['spikedetekt'])
+ default_params.update(settings['klustakwik2'])
+ for name, default_value in default_params.items():
+ if name not in params:
+ params[name] = default_value
self._metadata = params
def _load_probe(self):
|
Fixing metadata bug in Kwik model.
|
diff --git a/lib/asset-resolver.js b/lib/asset-resolver.js
index <HASH>..<HASH> 100644
--- a/lib/asset-resolver.js
+++ b/lib/asset-resolver.js
@@ -12,12 +12,12 @@ function AssetResolver(options) {
Object.freeze(this);
}
-AssetResolver.prototype.resolvePath = function (to) {
- return resolvePath(to, this.options);
+AssetResolver.prototype.resolvePath = function (to, callback) {
+ return resolvePath(to, this.options, callback);
};
-AssetResolver.prototype.resolveUrl = function (to) {
- return resolveUrl(to, this.options);
+AssetResolver.prototype.resolveUrl = function (to, callback) {
+ return resolveUrl(to, this.options, callback);
};
module.exports = AssetResolver;
|
Pass callbacks to AssetResolver.prototype methods
|
diff --git a/Swat/SwatHtmlHeadEntrySetDisplayer.php b/Swat/SwatHtmlHeadEntrySetDisplayer.php
index <HASH>..<HASH> 100644
--- a/Swat/SwatHtmlHeadEntrySetDisplayer.php
+++ b/Swat/SwatHtmlHeadEntrySetDisplayer.php
@@ -319,14 +319,13 @@ class SwatHtmlHeadEntrySetDisplayer extends SwatObject
protected function getTypeOrder()
{
return array(
- 'SwatStyleSheetHtmlHeadEntry' => 0,
- 'SwatLessStyleSheetHtmlHeadEntry' => 1,
- 'SwatLinkHtmlHeadEntry' => 2,
- 'SwatConditionalJavaScriptHtmlHeadEntry' => 3,
- 'SwatInlineJavaScriptHtmlHeadEntry' => 4,
- 'SwatJavaScriptHtmlHeadEntry' => 5,
- 'SwatCommentHtmlHeadEntry' => 6,
- '__unknown__' => 7,
+ 'SwatStyleSheetHtmlHeadEntry' => 0,
+ 'SwatLessStyleSheetHtmlHeadEntry' => 1,
+ 'SwatLinkHtmlHeadEntry' => 2,
+ 'SwatInlineJavaScriptHtmlHeadEntry' => 3,
+ 'SwatJavaScriptHtmlHeadEntry' => 4,
+ 'SwatCommentHtmlHeadEntry' => 5,
+ '__unknown__' => 6,
);
}
|
Remove unused type from sort order.
|
diff --git a/go/vt/worker/fake_pool_connection_test.go b/go/vt/worker/fake_pool_connection_test.go
index <HASH>..<HASH> 100644
--- a/go/vt/worker/fake_pool_connection_test.go
+++ b/go/vt/worker/fake_pool_connection_test.go
@@ -76,7 +76,11 @@ func (f *FakePoolConnection) addExpectedExecuteFetchAtIndex(index int, entry Exp
f.expectedExecuteFetch = append(f.expectedExecuteFetch, entry)
} else {
// Grow the slice by one element.
- f.expectedExecuteFetch = f.expectedExecuteFetch[0 : len(f.expectedExecuteFetch)+1]
+ if cap(f.expectedExecuteFetch) == len(f.expectedExecuteFetch) {
+ f.expectedExecuteFetch = append(f.expectedExecuteFetch, make([]ExpectedExecuteFetch, 1)...)
+ } else {
+ f.expectedExecuteFetch = f.expectedExecuteFetch[0 : len(f.expectedExecuteFetch)+1]
+ }
// Use copy to move the upper part of the slice out of the way and open a hole.
copy(f.expectedExecuteFetch[index+1:], f.expectedExecuteFetch[index:])
// Store the new value.
|
worker: FakePoolConnection: Fix bug where the capacity of the slice was not big enough to insert an element in the middle.
|
diff --git a/synergy/supervisor/synergy_supervisor.py b/synergy/supervisor/synergy_supervisor.py
index <HASH>..<HASH> 100644
--- a/synergy/supervisor/synergy_supervisor.py
+++ b/synergy/supervisor/synergy_supervisor.py
@@ -9,7 +9,6 @@ from psutil import TimeoutExpired
from launch import get_python, PROJECT_ROOT, PROCESS_STARTER
from synergy.conf import settings
-from synergy.db.model import box_configuration
from synergy.db.dao.box_configuration_dao import BoxConfigurationDao, QUERY_PROCESSES_FOR_BOX_ID
from synergy.supervisor.supervisor_constants import TRIGGER_INTERVAL
from synergy.supervisor.supervisor_configurator import get_box_id
@@ -119,7 +118,7 @@ class Supervisor(SynergyProcess):
process_name = args[0]
try:
box_config = self.bc_dao.get_one([self.box_id, process_name])
- if box_config.state == box_configuration.STATE_OFF:
+ if not box_config.is_on:
if box_config.pid is not None:
self._kill_process(box_config)
return
|
- addressing start-time issues
|
diff --git a/test/test_cql_parser.rb b/test/test_cql_parser.rb
index <HASH>..<HASH> 100644
--- a/test/test_cql_parser.rb
+++ b/test/test_cql_parser.rb
@@ -7,6 +7,7 @@ class TestCqlParser < Test::Unit::TestCase
lines = IO.readlines( File.dirname(__FILE__) + '/fixtures/sample_queries.txt' )
lines.each do |line|
next if /^\s*#/ =~ line
+ next if /^(\s|\n)*$/ =~ line
begin
tree = parser.parse( line )
puts "in=#{line} out=#{tree.to_cql}" if tree
|
skip newlines in file of sample CQL. Still can't parse all of em though.
|
diff --git a/advanced_filters/tests/test_admin.py b/advanced_filters/tests/test_admin.py
index <HASH>..<HASH> 100644
--- a/advanced_filters/tests/test_admin.py
+++ b/advanced_filters/tests/test_admin.py
@@ -8,6 +8,7 @@ from tests import factories
class ChageFormAdminTest(TestCase):
+ """ Test the AdvancedFilter admin change page """
def setUp(self):
self.user = factories.SalesRep()
assert self.client.login(username='user', password='test')
@@ -55,6 +56,7 @@ class ChageFormAdminTest(TestCase):
class AdvancedFilterCreationTest(TestCase):
+ """ Test creation of AdvancedFilter in target model changelist """
form_data = {'form-TOTAL_FORMS': 1, 'form-INITIAL_FORMS': 0,
'action': 'advanced_filters'}
good_data = {'title': 'Test title', 'form-0-field': 'language',
@@ -129,6 +131,7 @@ class AdvancedFilterCreationTest(TestCase):
class AdvancedFilterUsageTest(TestCase):
+ """ Test filter visibility and actual filtering of a changelist """
def setUp(self):
self.user = factories.SalesRep()
assert self.client.login(username='user', password='test')
|
tests(admin): add some docstrings to TestCase classes
|
diff --git a/GPG/Driver/Php.php b/GPG/Driver/Php.php
index <HASH>..<HASH> 100644
--- a/GPG/Driver/Php.php
+++ b/GPG/Driver/Php.php
@@ -1368,15 +1368,7 @@ class Crypt_GPG_Driver_Php extends Crypt_GPG
$this->_closePipe($pipe_number);
}
- $termination_status = proc_close($this->_process);
-
- // proc_close returns a termination status, not exit code
- if (($termination_status & 0x7f) == 0) { // WIFEXITED
- $exit_code = ($termination_status & 0xff) >> 8; // WEXITSTATUS
- } else {
- $exit_code = -1;
- }
-
+ $exit_code = proc_close($this->_process);
if ($exit_code != 0) {
$this->_debug('Subprocess returned an unexpected exit code: ' .
$exit_code);
|
After examining PHP CVS, this does seem to return an exit code afterall.
git-svn-id: <URL>
|
diff --git a/lxd/cluster/events.go b/lxd/cluster/events.go
index <HASH>..<HASH> 100644
--- a/lxd/cluster/events.go
+++ b/lxd/cluster/events.go
@@ -370,7 +370,7 @@ func EventsUpdateListeners(endpoints *endpoints.Endpoints, cluster *db.Cluster,
}
if len(members) > 1 && len(keepListeners) <= 0 {
- logger.Error("No active cluster event listener clients")
+ logger.Error("No active cluster event listener clients", log.Ctx{"local": localAddress})
}
}
|
lxd/cluster/events: log No active cluster event listeners
|
diff --git a/admin/javascript/LeftAndMain.js b/admin/javascript/LeftAndMain.js
index <HASH>..<HASH> 100644
--- a/admin/javascript/LeftAndMain.js
+++ b/admin/javascript/LeftAndMain.js
@@ -212,9 +212,9 @@
newContentEl
.removeClass(layoutClasses.join(' '))
- .addClass(origLayoutClasses.join(' '))
- .attr('style', origStyle)
- .css('visibility', 'hidden');
+ .addClass(origLayoutClasses.join(' '));
+ if(origStyle) newContentEl.attr('style', origStyle)
+ newContentEl.css('visibility', 'hidden');
// Allow injection of inline styles, as they're not allowed in the document body.
// Not handling this through jQuery.ondemand to avoid parsing the DOM twice.
|
MINOR Only setting style attributes in LeftAndMain panel handling if it was previously set
|
diff --git a/src/Administration/Resources/administration/src/module/sw-product-stream/component/sw-product-stream-filter/index.js b/src/Administration/Resources/administration/src/module/sw-product-stream/component/sw-product-stream-filter/index.js
index <HASH>..<HASH> 100644
--- a/src/Administration/Resources/administration/src/module/sw-product-stream/component/sw-product-stream-filter/index.js
+++ b/src/Administration/Resources/administration/src/module/sw-product-stream/component/sw-product-stream-filter/index.js
@@ -66,6 +66,9 @@ Component.extend('sw-product-stream-filter', 'sw-condition-base', {
case 'object':
case 'number':
if (field.entity) {
+ this.operatorCriteria = CriteriaFactory.multi('OR',
+ CriteriaFactory.equals('type', 'equals'),
+ CriteriaFactory.equals('type', 'equalsAny'));
break;
}
this.operatorCriteria = CriteriaFactory.multi('OR',
|
NEXT-<I> - range filter component
|
diff --git a/bin/joblint.js b/bin/joblint.js
index <HASH>..<HASH> 100755
--- a/bin/joblint.js
+++ b/bin/joblint.js
@@ -62,7 +62,11 @@ function runCommandOnFile (fileName) {
}
function runCommandOnStdIn () {
- captureStdIn(handleInputSuccess);
+ if (isTty(process.stdin)) {
+ handleInputFailure('Input stream not detected');
+ } else {
+ captureStdIn(handleInputSuccess);
+ }
}
function handleInputFailure (msg) {
@@ -85,3 +89,7 @@ function captureStdIn (done) {
done(data);
});
}
+
+function isTty (stream) {
+ return true === stream.isTTY;
+}
|
Detect possible empty input stream
Using `process.stdin.isTTY`, detect whether streaming input is even
possible. If the process is a TTY, then nothing has been piped into the
command. If the process is not a TTY, then it is *possible*, but not
definite, that input is being streamed.
|
diff --git a/nfc/handover/server.py b/nfc/handover/server.py
index <HASH>..<HASH> 100644
--- a/nfc/handover/server.py
+++ b/nfc/handover/server.py
@@ -70,8 +70,8 @@ class HandoverServer(Thread):
break # message complete
except nfc.ndef.LengthError:
continue # need more data
- else:
- return # connection closed
+ else: return # connection closed
+ else: return # connection closed
log.debug("<<< {0!r}".format(request_data))
response = handover_server._process_request(request)
|
handle connection closed also if llcp.poll() returns false
|
diff --git a/wandb/run_manager.py b/wandb/run_manager.py
index <HASH>..<HASH> 100644
--- a/wandb/run_manager.py
+++ b/wandb/run_manager.py
@@ -518,8 +518,9 @@ class RunManager(object):
os.path.join(self._watch_dir, os.path.normpath('*'))]
# Ignore hidden files/folders and output.log because we stream it specially
file_event_handler._ignore_patterns = [
- '*/.*',
'*.tmp',
+ os.path.join(self._run.dir, ".*"),
+ os.path.join(self._run.dir, "*/.*"),
os.path.join(self._run.dir, OUTPUT_FNAME)
]
for glob in self._api.settings("ignore_globs"):
|
Dont ignore files with within a hidden directory
|
diff --git a/spec/octokit/client/contents_spec.rb b/spec/octokit/client/contents_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/octokit/client/contents_spec.rb
+++ b/spec/octokit/client/contents_spec.rb
@@ -1,4 +1,5 @@
require 'helper'
+require 'tempfile'
describe Octokit::Client::Contents do
|
Adding require to spec to fix JRuby and Rubinius
The spec appears to fail currently in JRuby and Rubinius because of this missing require.
|
diff --git a/course/mod.php b/course/mod.php
index <HASH>..<HASH> 100644
--- a/course/mod.php
+++ b/course/mod.php
@@ -645,7 +645,7 @@
$defaultformat = FORMAT_MOODLE;
}
- $icon = "<img align=\"middle\" height=\"16\" width=\"16\" src=\"$CFG->modpixpath/$module->name/icon.gif\" alt=\"\" /> ";
+ $icon = '<img align="middle" height="16" width="16" src="'.$CFG->modpixpath.'/'.$module->name.'/icon.gif" alt="" style="vertical-align: middle;" /> ';
print_heading_with_help($pageheading, "mods", $module->name, $icon);
print_simple_box_start('center', '', '', 5, 'generalbox', $module->name);
|
Fixed alignment of module icon so it looks correct also in Firefox.
|
diff --git a/lib/configs/recommended.js b/lib/configs/recommended.js
index <HASH>..<HASH> 100644
--- a/lib/configs/recommended.js
+++ b/lib/configs/recommended.js
@@ -8,7 +8,7 @@ module.exports = {
'block-spacing': [2, 'always'],
'brace-style': [2, '1tbs', {'allowSingleLine': true}],
'camelcase': [2, {'properties': 'always'}],
- 'comma-dangle': [2, 'only-multiline'],
+ 'comma-dangle': [2, 'never'],
'eol-last': 2,
'eqeqeq': [2, 'smart'],
'func-style': [2, 'declaration'],
|
Change comma dangle rule to never
Aligns closer to Prettier default configuration.
|
diff --git a/src/models/Server.php b/src/models/Server.php
index <HASH>..<HASH> 100644
--- a/src/models/Server.php
+++ b/src/models/Server.php
@@ -248,6 +248,21 @@ class Server extends \hipanel\base\Model
return $this->hasMany(Binding::class, ['device_id' => 'id'])->indexBy('type');
}
+ public function getMonitoringSettings()
+ {
+ return $this->hasOne(MonitoringSettings::class, ['id' => 'id']);
+ }
+
+ public function getHardwareSettings()
+ {
+ return $this->hasOne(HardwareSettings::class, ['id' => 'id']);
+ }
+
+ public function getSoftwareSettings()
+ {
+ return $this->hasOne(SoftwareSettings::class, ['id' => 'id']);
+ }
+
public function getBinding($type)
{
if (!isset($this->bindings[$type])) {
|
Added related to Server for Monitoring, Hardware, Software settings
|
diff --git a/system/Database/SQLSRV/Connection.php b/system/Database/SQLSRV/Connection.php
index <HASH>..<HASH> 100755
--- a/system/Database/SQLSRV/Connection.php
+++ b/system/Database/SQLSRV/Connection.php
@@ -129,12 +129,11 @@ class Connection extends BaseConnection
unset($connection['UID'], $connection['PWD']);
}
+ sqlsrv_configure('WarningsReturnAsErrors', 0);
$this->connID = sqlsrv_connect($this->hostname, $connection);
if ($this->connID !== false)
{
- sqlsrv_configure('WarningsReturnAsErrors', 0);
-
// Determine how identifiers are escaped
$query = $this->query('SELECT CASE WHEN (@@OPTIONS | 256) = @@OPTIONS THEN 1 ELSE 0 END AS qi');
$query = $query->getResultObject();
|
Set WarningsReturnAsErrors = 0 before connection (#<I>)
* Set WarningsReturnAsErrors = 0 before connection
If there is a warning establishing the connection, it will treat it as an error and Codeigniter will throw an exception. It should be configured prior the first sql command.
* Removed extra whitespace
|
diff --git a/contribs/gmf/src/directives/mobilenav.js b/contribs/gmf/src/directives/mobilenav.js
index <HASH>..<HASH> 100644
--- a/contribs/gmf/src/directives/mobilenav.js
+++ b/contribs/gmf/src/directives/mobilenav.js
@@ -144,7 +144,19 @@ gmf.mobileNavDirective = function() {
// one is properly deactivated. This prevents weird animation
// effects.
window.setTimeout(function() {
- nav.addClass('active');
+ // fix for safari: the following 3 lines force that the position
+ // of the newly inserted element is calculated.
+ // see http://stackoverflow.com/a/3485654/119937
+ nav.css('display', 'none');
+ nav.offset();
+ nav.css('display', '');
+
+ window.setTimeout(function() {
+ // fix: calling `position()` makes sure that the animation
+ // is always run
+ nav.position();
+ nav.addClass('active');
+ }, 0);
}, 0);
}
|
Fix menu animation on Safari
In a sidebar, when clicking on a link in the main menu (e.g. "Background"),
the title bar turned white during the animation on Safari.
The problem is that the newly inserted element did not have the right position
after insertion on Safari. The "fix" forces Safari to calculate the position.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -9,10 +9,10 @@ from distutils.core import setup
setup(name='kkbox_developer_sdk',
description='KKBOX Open API Developer SDK for Python',
author='KKBOX',
- author_email='sharonyang@kkbox.com',
- version='1.0.6',
+ author_email='willyliu@kkbox.com',
+ version='1.0.7',
url='https://github.com/KKBOX/OpenAPI-Python',
- download_url='https://github.com/KKBOX/OpenAPI-Python/tarball/v1.0.6',
+ download_url='https://github.com/KKBOX/OpenAPI-Python/tarball/v1.0.7',
packages=['kkbox_developer_sdk'],
package_dir={'kkbox_developer_sdk': 'kkbox_developer_sdk'},
keywords=['KKBOX', 'Open', 'API', 'OpenAPI'])
|
Bumps version to <I>.
|
diff --git a/src/main/java/com/couchbase/lite/support/Version.java b/src/main/java/com/couchbase/lite/support/Version.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/couchbase/lite/support/Version.java
+++ b/src/main/java/com/couchbase/lite/support/Version.java
@@ -5,8 +5,8 @@ import com.couchbase.lite.util.Log;
public class Version {
public static final String VERSION;
- private static final String VERSION_NAME="${VERSION_NAME}"; // replaced during build process
- private static final String VERSION_CODE="${VERSION_CODE}"; // replaced during build process
+ private static final String VERSION_NAME="%VERSION_NAME%"; // replaced during build process
+ private static final String VERSION_CODE="%VERSION_CODE%"; // replaced during build process
static {
int versCode = getVersionCode();
@@ -18,14 +18,14 @@ public class Version {
}
public static String getVersionName() {
- if (VERSION_NAME == "${VERSION_NAME}") {
+ if (VERSION_NAME.contains("VERSION_NAME")) {
return "devbuild";
}
return VERSION_NAME;
}
public static int getVersionCode() {
- if (VERSION_CODE == "${VERSION_CODE}") {
+ if (VERSION_CODE.contains("VERSION_CODE")) {
return 0;
}
@@ -46,4 +46,4 @@ public class Version {
public static String getVersion() {
return VERSION;
}
-}
+}
\ No newline at end of file
|
- merge Version.java from release/<I> branch
|
diff --git a/db/sql/mapper.php b/db/sql/mapper.php
index <HASH>..<HASH> 100644
--- a/db/sql/mapper.php
+++ b/db/sql/mapper.php
@@ -287,8 +287,6 @@ class Mapper extends \DB\Cursor {
$val=$this->db->value(
$this->fields[$field]['pdo_type'],$val);
}
- elseif (array_key_exists($field,$this->adhoc))
- $this->adhoc[$field]['value']=$val;
unset($val);
}
$out[]=$this->factory($row);
|
Bug fix: Query generates wrong adhoc field value
|
diff --git a/lib/bootstrap.js b/lib/bootstrap.js
index <HASH>..<HASH> 100644
--- a/lib/bootstrap.js
+++ b/lib/bootstrap.js
@@ -9,7 +9,7 @@ function emit(event) {
}
phantom.onError = function bootstrapOnError(msg, trace) {
- emit('error', msg);
+ emit('error', msg, trace);
phantom.exit(1);
};
|
Also emit trace when crashing in onError
|
diff --git a/blockstore/lib/nameset/__init__.py b/blockstore/lib/nameset/__init__.py
index <HASH>..<HASH> 100644
--- a/blockstore/lib/nameset/__init__.py
+++ b/blockstore/lib/nameset/__init__.py
@@ -50,5 +50,7 @@ import virtualchain_hooks
from .namedb import BlockstoreDB, get_namespace_from_name, price_name, \
get_name_from_fq_name, price_namespace
+
+# this module is suitable to be a virtualchain state engine implementation
from .virtualchain_hooks import get_virtual_chain_name, get_virtual_chain_version, get_first_block_id, get_opcodes, \
get_op_processing_order, get_magic_bytes, get_db_state, db_parse, db_check, db_commit, db_save
|
clarify nameset's role in the virtualchain state engine
|
diff --git a/frontend/pyqt5/harvester.py b/frontend/pyqt5/harvester.py
index <HASH>..<HASH> 100644
--- a/frontend/pyqt5/harvester.py
+++ b/frontend/pyqt5/harvester.py
@@ -324,6 +324,7 @@ class Harvester(QMainWindow):
#
button_update.add_observer(self._widget_device_list)
+ button_update.add_observer(button_connect)
#
button_connect.add_observer(button_select_file)
@@ -467,7 +468,8 @@ class ActionConnect(Action):
#
enable = False
if self.parent().cti_files:
- if self.parent().harvester_core.connecting_device is None:
+ if self.parent().harvester_core.device_info_list and \
+ self.parent().harvester_core.connecting_device is None:
enable = True
self.setEnabled(enable)
|
Disable the Connect button if no camera is connected
|
diff --git a/test/fake_app.rb b/test/fake_app.rb
index <HASH>..<HASH> 100644
--- a/test/fake_app.rb
+++ b/test/fake_app.rb
@@ -2,7 +2,6 @@
ENV['DB'] ||= 'sqlite3'
require 'active_record/railtie'
-load 'active_record/railties/databases.rake'
module DatabaseRewinderTestApp
Application = Class.new(Rails::Application) do
@@ -14,6 +13,8 @@ module DatabaseRewinderTestApp
end.initialize!
end
+load 'active_record/railties/databases.rake'
+
require 'active_record/base'
ActiveRecord::Tasks::DatabaseTasks.root ||= Rails.root
ActiveRecord::Tasks::DatabaseTasks.drop_current ENV['DB']
|
Rails 6 expects the Rails::Application to be defined before loading database.rake
|
diff --git a/lib/ronin/ui/cli/commands/help.rb b/lib/ronin/ui/cli/commands/help.rb
index <HASH>..<HASH> 100644
--- a/lib/ronin/ui/cli/commands/help.rb
+++ b/lib/ronin/ui/cli/commands/help.rb
@@ -56,12 +56,14 @@ module Ronin
#
def execute
if command?
- unless CLI.commands.include?(command)
- print_error "Unknown command: #{command.dump}"
+ name = command.gsub(/^ronin-/,'')
+
+ unless CLI.commands.include?(name)
+ print_error "Unknown command: #{@command.dump}"
exit -1
end
- man_page = "ronin-#{command.tr(':','-')}.1"
+ man_page = "ronin-#{name.tr(':','-')}.1"
Installation.paths.each do |path|
man_path = File.join(path,'man',man_page)
@@ -71,7 +73,7 @@ module Ronin
end
end
- print_error "No man-page for the command: #{@command}"
+ print_error "No man-page for the command: #{@command.dump}"
exit -1
end
|
Strip any leading "ronin-" prefix for command names.
|
diff --git a/lib/thinking_sphinx/active_record/sql_builder.rb b/lib/thinking_sphinx/active_record/sql_builder.rb
index <HASH>..<HASH> 100644
--- a/lib/thinking_sphinx/active_record/sql_builder.rb
+++ b/lib/thinking_sphinx/active_record/sql_builder.rb
@@ -116,14 +116,6 @@ module ThinkingSphinx
condition
end
- def presenters_to_group(presenters)
- presenters.collect(&:to_group)
- end
-
- def presenters_to_select(presenters)
- presenters.collect(&:to_select)
- end
-
def groupings
groupings = source.groupings
if model.column_names.include?(model.inheritance_column)
diff --git a/lib/thinking_sphinx/active_record/sql_builder/statement.rb b/lib/thinking_sphinx/active_record/sql_builder/statement.rb
index <HASH>..<HASH> 100644
--- a/lib/thinking_sphinx/active_record/sql_builder/statement.rb
+++ b/lib/thinking_sphinx/active_record/sql_builder/statement.rb
@@ -55,6 +55,14 @@ module ThinkingSphinx
scope_by_order
end
+ def presenters_to_group(presenters)
+ presenters.collect(&:to_group)
+ end
+
+ def presenters_to_select(presenters)
+ presenters.collect(&:to_select)
+ end
+
def scope_by_select
self.scope = scope.select(pre_select + select_clause)
end
|
presenters_to_* are only needed by the statement.
One less reason for a touch of method_missing magic.
|
diff --git a/app/models/bag_type.rb b/app/models/bag_type.rb
index <HASH>..<HASH> 100644
--- a/app/models/bag_type.rb
+++ b/app/models/bag_type.rb
@@ -1,2 +1,3 @@
class BagType < ActiveRecord::Base
+ validates :description, presence: true
end
|
Added validation for 'description' for bag type.
|
diff --git a/gatt.go b/gatt.go
index <HASH>..<HASH> 100644
--- a/gatt.go
+++ b/gatt.go
@@ -50,7 +50,7 @@ func Stop() error {
if defaultDevice == nil {
return ErrDefaultDevice
}
- return nil
+ return defaultDevice.Stop()
}
// AdvertiseNameAndServices advertises device name, and specified service UUIDs.
diff --git a/linux/device.go b/linux/device.go
index <HASH>..<HASH> 100644
--- a/linux/device.go
+++ b/linux/device.go
@@ -83,7 +83,7 @@ func (d *Device) SetServices(svcs []*ble.Service) error {
// Stop stops gatt server.
func (d *Device) Stop() error {
- return d.HCI.Close()
+ return d.HCI.Stop()
}
// AdvertiseNameAndServices advertises device name, and specified service UUIDs.
|
Fix Stop() call of device
Stop did nothing before, now it call the Stop() of the hci device
|
diff --git a/src/ol/geom/multilinestring.js b/src/ol/geom/multilinestring.js
index <HASH>..<HASH> 100644
--- a/src/ol/geom/multilinestring.js
+++ b/src/ol/geom/multilinestring.js
@@ -311,7 +311,7 @@ ol.geom.MultiLineString.prototype.setFlatCoordinates =
* @param {Array.<ol.geom.LineString>} lineStrings LineStrings.
*/
ol.geom.MultiLineString.prototype.setLineStrings = function(lineStrings) {
- var layout = ol.geom.GeometryLayout.XY;
+ var layout = this.getLayout();
var flatCoordinates = [];
var ends = [];
var i, ii;
|
Issue #<I>: Prefer current layout as default on MultiLineString.setLineStrings()
|
diff --git a/src/Context/DBManager.php b/src/Context/DBManager.php
index <HASH>..<HASH> 100644
--- a/src/Context/DBManager.php
+++ b/src/Context/DBManager.php
@@ -60,7 +60,7 @@ class DBManager implements Interfaces\DBManagerInterface
if (! $this->connection) {
list($dns, $username, $password) = $this->getConnectionDetails();
- $this->connection = new PDO($dns, $username, $password);
+ $this->connection = new \PDO($dns, $username, $password);
}
return $this->connection;
diff --git a/tests/Unit/Context/DBManagerTest.php b/tests/Unit/Context/DBManagerTest.php
index <HASH>..<HASH> 100644
--- a/tests/Unit/Context/DBManagerTest.php
+++ b/tests/Unit/Context/DBManagerTest.php
@@ -54,13 +54,6 @@ class DBManagerTest extends TestHelper
$this->assertEquals($value, $result);
}
- public function testGetConnection()
- {
- $this->testObject->setConnection(null);
-
- $result = $this->testObject->getConnection();
- }
-
public function testGetPrimaryKeyForTableReturnNothing()
{
$database = 'my_app';
|
PDO class cannot be overriden
|
diff --git a/apostrophe.js b/apostrophe.js
index <HASH>..<HASH> 100644
--- a/apostrophe.js
+++ b/apostrophe.js
@@ -5371,7 +5371,7 @@ function Apos() {
if (!_.contains(self.slideshowTypes, item.type)) {
return callback(null);
}
- if (!item.items) {
+ if (item.ids) {
// Already migrated
return callback(null);
}
|
Use a safer test for whether slideshows have already been migrated
|
diff --git a/calendar/lib.php b/calendar/lib.php
index <HASH>..<HASH> 100644
--- a/calendar/lib.php
+++ b/calendar/lib.php
@@ -2953,11 +2953,12 @@ function calendar_add_icalendar_event($event, $courseid, $subscriptionid, $timez
$description = '';
} else {
$description = $event->properties['DESCRIPTION'][0]->value;
+ $description = clean_param($description, PARAM_NOTAGS);
$description = str_replace('\n', '<br />', $description);
$description = str_replace('\\', '', $description);
$description = preg_replace('/\s+/', ' ', $description);
}
- $eventrecord->description = clean_param($description, PARAM_NOTAGS);
+ $eventrecord->description = $description;
// Probably a repeating event with RRULE etc. TODO: skip for now.
if (empty($event->properties['DTSTART'][0]->value)) {
|
MDL-<I> calendar: Carry over line breaks on imports
Thanks to Matthias Schwabe for the patch suggestion
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -61,7 +61,7 @@ YandexBrowser.prototype = {
name: 'Yandex',
DEFAULT_CMD: {
- linux: 'google-yandex', //TODO (rachel.satoyama): fix linux
+ linux: 'yandex-browser',
darwin: '/Applications/Yandex.app/Contents/MacOS/Yandex',
win32: getYandexExe('YandexBrowser')
},
|
resolves #2: correct path to linux browser
|
diff --git a/lib/project/pro_motion/data_table.rb b/lib/project/pro_motion/data_table.rb
index <HASH>..<HASH> 100644
--- a/lib/project/pro_motion/data_table.rb
+++ b/lib/project/pro_motion/data_table.rb
@@ -58,7 +58,7 @@ module ProMotion
data_with_scope = data_model.send(data_scope)
end
- if data_with_scope.sort_descriptors.empty?
+ if data_with_scope.sort_descriptors.empty
# Try to be smart about how we sort things if a sort descriptor doesn't exist
attributes = data_model.send(:attribute_names)
sort_attribute = nil
@@ -67,7 +67,10 @@ module ProMotion
end
if sort_attribute
- mp "The `#{data_model}` model scope `#{data_scope}` needs a sort descriptor. Add sort_by(:property) to your scope. Currently sorting by :#{sort_attribute}.", force_color: :yellow
+
+ unless data_scope == :all
+ mp "The `#{data_model}` model scope `#{data_scope}` needs a sort descriptor. Add sort_by(:property) to your scope. Currently sorting by :#{sort_attribute}.", force_color: :yellow
+ end
data_model.send(data_scope).sort_by(sort_attribute)
else
# This is where the application says goodbye and dies in a fiery crash.
|
Removed warning on :all scope in DataTable
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -200,7 +200,7 @@ def get_extension_modules():
setup(name = 'turbodbc',
- version = '2.4.1',
+ version = '2.5.0',
description = 'turbodbc is a Python DB API 2.0 compatible ODBC driver',
include_package_data = True,
url = 'https://github.com/blue-yonder/turbodbc',
|
Bumped version number to <I>
|
diff --git a/gridsome/app/components/Link.js b/gridsome/app/components/Link.js
index <HASH>..<HASH> 100644
--- a/gridsome/app/components/Link.js
+++ b/gridsome/app/components/Link.js
@@ -69,6 +69,7 @@ export default {
attrs,
directives,
domProps: {
+ ...data.domProps,
__gLink__: true
}
}, children)
|
fix(g-link): add support for v-html (#<I>)
|
diff --git a/personalcapital/personalcapital.py b/personalcapital/personalcapital.py
index <HASH>..<HASH> 100644
--- a/personalcapital/personalcapital.py
+++ b/personalcapital/personalcapital.py
@@ -44,19 +44,19 @@ class PersonalCapital(object):
raise Exception()
def authenticate_password(self, password):
- self.__authenticate_password(password)
+ return self.__authenticate_password(password)
def two_factor_authenticate(self, mode, code):
if mode == TwoFactorVerificationModeEnum.SMS:
- self.__authenticate_sms(code)
+ return self.__authenticate_sms(code)
elif mode == TwoFactorVerificationModeEnum.EMAIL:
- self.__authenticate_email(code)
+ return self.__authenticate_email(code)
def two_factor_challenge(self, mode):
if mode == TwoFactorVerificationModeEnum.SMS:
- self.__challenge_sms()
+ return self.__challenge_sms()
elif mode == TwoFactorVerificationModeEnum.EMAIL:
- self.__challenge_email()
+ return self.__challenge_email()
def fetch(self, endpoint, data = None):
"""
|
Return request responses from auth methods for debugging
|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index <HASH>..<HASH> 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -40,11 +40,7 @@ RSpec.configure do |config|
FakeWeb.allow_net_connect = true
FakeWeb.clean_registry
- VCR::HttpStubbingAdapters::Faraday.reset!
- VCR::HttpStubbingAdapters::Excon.reset!
- VCR::HttpStubbingAdapters::WebMock.reset!
- VCR::HttpStubbingAdapters::FakeWeb.reset!
- VCR::HttpStubbingAdapters::Typhoeus.reset!
+ VCR::HttpStubbingAdapters::Common.adapters.each(&:reset!)
end
config.after(:each) do
|
Cleanup how we reset the stubbing adapters for the specs.
|
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index <HASH>..<HASH> 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -3777,7 +3777,7 @@ function reset_password_and_mail($user) {
$a->sitename = $site->fullname;
$a->username = $user->username;
$a->newpassword = $newpassword;
- $a->link = $CFG->wwwroot .'/login/change_password.php';
+ $a->link = $CFG->httpswwwroot .'/login/change_password.php';
$a->signoff = fullname($from, true).' ('. $from->email .')';
$message = get_string('newpasswordtext', '', $a);
@@ -3840,7 +3840,7 @@ function send_password_change_confirmation_email($user) {
$data->firstname = $user->firstname;
$data->sitename = $site->fullname;
- $data->link = $CFG->wwwroot .'/login/forgot_password.php?p='. $user->secret .'&s='. $user->username;
+ $data->link = $CFG->httpswwwroot .'/login/forgot_password.php?p='. $user->secret .'&s='. $user->username;
$data->admin = fullname($from).' ('. $from->email .')';
$message = get_string('emailpasswordconfirmation', '', $data);
|
Added HTTPSPAGEREQUIRED support to some mail functions.
Merged from MOODLE_<I>_STABLE
|
diff --git a/src/pikepdf/objects.py b/src/pikepdf/objects.py
index <HASH>..<HASH> 100644
--- a/src/pikepdf/objects.py
+++ b/src/pikepdf/objects.py
@@ -25,6 +25,14 @@ from . import _qpdf
from ._qpdf import Object, ObjectType, Operator
+# By default pikepdf.Object will identify itself as pikepdf._qpdf.Object
+# Here we change the module to discourage people from using that internal name
+# Instead it will become pikepdf.objects.Object
+Object.__module__ = __name__
+ObjectType.__module__ = __name__
+Operator.__module__ = __name__
+
+
# type(Object) is the metaclass that pybind11 defines; we wish to extend that
class _ObjectMeta(type(Object)):
"""Supports instance checking"""
|
Suppress 'pikepdf._qpdf' strings when exploring some objects
|
diff --git a/test/support/helper.js b/test/support/helper.js
index <HASH>..<HASH> 100644
--- a/test/support/helper.js
+++ b/test/support/helper.js
@@ -82,10 +82,12 @@ exports.compareToFile = function(value, originalFile, resultFile) {
exports.parseXML = function(xml, callback) {
var parser = sax.parser(true);
+ var i = 0;
var tree = [ {} ];
parser.onopentag = function(node) {
if (!(node.name in tree[0])) tree[0][node.name] = [];
+ node.attributes.__order__ = i++;
tree[0][node.name].push(node.attributes);
tree.unshift(node.attributes);
};
|
Cheap addition of node order. Fixes #<I>
|
diff --git a/app/controllers/api/activation_keys_controller.rb b/app/controllers/api/activation_keys_controller.rb
index <HASH>..<HASH> 100644
--- a/app/controllers/api/activation_keys_controller.rb
+++ b/app/controllers/api/activation_keys_controller.rb
@@ -89,7 +89,10 @@ class Api::ActivationKeysController < Api::ApiController
param :environment_id, :identifier, :allow_nil => true
end
def update
- @activation_key.update_attributes!(params[:activation_key])
+ attrs = params[:activation_key].clone
+ attrs[:content_view_id] = nil if attrs.try(:[], :content_view_id) == false
+ @activation_key.update_attributes!(attrs)
+
render :json => ActivationKey.find(@activation_key.id)
end
|
<I> - Created a way to remove views from keys
|
diff --git a/src/Element/BoxSizer.php b/src/Element/BoxSizer.php
index <HASH>..<HASH> 100644
--- a/src/Element/BoxSizer.php
+++ b/src/Element/BoxSizer.php
@@ -40,29 +40,14 @@ class BoxSizer implements ElementInterface
{
switch ($key) {
case 'orientation':
- $this->attributes[$key] = $this->assert(
- $value == 'horizontal',
- wxHORIZONTAL,
+ $this->attributes[$key] =
+ $value == 'horizontal' ?
+ wxHORIZONTAL :
wxVERTICAL
- );
+ ;
default:
$this->attributes[$key] = $value;
break;
}
}
-
- /**
- * Assert a value/expression is true
- *
- * @param boolean $assertion
- * @param boolean $true
- * @param boolean $false
- * @return boolean
- */
- protected function assert($assertion, $true = true, $false = false)
- {
- if ($assertion) return $true;
-
- return $false;
- }
}
\ No newline at end of file
|
Remove pointless assert method. Closes #6
|
diff --git a/lib/solargraph/api_map.rb b/lib/solargraph/api_map.rb
index <HASH>..<HASH> 100755
--- a/lib/solargraph/api_map.rb
+++ b/lib/solargraph/api_map.rb
@@ -340,11 +340,10 @@ module Solargraph
# @param scope [Symbol] :instance or :class
# @return [Array<Solargraph::Pin::Base>]
def get_method_stack fqns, name, scope: :instance
- # @todo Caches don't work on this query
- # cached = cache.get_method_stack(fqns, name, scope)
- # return cached.clone unless cached.nil?
+ cached = cache.get_method_stack(fqns, name, scope)
+ return cached unless cached.nil?
result = get_methods(fqns, scope: scope, visibility: [:private, :protected, :public]).select{|p| p.name == name}
- # cache.set_method_stack(fqns, name, scope, result)
+ cache.set_method_stack(fqns, name, scope, result)
result
end
|
ApiMap caches method stacks.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -65,7 +65,7 @@ def is_requirement(line):
README = open(os.path.join(os.path.dirname(__file__), 'README.rst')).read()
-VERSION = '2.1.2'
+VERSION = '2.1.3'
if sys.argv[-1] == 'tag':
print("Tagging the version on github:")
|
chore: Bump patch version number to <I> after requirements upgrade.
|
diff --git a/library/src/test/java/com/evernote/android/job/DailyJobTest.java b/library/src/test/java/com/evernote/android/job/DailyJobTest.java
index <HASH>..<HASH> 100644
--- a/library/src/test/java/com/evernote/android/job/DailyJobTest.java
+++ b/library/src/test/java/com/evernote/android/job/DailyJobTest.java
@@ -143,4 +143,15 @@ public class DailyJobTest extends BaseJobManagerTest {
assertThat(request.getExtras().getLong(DailyJob.EXTRA_END_MS, -1)).isEqualTo(1L);
assertThat(request.getExtras().size()).isEqualTo(3);
}
+
+ @Test
+ public void verifyDailyJobIsNotExact() {
+ long time = 1L;
+
+ int jobId = DailyJob.schedule(DummyJobs.createBuilder(DummyJobs.SuccessJob.class), time, time);
+ JobRequest request = manager().getJobRequest(jobId);
+
+ assertThat(request).isNotNull();
+ assertThat(request.isExact()).isFalse();
+ }
}
|
Add a test that verifies that daily jobs aren't exact
|
diff --git a/wrappers/java/src/main/java/org/hyperledger/indy/sdk/pool/Pool.java b/wrappers/java/src/main/java/org/hyperledger/indy/sdk/pool/Pool.java
index <HASH>..<HASH> 100644
--- a/wrappers/java/src/main/java/org/hyperledger/indy/sdk/pool/Pool.java
+++ b/wrappers/java/src/main/java/org/hyperledger/indy/sdk/pool/Pool.java
@@ -141,7 +141,7 @@ public class Pool extends SovrinJava.API {
}
};
- int result = LibSovrin.api.sovrin_refresh_pool_ledger(
+ int result = LibSovrin.api.sovrin_close_pool_ledger(
FIXED_COMMAND_HANDLE,
handle,
callback);
|
Pool.closePoolLedger method did not use correct C-callable sdk function.
|
diff --git a/opal/clearwater/application.rb b/opal/clearwater/application.rb
index <HASH>..<HASH> 100644
--- a/opal/clearwater/application.rb
+++ b/opal/clearwater/application.rb
@@ -24,6 +24,12 @@ module Clearwater
router.application = self
component.router = router if component
+ if `#@component.type === 'Thunk' && typeof #@component.render === 'function'`
+ warn "Application root component (#{@component}) points to a cached " +
+ "component. Cached components must not be persistent components, " +
+ "such as application roots or routing targets."
+ end
+
@document.on 'visibilitychange' do
if @render_on_visibility_change
@render_on_visibility_change = false
diff --git a/opal/clearwater/router/route.rb b/opal/clearwater/router/route.rb
index <HASH>..<HASH> 100644
--- a/opal/clearwater/router/route.rb
+++ b/opal/clearwater/router/route.rb
@@ -9,6 +9,12 @@ module Clearwater
@key = options.fetch(:key)
@target = options.fetch(:target)
@parent = options.fetch(:parent)
+
+ if `#@target.type === 'Thunk' && typeof #@target.render === 'function'`
+ warn "Route '#{key}' points to a cached component. Cached " +
+ "components must not be persistent components, such as " +
+ "application roots or routing targets."
+ end
end
def route *args, &block
|
Warn when trying to cache persistent components
|
diff --git a/jsonapi/models.py b/jsonapi/models.py
index <HASH>..<HASH> 100644
--- a/jsonapi/models.py
+++ b/jsonapi/models.py
@@ -1 +0,0 @@
-# lint_ignore=C0110
|
move lint options to pylama.ini from files
|
diff --git a/lib/podio/models/file_attachment.rb b/lib/podio/models/file_attachment.rb
index <HASH>..<HASH> 100644
--- a/lib/podio/models/file_attachment.rb
+++ b/lib/podio/models/file_attachment.rb
@@ -36,6 +36,10 @@ class Podio::FileAttachment < ActivePodio::Base
'file'
end
+ def raw_data
+ Podio.connection.get(self.link).body
+ end
+
class << self
# Accepts an open file stream along with a file name and uploads the file to Podio
# @see https://developers.podio.com/doc/files/upload-file-1004361
|
Add method for getting raw file data from a file object
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.