diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/nodeup/pkg/model/secrets.go b/nodeup/pkg/model/secrets.go
index <HASH>..<HASH> 100644
--- a/nodeup/pkg/model/secrets.go
+++ b/nodeup/pkg/model/secrets.go
@@ -60,19 +60,17 @@ func (b *SecretBuilder) Build(c *fi.ModelBuilderContext) error {
if b.SecretStore != nil {
key := "dockerconfig"
- dockercfg, err := b.SecretStore.Secret(key)
- if err != nil {
- return err
- }
- contents := string(dockercfg.Data)
-
- t := &nodetasks.File{
- Path: filepath.Join("root", ".docker", "config.json"),
- Contents: fi.NewStringResource(contents),
- Type: nodetasks.FileType_File,
- Mode: s("0600"),
+ dockercfg, _ := b.SecretStore.Secret(key)
+ if dockercfg != nil {
+ contents := string(dockercfg.Data)
+ t := &nodetasks.File{
+ Path: filepath.Join("root", ".docker", "config.json"),
+ Contents: fi.NewStringResource(contents),
+ Type: nodetasks.FileType_File,
+ Mode: s("0600"),
+ }
+ c.AddTask(t)
}
- c.AddTask(t)
}
// if we are not a master we can stop here
|
Don't error if the dockerconfig isn't present
|
diff --git a/openquake/calculators/tests/ucerf_event_based_test.py b/openquake/calculators/tests/ucerf_event_based_test.py
index <HASH>..<HASH> 100644
--- a/openquake/calculators/tests/ucerf_event_based_test.py
+++ b/openquake/calculators/tests/ucerf_event_based_test.py
@@ -16,13 +16,16 @@
# You should have received a copy of the GNU Affero General Public License
# along with OpenQuake. If not, see <http://www.gnu.org/licenses/>.
+import h5py
+import unittest
from openquake.qa_tests_data import ucerf
-from openquake.calculators.tests import CalculatorTestCase, check_platform
+from openquake.calculators.tests import CalculatorTestCase
class UcerfTestCase(CalculatorTestCase):
def test(self):
- check_platform('xenial') # because there is h5py 2.6
+ if h5py.__version__ < '2.3.0':
+ raise unittest.SkipTest # UCERF requires vlen arrays
out = self.run_calc(ucerf.__file__, 'job.ini', exports='txt')
num_exported = len(out['gmf_data', 'txt'])
# just check that two realizations are exported
|
Added an explicit check on h5py.__version__
|
diff --git a/tika/tika.py b/tika/tika.py
index <HASH>..<HASH> 100755
--- a/tika/tika.py
+++ b/tika/tika.py
@@ -543,7 +543,6 @@ def callServer(verb, serverEndpoint, service, data, headers, verbose=Verbose, ti
effectiveRequestOptions.update(requestOptions)
resp = verbFn(serviceUrl, encodedData, **effectiveRequestOptions)
- encodedData.close() # closes the file reading data
if verbose:
print(sys.stderr, "Request headers: ", headers)
|
Remove closing on bytes
Actually as the callServer get's the reader from the parent, the parent should be responsible for closing it. If the caller needs to have the file opened less time it should manage the read itself and after that call callServer with bytes directly in my opinion.
|
diff --git a/src/build.js b/src/build.js
index <HASH>..<HASH> 100755
--- a/src/build.js
+++ b/src/build.js
@@ -43,7 +43,7 @@ for (let type in db) {
);
}
- // Cache the hightest ranking type for this extension
+ // Cache the highest ranking type for this extension
if (keep === entry) byExtension[ext] = entry;
});
}
|
Correct spelling mistake (#<I>)
|
diff --git a/tangy-form-reducer.js b/tangy-form-reducer.js
index <HASH>..<HASH> 100644
--- a/tangy-form-reducer.js
+++ b/tangy-form-reducer.js
@@ -98,6 +98,7 @@ const tangyFormReducer = function (state = initialState, action) {
case 'UNLOCK':
return Object.assign({}, state, {
complete: false,
+ hasUnlocked: true,
endUnixtime: undefined,
form: Object.assign({}, state.form, {
complete: false,
diff --git a/tangy-form-response-model.js b/tangy-form-response-model.js
index <HASH>..<HASH> 100644
--- a/tangy-form-response-model.js
+++ b/tangy-form-response-model.js
@@ -7,6 +7,7 @@ export class TangyFormResponseModel {
this.items = []
// States.
this.complete = false
+ this.hasUnlocked = false
// Focus indexes.
// @TODO: We can probably get rid of these indexes.
this.focusIndex = 0
|
Add TangyFormResponse.hasLocked property, set it when first submitting
|
diff --git a/src/experi/run.py b/src/experi/run.py
index <HASH>..<HASH> 100644
--- a/src/experi/run.py
+++ b/src/experi/run.py
@@ -315,7 +315,7 @@ def run_pbs_jobs(
if prev_jobids:
# Continue to append all previous jobs to submit_cmd so subsequent jobs die along
# with the first.
- submit_cmd += ["-W", "depend=afterok:{} ".format(",".join(prev_jobids))]
+ submit_cmd += ["-W", "depend=afterok:{} ".format(":".join(prev_jobids))]
# acutally run the command
logger.info(str(submit_cmd))
|
BUG Dependent jobs are separated by colon
|
diff --git a/PHPCI/Plugin/PhpMessDetector.php b/PHPCI/Plugin/PhpMessDetector.php
index <HASH>..<HASH> 100755
--- a/PHPCI/Plugin/PhpMessDetector.php
+++ b/PHPCI/Plugin/PhpMessDetector.php
@@ -86,6 +86,11 @@ class PhpMessDetector implements \PHPCI\Plugin
$suffixes = ' --suffixes ' . implode(',', $this->suffixes);
}
+ if (!empty($this->rules) && !is_array($this->rules)) {
+ $this->phpci->logFailure('The "rules" option must be an array.');
+ return false;
+ }
+
foreach ($this->rules as &$rule) {
if (strpos($rule, '/') !== false) {
$rule = $this->phpci->buildPath . $rule;
|
Updating PHPMD to enforce rules being an array. Fixes #<I>
|
diff --git a/protempa-framework/src/main/java/org/protempa/QuerySession.java b/protempa-framework/src/main/java/org/protempa/QuerySession.java
index <HASH>..<HASH> 100644
--- a/protempa-framework/src/main/java/org/protempa/QuerySession.java
+++ b/protempa-framework/src/main/java/org/protempa/QuerySession.java
@@ -38,6 +38,16 @@ public class QuerySession {
public Query getQuery() {
return query;
}
+
+ public void addPropositionToCache (Object uid, Proposition proposition) {
+ this.propositionCache.put(uid, proposition);
+ }
+
+ public void addPropositionsToCache (List<Proposition> propositions) {
+ for (Proposition p : propositions) {
+ addPropositionToCache(p.getUniqueIdentifier(), p);
+ }
+ }
public List<Proposition> getReferences(Proposition prop, String name) throws DataSourceReadException {
List<Proposition> references = new LinkedList<Proposition>();
|
Added two new methods, addPropositionToCache() and addPropositionsToCache(), to add Proposition objects to the cache for later retrieval. For example, the cache will be used when the getReferences() method is called to materialize Proposition objects using their UID.
|
diff --git a/test/e2e/es_cluster_logging.go b/test/e2e/es_cluster_logging.go
index <HASH>..<HASH> 100644
--- a/test/e2e/es_cluster_logging.go
+++ b/test/e2e/es_cluster_logging.go
@@ -30,8 +30,7 @@ import (
. "github.com/onsi/gomega"
)
-// Flaky issue #17873
-var _ = Describe("Cluster level logging using Elasticsearch [Flaky]", func() {
+var _ = Describe("Cluster level logging using Elasticsearch [Feature:Elasticsearch]", func() {
f := NewFramework("es-logging")
BeforeEach(func() {
|
mark Elasticsearch test as Feature
|
diff --git a/lib/resque_cleaner/server.rb b/lib/resque_cleaner/server.rb
index <HASH>..<HASH> 100644
--- a/lib/resque_cleaner/server.rb
+++ b/lib/resque_cleaner/server.rb
@@ -1,3 +1,5 @@
+require 'yaml'
+
# Extends Resque Web Based UI.
# Structure has been borrowed from ResqueScheduler.
module ResqueCleaner
|
resque <I> seems requiring yaml
|
diff --git a/intake/source/cache.py b/intake/source/cache.py
index <HASH>..<HASH> 100644
--- a/intake/source/cache.py
+++ b/intake/source/cache.py
@@ -270,7 +270,7 @@ class FileCache(BaseCache):
self._ensure_cache_dir()
subdir = self._hash(urlpath)
- files_in = open_files(urlpath, 'rb')
+ files_in = open_files(urlpath, 'rb', **self._storage_options)
files_out = [open_files([self._path(f.path, subdir)], 'wb',
**self._storage_options)[0]
for f in files_in]
|
Passing storage options to open_files for download.
|
diff --git a/salt/modules/pacman.py b/salt/modules/pacman.py
index <HASH>..<HASH> 100644
--- a/salt/modules/pacman.py
+++ b/salt/modules/pacman.py
@@ -78,6 +78,14 @@ def latest_version(*names, **kwargs):
except (ValueError, IndexError):
pass
+ pkgs = {}
+
+ for name in names:
+ if not ret[name]:
+ if not pkgs:
+ pkgs = list_pkgs()
+ if name in pkgs:
+ ret[name] = pkgs[name]
# Return a string if only one package name passed
if len(names) == 1:
return ret[names[0]]
|
Return locally installed version if no newer is available
|
diff --git a/moto/awslambda/models.py b/moto/awslambda/models.py
index <HASH>..<HASH> 100644
--- a/moto/awslambda/models.py
+++ b/moto/awslambda/models.py
@@ -115,7 +115,7 @@ class LambdaFunction(object):
#print "moto_lambda_debug: ", mycode
sys.stdout = codeOut
sys.stderr = codeErr
- exec mycode
+ exec(mycode)
exec_err = codeErr.getvalue()
exec_out = codeOut.getvalue()
result = "\n".join([exec_out, exec_err])
|
attmpt 3 not liking Python 3 very much at the moment
|
diff --git a/superset/db_engine_specs/base.py b/superset/db_engine_specs/base.py
index <HASH>..<HASH> 100644
--- a/superset/db_engine_specs/base.py
+++ b/superset/db_engine_specs/base.py
@@ -1255,6 +1255,14 @@ class BaseEngineSpec: # pylint: disable=too-many-public-methods
)
@classmethod
+ def is_select_query(cls, parsed_query: ParsedQuery) -> bool:
+ """
+ Determine if the statement should be considered as SELECT statement.
+ Some query dialects do not contain "SELECT" word in queries (eg. Kusto)
+ """
+ return parsed_query.is_select()
+
+ @classmethod
@utils.memoized
def get_column_spec(
cls,
diff --git a/superset/sql_lab.py b/superset/sql_lab.py
index <HASH>..<HASH> 100644
--- a/superset/sql_lab.py
+++ b/superset/sql_lab.py
@@ -217,7 +217,7 @@ def execute_sql_statement(
query.select_as_cta_used = True
# Do not apply limit to the CTA queries when SQLLAB_CTAS_NO_LIMIT is set to true
- if parsed_query.is_select() and not (
+ if db_engine_spec.is_select_query(parsed_query) and not (
query.select_as_cta_used and SQLLAB_CTAS_NO_LIMIT
):
if SQL_MAX_ROW and (not query.limit or query.limit > SQL_MAX_ROW):
|
feat: Add "is_select_query" method to base engine spec to make it possible to override it (#<I>)
|
diff --git a/build.go b/build.go
index <HASH>..<HASH> 100644
--- a/build.go
+++ b/build.go
@@ -528,6 +528,9 @@ func ldflags() string {
b.WriteString(fmt.Sprintf(" -X main.commit=%s", getGitSha()))
b.WriteString(fmt.Sprintf(" -X main.buildstamp=%d", buildStamp()))
b.WriteString(fmt.Sprintf(" -X main.buildBranch=%s", getGitBranch()))
+ if v := os.Getenv("LDFLAGS"); v != "" {
+ b.WriteString(fmt.Sprintf(" -extldflags=%s", v))
+ }
return b.String()
}
|
Build: Allow extending of LDFLAGS in build.go (#<I>)
Allow extending LDFALGS by setting LDFLAGS to be able to pass
-zrelro,-znow for Arch Linux packaging
to get full relro.
|
diff --git a/simuvex/plugins/solver.py b/simuvex/plugins/solver.py
index <HASH>..<HASH> 100644
--- a/simuvex/plugins/solver.py
+++ b/simuvex/plugins/solver.py
@@ -259,6 +259,15 @@ class SimSolver(SimStatePlugin):
raise SimValueError("concretized %d values (%d required) in exactly_n" % (len(r), n))
return r
+ def exactly_int(self, e, extra_constraints=(), default=None):
+ r = self.any_n_int(e, 1, extra_constraints=extra_constraints)
+ if len(r) != 1:
+ if default is None:
+ raise SimValueError("concretized %d values (%d required) in exactly_n" % (len(r), n))
+ else:
+ return default
+ return r
+
def unique(self, e, extra_constraints=()):
if type(e) is not claripy.A:
return True
|
Added an exactly_int() function to SimSolver.
|
diff --git a/lib/chronic/repeater.rb b/lib/chronic/repeater.rb
index <HASH>..<HASH> 100644
--- a/lib/chronic/repeater.rb
+++ b/lib/chronic/repeater.rb
@@ -110,13 +110,10 @@ module Chronic
# returns the next occurance of this repeatable.
def next(pointer)
!@now.nil? || raise("Start point must be set before calling #next")
- [:future, :none, :past].include?(pointer) || raise("First argument 'pointer' must be one of :past or :future")
- #raise("Repeatable#next must be overridden in subclasses")
end
def this(pointer)
!@now.nil? || raise("Start point must be set before calling #this")
- [:future, :past, :none].include?(pointer) || raise("First argument 'pointer' must be one of :past, :future, :none")
end
def to_s
|
these should never raise as a prior check is done against context
|
diff --git a/fedora_messaging/tests/unit/test_cli.py b/fedora_messaging/tests/unit/test_cli.py
index <HASH>..<HASH> 100644
--- a/fedora_messaging/tests/unit/test_cli.py
+++ b/fedora_messaging/tests/unit/test_cli.py
@@ -486,7 +486,8 @@ class CallbackFromFilesytem(TestCase):
os.path.join(FIXTURES_DIR, "bad_cb") + ":missing"
)
- if sys.version_info >= (3, 10):
+ if sys.version_info >= (3, 10) and sys.version_info < (3, 10, 4):
+ # https://github.com/python/cpython/issues/90398
exc_msg = "invalid syntax. Perhaps you forgot a comma?"
else:
exc_msg = "invalid syntax"
|
Adjust to a message change in Python <I>
|
diff --git a/core/src/test/java/org/hibernate/ogm/backendtck/queries/JpaQueriesTest.java b/core/src/test/java/org/hibernate/ogm/backendtck/queries/JpaQueriesTest.java
index <HASH>..<HASH> 100644
--- a/core/src/test/java/org/hibernate/ogm/backendtck/queries/JpaQueriesTest.java
+++ b/core/src/test/java/org/hibernate/ogm/backendtck/queries/JpaQueriesTest.java
@@ -152,10 +152,12 @@ public class JpaQueriesTest extends JpaTestCase {
@After
public void closeEmAndRemoveEntities() throws Exception {
- em.getTransaction().commit();
- removeEntities();
- em.close();
-
+ //Do not hide the real cause with an NPE if there are initialisation issues:
+ if ( em != null ) {
+ em.getTransaction().commit();
+ removeEntities();
+ em.close();
+ }
}
@Override
|
OGM-<I> Make sure the JpaQueriesTest doesn't hide the real cause when failing to initialize
|
diff --git a/tests/query/netinfo/test_base.py b/tests/query/netinfo/test_base.py
index <HASH>..<HASH> 100644
--- a/tests/query/netinfo/test_base.py
+++ b/tests/query/netinfo/test_base.py
@@ -26,7 +26,7 @@ Project link:
https://github.com/funilrys/PyFunceble
Project documentation:
- https://pyfunceble.readthedocs.io/en/master/
+ https://pyfunceble.readthedocs.io/en/dev/
Project homepage:
https://pyfunceble.github.io/
|
fixup! Introduction of the tests of the base of all netinfo interfaces.
|
diff --git a/vagrant_box_defaults.rb b/vagrant_box_defaults.rb
index <HASH>..<HASH> 100644
--- a/vagrant_box_defaults.rb
+++ b/vagrant_box_defaults.rb
@@ -5,7 +5,7 @@ Vagrant.require_version ">= 2.2.0"
$SERVER_BOX = "cilium/ubuntu-dev"
$SERVER_VERSION= "185"
$NETNEXT_SERVER_BOX= "cilium/ubuntu-next"
-$NETNEXT_SERVER_VERSION= "79"
+$NETNEXT_SERVER_VERSION= "80"
@v419_SERVER_BOX= "cilium/ubuntu-4-19"
@v419_SERVER_VERSION= "26"
@v49_SERVER_BOX= "cilium/ubuntu"
|
vagrant: bump bpf-next vagrant box version
Pull in latest BPF kernel tree from bpf-next which contains extended
bpf_{get,set}sockopt() helper support for sock_addr programs [0].
[0] <URL>
|
diff --git a/Annis-web/src/main/webapp/javascript/annis/CorpusListWindow.js b/Annis-web/src/main/webapp/javascript/annis/CorpusListWindow.js
index <HASH>..<HASH> 100644
--- a/Annis-web/src/main/webapp/javascript/annis/CorpusListWindow.js
+++ b/Annis-web/src/main/webapp/javascript/annis/CorpusListWindow.js
@@ -105,7 +105,7 @@ Ext.onReady(function()
id: id,
closable:true,
maximizable: false,
- width:800,
+ width: (Ext.getBody().getViewSize().width - windowSearchFormWidth - 25),
height:Ext.getBody().getViewSize().height - 35,
//border:false,
plain:true,
|
- resize the CorpusListWindow according to the real size of the browser
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -20,6 +20,8 @@ import gui
version = gui.__version__
if sys.version_info > (3, ):
version += "-py3k"
+else:
+ version += "-py2x"
# append install on windows
if len(sys.argv) == 1 and sys.platform.startswith("win"):
|
add -py2x to version in setup
|
diff --git a/core/query.go b/core/query.go
index <HASH>..<HASH> 100644
--- a/core/query.go
+++ b/core/query.go
@@ -2,6 +2,7 @@ package core
import (
"sync"
+ "time"
"github.com/degdb/degdb/protocol"
"github.com/degdb/degdb/query"
@@ -54,9 +55,19 @@ func (s *server) ExecuteQuery(q *protocol.QueryRequest) ([]*protocol.Triple, err
return
}
triplesLock.Lock()
+ // TODO(d4l3k): Deduplicate triples
triples = append(triples, msg.GetQueryResponse().Triples...)
triplesLock.Unlock()
- wg.Done()
+ done := make(chan bool, 1)
+ go func() {
+ wg.Done()
+ done <- true
+ }()
+ go func() {
+ time.Sleep(10 * time.Second)
+ done <- true
+ }()
+ <-done
}()
}
wg.Wait()
|
Added timeout to unrooted queries
|
diff --git a/lib/spork/run_strategy/forking.rb b/lib/spork/run_strategy/forking.rb
index <HASH>..<HASH> 100644
--- a/lib/spork/run_strategy/forking.rb
+++ b/lib/spork/run_strategy/forking.rb
@@ -20,6 +20,7 @@ class Spork::RunStrategy::Forking < Spork::RunStrategy
end
def preload
+ require test_framework.entry_point
test_framework.preload
end
|
fixes regression where entry point was not being loaded
|
diff --git a/staging/src/k8s.io/client-go/testing/actions.go b/staging/src/k8s.io/client-go/testing/actions.go
index <HASH>..<HASH> 100644
--- a/staging/src/k8s.io/client-go/testing/actions.go
+++ b/staging/src/k8s.io/client-go/testing/actions.go
@@ -439,8 +439,18 @@ func (a ActionImpl) GetSubresource() string {
return a.Subresource
}
func (a ActionImpl) Matches(verb, resource string) bool {
+ // Stay backwards compatible.
+ if !strings.Contains(resource, "/") {
+ return strings.EqualFold(verb, a.Verb) &&
+ strings.EqualFold(resource, a.Resource.Resource)
+ }
+
+ parts := strings.SplitN(resource, "/", 2)
+ topresource, subresource := parts[0], parts[1]
+
return strings.EqualFold(verb, a.Verb) &&
- strings.EqualFold(resource, a.Resource.Resource)
+ strings.EqualFold(topresource, a.Resource.Resource) &&
+ strings.EqualFold(subresource, a.Subresource)
}
func (a ActionImpl) DeepCopy() Action {
ret := a
|
Allow Action's Matches function to specify a subresource.
In other parts of the system (notably in RBAC rules), the "resource/subresource" notation is common to specify an explicit subresource. This makes this notation available to tests that use the `Matches` function on client actions as well.
Backwards compatibility is kept by ignoring the `Subresource` field if no specific subresource is defined in the resource string itself.
|
diff --git a/admin/lang.php b/admin/lang.php
index <HASH>..<HASH> 100644
--- a/admin/lang.php
+++ b/admin/lang.php
@@ -628,6 +628,9 @@ function lang_fix_value_before_save($value='') {
if ($CFG->lang != "zh_hk" and $CFG->lang != "zh_tw") { // Some MB languages include backslash bytes
$value = str_replace("\\","",$value); // Delete all slashes
}
+ if (ini_get_bool('magic_quotes_sybase')) { // Unescape escaped sybase quotes
+ $value = str_replace("''", "'", $value);
+ }
$value = str_replace("'", "\\'", $value); // Add slashes for '
$value = str_replace('"', "\\\"", $value); // Add slashes for "
$value = str_replace("%","%%",$value); // Escape % characters
|
Now sybase quotes are properly handled by the lang editor. Part of MDL-<I>
Merged from MOODLE_<I>_STABLE
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -47,7 +47,7 @@ ext_modules=[
if use_cython:
from Cython.Build import cythonize
try:
- ext_modules = cythonize(join('pybasicbayes','**','*.pyx'))
+ ext_modules = cythonize(os.path.join('pybasicbayes','**','*.pyx'))
except:
warn('Failed to generate extension module code from Cython files')
diff --git a/tests/test_gammadirichlet.py b/tests/test_gammadirichlet.py
index <HASH>..<HASH> 100644
--- a/tests/test_gammadirichlet.py
+++ b/tests/test_gammadirichlet.py
@@ -8,7 +8,7 @@ from nose.plugins.attrib import attr
import pybasicbayes.distributions as distributions
-@attr('GammaCompoundDirichlet')
+@attr('GammaCompoundDirichlet', 'slow')
class TestDirichletCompoundGamma(object):
def test_weaklimit(self):
a = distributions.CRP(10,1)
|
mark test_gammadirichlet as slow, fix os.path.join in setup.py
|
diff --git a/builder/azure/arm/config.go b/builder/azure/arm/config.go
index <HASH>..<HASH> 100644
--- a/builder/azure/arm/config.go
+++ b/builder/azure/arm/config.go
@@ -787,6 +787,10 @@ func assertRequiredParametersSet(c *Config, errs *packer.MultiError) {
for _, rid := range c.UserAssignedManagedIdentities {
r, err := client.ParseResourceID(rid)
if err != nil {
+ err := fmt.Errorf("Error parsing resource ID from `user_assigned_managed_identities`; please make sure"+
+ " that this value follows the full resource id format: "+
+ "/subscriptions/<SUBSCRIPTON_ID>/resourcegroups/<RESOURCE_GROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/<USER_ASSIGNED_IDENTITY_NAME>.\n"+
+ " Original error: %s", err)
errs = packer.MultiErrorAppend(errs, err)
} else {
if !strings.EqualFold(r.Provider, "Microsoft.ManagedIdentity") {
|
provide more helpful error message than the one returned by the client, without context
|
diff --git a/system/src/Grav/Common/GPM/GPM.php b/system/src/Grav/Common/GPM/GPM.php
index <HASH>..<HASH> 100644
--- a/system/src/Grav/Common/GPM/GPM.php
+++ b/system/src/Grav/Common/GPM/GPM.php
@@ -323,13 +323,20 @@ class GPM extends Iterator
return $found;
}
- foreach ($this->getRepositoryThemes() as $slug => $theme) {
+ $themes = $this->getRepositoryThemes();
+ $plugins = $this->getRepositoryPlugins();
+
+ if (!$themes && !$plugins) {
+ throw new \RuntimeException("GPM not reachable. Please check your internet connection or check the Grav site is reachable");
+ }
+
+ if ($themes) foreach ($themes as $slug => $theme) {
if ($search == $slug || $search == $theme->name) {
return $theme;
}
}
- foreach ($this->getRepositoryPlugins() as $slug => $plugin) {
+ if ($plugins) foreach ($plugins as $slug => $plugin) {
if ($search == $slug || $search == $plugin->name) {
return $plugin;
}
|
Improve error when trying to install a plugin/theme from the command line and GPM is unreachable
Previously it listed four times `PHP Warning: Invalid argument
supplied for foreach()...`, now it fails with an error message
|
diff --git a/core/src/main/java/com/orientechnologies/orient/core/config/OGlobalConfiguration.java b/core/src/main/java/com/orientechnologies/orient/core/config/OGlobalConfiguration.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/config/OGlobalConfiguration.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/config/OGlobalConfiguration.java
@@ -158,7 +158,7 @@ public enum OGlobalConfiguration {
// NETWORK
NETWORK_SOCKET_BUFFER_SIZE("network.socketBufferSize", "TCP/IP Socket buffer size", Integer.class, 32768),
- NETWORK_LOCK_TIMEOUT("network.lockTimeout", "Timeout in ms to acquire a lock against a channel", Integer.class, 10000),
+ NETWORK_LOCK_TIMEOUT("network.lockTimeout", "Timeout in ms to acquire a lock against a channel", Integer.class, 15000),
NETWORK_SOCKET_TIMEOUT("network.socketTimeout", "TCP/IP Socket timeout in ms", Integer.class, 10000),
|
Setted timeout on lock at <I>secs
|
diff --git a/lib/crawl.rb b/lib/crawl.rb
index <HASH>..<HASH> 100644
--- a/lib/crawl.rb
+++ b/lib/crawl.rb
@@ -90,10 +90,10 @@ module CobwebModule
if within_queue_limits?
document_links = ContentLinkParser.new(@options[:url], content.body, @options).all_links(:valid_schemes => [:http, :https])
#get rid of duplicate links in the same page.
- document_link.uniq!
+ document_links.uniq!
# select the link if its internal
- internal_links = document_links.select! { |link| @cobweb_links.internal?(link) }
+ internal_links = document_links.select{ |link| @cobweb_links.internal?(link) }
# reject the link if we've crawled it or queued it
internal_links.reject! { |link| @redis.sismember("crawled", link) }
|
fixed typo on document links and changed select! to select as it should not be descructive
|
diff --git a/lib/Doctrine/MongoDB/EagerCursor.php b/lib/Doctrine/MongoDB/EagerCursor.php
index <HASH>..<HASH> 100644
--- a/lib/Doctrine/MongoDB/EagerCursor.php
+++ b/lib/Doctrine/MongoDB/EagerCursor.php
@@ -154,11 +154,10 @@ class EagerCursor implements Iterator
*/
public function getSingleResult()
{
- $this->initialize();
- reset($this->data);
+ $this->rewind();
- if (key($this->data) !== null) {
- return current($this->data);
+ if ($this->valid()) {
+ return $this->current();
}
return null;
|
Use current() in EagerCursor::getSingleResult()
Older ODM versions depend on this behavior, as getSingleResult() is not extended with hydration logic (like current() is).
|
diff --git a/extension/genepattern/static/resources/navigation.js b/extension/genepattern/static/resources/navigation.js
index <HASH>..<HASH> 100644
--- a/extension/genepattern/static/resources/navigation.js
+++ b/extension/genepattern/static/resources/navigation.js
@@ -856,10 +856,15 @@ GenePattern.notebook.buildMenu = function(widget, element, name, href, kind, ind
var cellIndex = pairing[0];
var taskWidget = pairing[1];
var task = GenePattern.task(taskWidget.options.lsid);
+ var name = task !== null ? task.name() : null;
+
+ // If task is null, extract the task name from the widget
+ if (task === null) name = $(taskWidget.element).find(".gp-widget-task-name").text().trim();
+
sendToExistingTask
.append(
$("<option></option>")
- .text(task.name() + " [Cell " + cellIndex + "]")
+ .text(name + " [Cell " + cellIndex + "]")
.data("widget", taskWidget)
);
});
|
GP-<I> - Fix for "send to existing cell" when the cell contains an older version of a module
|
diff --git a/examples/python-guide/plot_example.py b/examples/python-guide/plot_example.py
index <HASH>..<HASH> 100644
--- a/examples/python-guide/plot_example.py
+++ b/examples/python-guide/plot_example.py
@@ -37,7 +37,7 @@ gbm = lgb.train(params,
lgb_train,
num_boost_round=100,
valid_sets=[lgb_train, lgb_test],
- feature_name=['f' + str(i + 1) for i in range(X_train.shape[-1])],
+ feature_name=[f'f{i + 1}' for i in range(X_train.shape[-1])],
categorical_feature=[21],
evals_result=evals_result,
verbose_eval=10)
|
[python-package] f-string format updated in plot_example.py (#<I>)
* f-string format updated.
* space removed
* Update examples/python-guide/plot_example.py according to suggestion.
|
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesScanTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesScanTests.java
index <HASH>..<HASH> 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesScanTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesScanTests.java
@@ -66,7 +66,7 @@ public class ConfigurationPropertiesScanTests {
load(TestConfiguration.class);
assertThat(this.context.containsBean(
"profile-org.springframework.boot.context.properties.scan.valid.a.AScanConfiguration$MyProfileProperties"))
- .isFalse();
+ .isFalse();
}
@Test
@@ -87,7 +87,7 @@ public class ConfigurationPropertiesScanTests {
load(TestConfiguration.class);
assertThat(this.context.containsBean(
"resource-org.springframework.boot.context.properties.scan.valid.a.AScanConfiguration$MyResourceProperties"))
- .isFalse();
+ .isFalse();
}
private void load(Class<?>... classes) {
|
Polish "Add negative tests to ConfigurationPropertiesScanTests"
Closes gh-<I>
|
diff --git a/lib/snapshot/runner.rb b/lib/snapshot/runner.rb
index <HASH>..<HASH> 100644
--- a/lib/snapshot/runner.rb
+++ b/lib/snapshot/runner.rb
@@ -46,7 +46,7 @@ module Snapshot
def config_launch_arguments
launch_arguments = Array(Snapshot.config[:launchArguments])
- if (launch_arguments.count == 1)
+ if launch_arguments.count == 1
[launch_arguments]
else
launch_arguments.map.with_index { |e, i| [i, e] }
|
fix rubocop violation: parens in if statement
|
diff --git a/js/product.js b/js/product.js
index <HASH>..<HASH> 100644
--- a/js/product.js
+++ b/js/product.js
@@ -404,11 +404,11 @@ Aimeos.Product.Catalog = {
this.items[idx]['css'] = '';
- if(ids.indexOf(this.items[idx]['catalog.id']) !== -1) {
+ if(ids.indexOf(this.items[idx]['product.lists.siteid'] + '-' + this.items[idx]['catalog.id']) !== -1) {
this.items[idx]['css'] = 'is-invalid';
}
- ids.push(this.items[idx]['catalog.id']);
+ ids.push(this.items[idx]['product.lists.siteid'] + '-' + this.items[idx]['catalog.id']);
}
}
}
|
Allow assigning same category for different sites
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -9,5 +9,7 @@ extensions = [Extension("cyphi/*", ["cyphi/*.pyx"],
setup(
name="cyphi",
+ version="0.0.0",
+ description="A Cython library for computing integrated information",
ext_modules=cythonize(extensions)
)
|
Add version and description to setup.py
|
diff --git a/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBusTest.java b/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBusTest.java
index <HASH>..<HASH> 100644
--- a/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBusTest.java
+++ b/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBusTest.java
@@ -67,20 +67,21 @@ public class EventBusTest extends AbstractTest
* Tests the remove operation and verifies that the observer is no longer
* registered for events.
*/
- @Test(groups = "observerMethod")
+ @Test(groups = {"observerMethod", "broken"})
public void testRemoveObserver()
{
EventBus eventBus = new EventBus(manager);
Observer<DangerCall> observer = new AnObserver<DangerCall>();
eventBus.addObserver(observer, DangerCall.class);
eventBus.removeObserver(observer, DangerCall.class);
+ // FIXME CopyOnWrite broke remove, have to check later
assert eventBus.getObservers(new DangerCall()).isEmpty();
}
/**
* Tests the deferred event feature associated with transactions.
*/
- @Test(groups = "deferredEvent")
+ @Test(groups = {"deferredEvent", "broken"})
public void testDeferEvent()
{
// Setup a transaction manager for this test and inject into the event bus
|
CopyOnWriteArrayList broke remove operation, have to check...
git-svn-id: <URL>
|
diff --git a/src/shared/transitions.js b/src/shared/transitions.js
index <HASH>..<HASH> 100644
--- a/src/shared/transitions.js
+++ b/src/shared/transitions.js
@@ -199,7 +199,7 @@ export var transitionManager = {
node.style.animation = node.style.animation
.split(', ')
.filter(function(anim) {
- return !/__svelte/.test(anim);
+ return anim.indexOf(name) === -1;
})
.join(', ');
}
|
only delete applicable transition animations - fixes #<I>
|
diff --git a/src/AsynchronousJobs/Job.php b/src/AsynchronousJobs/Job.php
index <HASH>..<HASH> 100644
--- a/src/AsynchronousJobs/Job.php
+++ b/src/AsynchronousJobs/Job.php
@@ -54,7 +54,9 @@ abstract class Job
{
$data = array();
foreach (get_object_vars($this) as $key => $value) {
- $data[$key] = $value;
+ if (strpos($key, '__') !== 0) {
+ $data[$key] = $value;
+ }
}
return $data;
|
Variables of class with double "_" are now ignored during data transfer between job instance and main instance.
|
diff --git a/src/Models/User.php b/src/Models/User.php
index <HASH>..<HASH> 100644
--- a/src/Models/User.php
+++ b/src/Models/User.php
@@ -1013,7 +1013,7 @@ class User extends Entry implements Authenticatable
}
/**
- * Change the password of the current user. This must be performed over SSL.
+ * Change the password of the current user. This must be performed over SSL / TLS.
*
* Throws an exception on failure.
*
|
Updated docblock for TLS
|
diff --git a/lib/svm_helper/selectors/forman.rb b/lib/svm_helper/selectors/forman.rb
index <HASH>..<HASH> 100644
--- a/lib/svm_helper/selectors/forman.rb
+++ b/lib/svm_helper/selectors/forman.rb
@@ -41,7 +41,8 @@ module Selector
features = all_words.reduce(Hash.new { |h, k| h[k] = [0,0] }) do |accumulator, bag|
label = bag.label ? 1 : 0
label_counts[label] += 1
- bag.features.each do |word|
+ # only count a feature once per bag
+ bag.features.uniq.each do |word|
unless accumulator.has_key?(word)
accumulator[word] = [0,0]
end
@@ -140,4 +141,4 @@ module Selector
x
end
end
-end
\ No newline at end of file
+end
|
only count a feature once per bag
|
diff --git a/src/plugins/poster/poster.js b/src/plugins/poster/poster.js
index <HASH>..<HASH> 100644
--- a/src/plugins/poster/poster.js
+++ b/src/plugins/poster/poster.js
@@ -91,8 +91,10 @@ class PosterPlugin extends UIContainerPlugin {
}
clicked() {
- this.container.play()
- this.hidePlayButton()
+ if (!this.options.chromeless) {
+ this.container.play()
+ this.hidePlayButton()
+ }
return false
}
@@ -119,6 +121,10 @@ class PosterPlugin extends UIContainerPlugin {
this.$playButton = this.$el.find('.poster-icon')
this.$playWrapper = this.$el.find('.play-wrapper')
process.nextTick(() => this.updateSize())
+ if (this.options.chromeless) {
+ this.hidePlayButton()
+ this.$el.css({'cursor': 'initial'})
+ }
return this
}
}
|
poster: avoid clicks on chromeless mode (close #<I>)
|
diff --git a/core/commands/repo.go b/core/commands/repo.go
index <HASH>..<HASH> 100644
--- a/core/commands/repo.go
+++ b/core/commands/repo.go
@@ -102,9 +102,9 @@ var repoStatCmd = &cmds.Command{
ShortDescription: `
'ipfs repo stat' is a plumbing command that will scan the local
set of stored objects and print repo statistics. It outputs to stdout:
-NumObjects int number of objects in the local repo
-RepoSize int size in bytes that the repo is currently taking
-RepoPath string the path to the repo being currently used
+NumObjects int Number of objects in the local repo.
+RepoPath string The path to the repo being currently used.
+RepoSize int Size in bytes that the repo is currently taking.
`,
},
Run: func(req cmds.Request, res cmds.Response) {
|
Small syntax changes to repo stat man
License: MIT
|
diff --git a/djoauth2/models.py b/djoauth2/models.py
index <HASH>..<HASH> 100644
--- a/djoauth2/models.py
+++ b/djoauth2/models.py
@@ -18,11 +18,7 @@ class Client(models.Model):
user = models.ForeignKey(User)
name = models.CharField(max_length=256)
description = models.TextField(null=True, blank=True)
- # From http://tools.ietf.org/html/rfc6749#section-3.1.2.2 :
- #
- # The authorization server SHOULD require all clients to register their
- # redirection endpoint prior to utilizing the authorization endpoint.
- #
+ image_url = models.URLField(null=True, blank=True)
redirect_uri = models.URLField(null=False, blank=False)
key = models.CharField(
db_index=True,
|
Add a field to hold a URL for a Client's logo or other image.
|
diff --git a/brozzler/js-templates/facebook.js b/brozzler/js-templates/facebook.js
index <HASH>..<HASH> 100644
--- a/brozzler/js-templates/facebook.js
+++ b/brozzler/js-templates/facebook.js
@@ -35,7 +35,7 @@ var umbraAboveBelowOrOnScreen = function(e) {
}
// comments - 'a.UFIPagerLink > span, a.UFIPagerLink, span.UFIReplySocialSentenceLinkText'
-var UMBRA_THINGS_TO_CLICK_SELECTOR = 'a.uiMorePagerPrimary, a[href^="/browse/likes"], *[rel="theater"]';
+var UMBRA_THINGS_TO_CLICK_SELECTOR = 'a[href^="/browse/likes"], *[rel="theater"]';
//div[class="phm pluginLikeboxStream"] = facebook widget embedded in 3rd party pages
var UMBRA_THINGS_TO_SCROLL_SELECTOR = 'div[class="phm pluginLikeboxStream"]';
var NUMBER_FAILED_SCROLL_ATTEMPTS_ON_THING_TO_SCROLL_BEFORE_STOP_SCROLLING = 5;
|
skip a.uiMorePagerPrimary after all
|
diff --git a/Kwf/Form/Field/SuperBoxSelect.php b/Kwf/Form/Field/SuperBoxSelect.php
index <HASH>..<HASH> 100644
--- a/Kwf/Form/Field/SuperBoxSelect.php
+++ b/Kwf/Form/Field/SuperBoxSelect.php
@@ -33,6 +33,7 @@ class Kwf_Form_Field_SuperBoxSelect extends Kwf_Form_Field_ComboBox
private function _getIdsFromPostData($postData)
{
+ if (!$postData[$this->getFieldName()]) return array();
return explode(',', $postData[$this->getFieldName()]);
}
|
fix saving of SuperBoxSelect without selected entries
|
diff --git a/monitor/services/src/main/java/org/datacleaner/monitor/server/media/FileUploadServlet.java b/monitor/services/src/main/java/org/datacleaner/monitor/server/media/FileUploadServlet.java
index <HASH>..<HASH> 100644
--- a/monitor/services/src/main/java/org/datacleaner/monitor/server/media/FileUploadServlet.java
+++ b/monitor/services/src/main/java/org/datacleaner/monitor/server/media/FileUploadServlet.java
@@ -119,8 +119,12 @@ public class FileUploadServlet extends HttpServlet {
File tempFolder = FileHelper.getTempDir();
try {
final File subDirectory = new File(tempFolder, ".datacleaner_upload");
- if (subDirectory.mkdirs()) {
+ subDirectory.mkdirs();
+
+ if (subDirectory.exists()) {
tempFolder = subDirectory;
+ } else {
+ logger.warn("Subdirectory '{}' was not created. ", subDirectory.getAbsolutePath());
}
} catch (final Exception e) {
logger.warn("Could not create subdirectory in temp folder", e);
|
#<I> Monitor's directory for temporary uploaded files was not used when it already existed.
|
diff --git a/src/frontend/org/voltdb/export/ExportDataSource.java b/src/frontend/org/voltdb/export/ExportDataSource.java
index <HASH>..<HASH> 100644
--- a/src/frontend/org/voltdb/export/ExportDataSource.java
+++ b/src/frontend/org/voltdb/export/ExportDataSource.java
@@ -728,7 +728,9 @@ public class ExportDataSource implements Comparable<ExportDataSource> {
if (m_runEveryWhere) {
exportingRole = "XDCR";
} else {
- exportingRole = (m_coordinator.isMaster() ? "TRUE" : "FALSE");
+ // Note that we are 'ACTIVE' == 'TRUE' only if we are export master AND we have
+ // an export client configured
+ exportingRole = (m_coordinator.isMaster() && m_client != null ? "TRUE" : "FALSE");
}
return new ExportStatsRow(m_partitionId, m_siteId, m_tableName, m_exportTargetName,
exportingRole, m_tupleCount, m_tuplesPending.get(),
|
ENG-<I>: do not report being ACTIVE if there is no client configured (#<I>)
|
diff --git a/lib/bbcloud/config.rb b/lib/bbcloud/config.rb
index <HASH>..<HASH> 100644
--- a/lib/bbcloud/config.rb
+++ b/lib/bbcloud/config.rb
@@ -96,7 +96,7 @@ class BBConfig
end
def to_fog
- raise Ini::Error, "No api client configured" if clients.empty?
+ raise Ini::Error, "No api client configured" unless configured?
c = config[client_name]
%w{api_url client_id secret}.each do |k|
if c[k].to_s.empty?
@@ -129,7 +129,7 @@ class BBConfig
def finish
begin
- if @oauth_token != Api.conn.oauth_token
+ if configured? and @oauth_token != Api.conn.oauth_token
File.open(oauth_token_filename + ".#{$$}", "w") do |f|
f.write Api.conn.oauth_token
end
@@ -141,4 +141,8 @@ class BBConfig
end
+ def configured?
+ client_name != nil and !clients.empty?
+ end
+
end
|
Fix ugly error when no command is called with no config. Closes #<I>
|
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index <HASH>..<HASH> 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -100,6 +100,14 @@ module ActiveRecord
# firing an additional query. This will often result in a
# performance improvement over a simple +join+.
#
+ # You can also specify multiple relationships, like this:
+ #
+ # users = User.includes(:address, :friends)
+ #
+ # Loading nested relationships is possible using a Hash:
+ #
+ # users = User.includes(:address, friends: [:address, :followers])
+ #
# === conditions
#
# If you want to add conditions to your included models you'll have
|
Improve ActiveRecord::QueryMethods#includes docs
It's not immediately clear whether you can pass in multiple relations or
not. After going through the code a bit, I saw that the arguments are
just appended to an array. Also, added nested relations example.
[ci skip]
|
diff --git a/lib/show-invisibles.js b/lib/show-invisibles.js
index <HASH>..<HASH> 100644
--- a/lib/show-invisibles.js
+++ b/lib/show-invisibles.js
@@ -45,6 +45,8 @@
peek = stream.peek() === ' ';
}
+
+ ret = 'cm-eol';
}
return ret;
@@ -70,7 +72,7 @@
rules += rule;
}
- style.textContent = getStyle() + '\n' + rules;
+ style.textContent = getStyle() + '\n' + getEOL() + '\n' + rules;
document.head.appendChild(style);
}
@@ -86,4 +88,18 @@
return style;
}
+
+ function getEOL() {
+ var style = [
+ '.CodeMirror-code > div > pre > span::after {',
+ 'position: absolute;',
+ 'pointer-events: none;',
+ 'color: #404F7D;',
+ 'content: "¬"',
+ '}',
+
+ ].join('');
+
+ return style;
+ }
});
|
feature(show-invisibles) show new lines
|
diff --git a/openquake/calculators/base.py b/openquake/calculators/base.py
index <HASH>..<HASH> 100644
--- a/openquake/calculators/base.py
+++ b/openquake/calculators/base.py
@@ -472,7 +472,6 @@ class HazardCalculator(BaseCalculator):
self.exposure = readinput.get_exposure(self.oqparam)
arefs = numpy.array(self.exposure.asset_refs, hdf5.vstr)
self.datastore['asset_refs'] = arefs
- self.datastore.flush()
self.datastore.set_attrs('asset_refs', nbytes=arefs.nbytes)
self.cost_calculator = readinput.get_cost_calculator(self.oqparam)
self.sitecol, self.assets_by_site = (
|
Removed a flush [skip CI]
Former-commit-id: cd<I>d<I>b<I>d8fe8ff<I>f<I>f<I>da<I>fe1ced
|
diff --git a/lark/load_grammar.py b/lark/load_grammar.py
index <HASH>..<HASH> 100644
--- a/lark/load_grammar.py
+++ b/lark/load_grammar.py
@@ -351,7 +351,10 @@ def _fix_escaping(s):
for n in i:
w += n
if n == '\\':
- n2 = next(i)
+ try:
+ n2 = next(i)
+ except StopIteration:
+ raise ValueError("Literal ended unexpectedly (bad escaping): `%r`" % s)
if n2 == '\\':
w += '\\\\'
elif n2 not in 'uxnftr':
|
Better error for literal with bad escaping (Issue #<I>)
|
diff --git a/lib/apiture/request_context.rb b/lib/apiture/request_context.rb
index <HASH>..<HASH> 100644
--- a/lib/apiture/request_context.rb
+++ b/lib/apiture/request_context.rb
@@ -86,7 +86,7 @@ module Apiture
content_types.each do |type|
content_type_mappings.each do |(parser, type_match)|
if type.match(type_match)
- conn.response(parser, content_type: type_match)
+ conn.response(parser, content_type: type_match, preserve_raw: true)
end
end
end
|
Preserve unparsed response body
|
diff --git a/source/js/date/VCO.DateUtil.js b/source/js/date/VCO.DateUtil.js
index <HASH>..<HASH> 100644
--- a/source/js/date/VCO.DateUtil.js
+++ b/source/js/date/VCO.DateUtil.js
@@ -10,8 +10,8 @@ VCO.DateUtil = {
sortByDate: function(array) { // only for use with slide data objects
array.sort(function(a,b){
- if (a.date.data.date_obj < b.date.data.date_obj) return -1;
- if (a.date.data.date_obj > b.date.data.date_obj) return 1;
+ if (a.date.isBefore(b.date)) return -1;
+ if (a.date.isAfter(b.date)) return 1;
return 0;
});
},
|
refactor sortByDate to use date comparison (will help with #2)
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ satdoc = dedent(sgp4.model.Satellite.__doc__.split('\n', 1)[1])
long_description = long_description.replace('entry.', 'entry.' + satdoc)
setup(name = 'sgp4',
- version = '1.3',
+ version = '1.4',
description = description,
long_description = long_description,
license = 'MIT',
diff --git a/sgp4/__init__.py b/sgp4/__init__.py
index <HASH>..<HASH> 100644
--- a/sgp4/__init__.py
+++ b/sgp4/__init__.py
@@ -97,6 +97,7 @@ was the most recently updated SGP4 implementation in their zip file:
Changelog
---------
+| 2015-01-15 — 1.4 — Display detailed help when TLE input does not match format.
| 2014-06-26 — 1.3 — Return ``(NaN,NaN,NaN)`` vectors on error and set ``.error_message``
| 2013-11-29 — 1.2 — Made ``epochyr`` 4 digits; add ``datetime`` for ``.epoch``
| 2012-11-22 — 1.1 — Python 3 compatibility; more documentation
|
Describe improved parser in changelog; declare <I>
|
diff --git a/lib/keepassx/database/dumper.rb b/lib/keepassx/database/dumper.rb
index <HASH>..<HASH> 100644
--- a/lib/keepassx/database/dumper.rb
+++ b/lib/keepassx/database/dumper.rb
@@ -34,7 +34,9 @@ module Keepassx
raise ArgumentError, 'File path is not set' if new_path.nil?
raise ArgumentError, 'Password is not set' if new_password.nil?
- File.write new_path, dump(new_password)
+ File.open(new_path, 'wb') do |file|
+ file.write dump(new_password)
+ end
end
|
Be sure to use binary mode when writing DB file
|
diff --git a/mimes.php b/mimes.php
index <HASH>..<HASH> 100644
--- a/mimes.php
+++ b/mimes.php
@@ -618,6 +618,7 @@ return [
"pfm" => "application/x-font-type1",
"afm" => "application/x-font-type1",
"woff" => "application/font-woff",
+ "woff2" => "application/font-woff2",
"arc" => "application/x-freearc",
"spl" => "application/x-futuresplash",
"gca" => "application/x-gca-compressed",
|
Add woff2 missing mime type
|
diff --git a/lib/google_distance_matrix/client_cache.rb b/lib/google_distance_matrix/client_cache.rb
index <HASH>..<HASH> 100644
--- a/lib/google_distance_matrix/client_cache.rb
+++ b/lib/google_distance_matrix/client_cache.rb
@@ -2,13 +2,17 @@ module GoogleDistanceMatrix
class ClientCache
attr_reader :client, :cache
+ def self.key(url)
+ url
+ end
+
def initialize(client, cache)
@client = client
@cache = cache
end
def get(url, options = {})
- cache.fetch url do
+ cache.fetch self.class.key(url) do
client.get url, options
end
end
|
ClientCache.key. Centralise knowledge on how to generate key.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -27,6 +27,7 @@ setup(name='switchboard',
'pylibmc >= 1.2',
'decorator',
],
+ zip_safe=False,
tests_require=[
'nose >= 0.11',
'mock >= 1.0',
|
[#2] I wonder if this might cause the slowdown?
|
diff --git a/server.go b/server.go
index <HASH>..<HASH> 100644
--- a/server.go
+++ b/server.go
@@ -107,10 +107,16 @@ func Run(address string, port int) {
MainRouter = NewRouter(routePath)
MainTemplateLoader = NewTemplateLoader(ViewsPath, RevelTemplatePath)
+ // If DEV mode, create a watcher for templates and routes.
+ // The watcher calls Refresh() on things on the first request.
if RunMode == DEV {
MainWatcher = NewWatcher()
MainWatcher.Listen(MainTemplateLoader, ViewsPath, RevelTemplatePath)
MainWatcher.Listen(MainRouter, routePath)
+ } else {
+ // Else, call refresh on them directly.
+ MainTemplateLoader.Refresh()
+ MainRouter.Refresh()
}
server := &http.Server{
diff --git a/template.go b/template.go
index <HASH>..<HASH> 100644
--- a/template.go
+++ b/template.go
@@ -109,7 +109,6 @@ func NewTemplateLoader(paths ...string) *TemplateLoader {
loader := &TemplateLoader{
paths: paths,
}
- loader.Refresh()
return loader
}
|
Bug fix: In Prod mode, call Refresh() on router/templateloader to initialize them.
|
diff --git a/phypno/scroll_data.py b/phypno/scroll_data.py
index <HASH>..<HASH> 100644
--- a/phypno/scroll_data.py
+++ b/phypno/scroll_data.py
@@ -45,7 +45,7 @@ DATASET_EXAMPLE = None
# DATASET_EXAMPLE = '/home/gio/tools/phypno/test/data/sample.edf'
# DATASET_EXAMPLE = '/home/gio/Copy/presentations_x/video/VideoFileFormat_1'
# DATASET_EXAMPLE = '/home/gio/ieeg/data/MG63_d2_Thurs_d.edf'
-# DATASET_EXAMPLE = '/home/gio/tools/phypno/test/data/MG71_d1_Wed_c.edf'
+DATASET_EXAMPLE = '/home/gio/tools/phypno/test/data/MG71_d1_Wed_c.edf'
setConfigOption('background', 'w')
@@ -63,7 +63,6 @@ config.setValue('stage_scoring_window', 30) # sleep scoring window
config.setValue('overview_timestamp_steps', 60 * 60) # timestamp in overview
-
class MainWindow(QMainWindow):
"""Create an instance of the main window.
|
temporary, use edf as example
|
diff --git a/ubersmith/calls/client.py b/ubersmith/calls/client.py
index <HASH>..<HASH> 100644
--- a/ubersmith/calls/client.py
+++ b/ubersmith/calls/client.py
@@ -66,7 +66,7 @@ class InvoiceCountCall(BaseCall):
self.cleaned = int(self.cleaned)
-class CreditListCall(BaseCall):
+class CreditListCall(GroupCall):
method = _('credit_list')
required_fields = ['client_id']
|
Changed client.credit_list call to group call
|
diff --git a/lib/sprite_factory/runner.rb b/lib/sprite_factory/runner.rb
index <HASH>..<HASH> 100644
--- a/lib/sprite_factory/runner.rb
+++ b/lib/sprite_factory/runner.rb
@@ -183,12 +183,7 @@ module SpriteFactory
end
def file_contains_exclusion_name?(file)
- result = false
- exclusion_array.each do |name|
- break if result
- result = file.include?(name)
- end
- result
+ exclusion_array.any? { |exclude| file.include?(exclude) }
end
#----------------------------------------------------------------------------
|
Refactor file_contains_exclusion_name? method to make use of ruby enumerable class methods
|
diff --git a/Model/Queue.php b/Model/Queue.php
index <HASH>..<HASH> 100644
--- a/Model/Queue.php
+++ b/Model/Queue.php
@@ -194,12 +194,18 @@ class Queue implements QueueInterface
$response = $this->sqs->getClient()->receiveMessage($arguments);
$service = $this;
- return array_map(function ($definition) use ($service) {
- return $service->getMessageFactory()
- ->create(trim($definition['Body']))
- ->setId(trim($definition['MessageId']))
- ->setReceipthandle(trim($definition['ReceiptHandle']));
- }, $response->get('Messages'));
+ $messages = array();
+
+ if (!is_null($response->get('Messages'))) {
+ $messages = array_map(function ($definition) use ($service) {
+ return $service->getMessageFactory()
+ ->create(trim($definition['Body']))
+ ->setId(trim($definition['MessageId']))
+ ->setReceipthandle(trim($definition['ReceiptHandle']));
+ }, $response->get('Messages'));
+ }
+
+ return $messages;
}
/**
|
Fixed empty queue issue in fetching message.
Issue #4
|
diff --git a/routing.go b/routing.go
index <HASH>..<HASH> 100644
--- a/routing.go
+++ b/routing.go
@@ -509,12 +509,13 @@ func (dht *IpfsDHT) FindProviders(ctx context.Context, c cid.Cid) ([]peer.AddrIn
// Peers will be returned on the channel as soon as they are found, even before
// the search query completes.
func (dht *IpfsDHT) FindProvidersAsync(ctx context.Context, key cid.Cid, count int) <-chan peer.AddrInfo {
+ peerOut := make(chan peer.AddrInfo, count)
if !dht.enableProviders {
- return nil
+ close(peerOut)
+ return peerOut
}
logger.Event(ctx, "findProviders", key)
- peerOut := make(chan peer.AddrInfo, count)
go dht.findProvidersAsyncRoutine(ctx, key, count, peerOut)
return peerOut
|
fix: return a closed channel from FindProvidersAsync when providers are disabled.
|
diff --git a/pyatv/mrp/connection.py b/pyatv/mrp/connection.py
index <HASH>..<HASH> 100644
--- a/pyatv/mrp/connection.py
+++ b/pyatv/mrp/connection.py
@@ -49,7 +49,7 @@ class MrpConnection(
"""Device connection was dropped."""
_LOGGER.debug("%s Disconnected from device: %s", self._log_str, exc)
self._transport = None
- self.listener.stop()
+ self.listener.stop() # type: ignore
if self.atv:
if exc is None:
@@ -144,4 +144,4 @@ class MrpConnection(
parsed.ParseFromString(data)
log_protobuf(_LOGGER, self._log_str + "<< Receive: Protobuf", parsed)
- self.listener.message_received(parsed, data)
+ self.listener.message_received(parsed, data) # type: ignore
|
mrp: Disable some type checking
Temporary fix due to StateProducer not supporting type hints.
|
diff --git a/pubnubsubhandler.py b/pubnubsubhandler.py
index <HASH>..<HASH> 100644
--- a/pubnubsubhandler.py
+++ b/pubnubsubhandler.py
@@ -42,7 +42,7 @@ class PubNubSubscriptionHandler():
"""
self._sub_key = sub_key
self._pnconfig = PNConfiguration()
- self._pnconfig.reconnection_policy = PNReconnectionPolicy.EXPONENTIAL
+ self._pnconfig.reconnect_policy = PNReconnectionPolicy.EXPONENTIAL
self._pnconfig.subscribe_key = sub_key
self._pnconfig.ssl = True
self._pubnub = PubNub(self._pnconfig)
|
Corrected pubnub reconnect policy
|
diff --git a/resource_aws_eip.go b/resource_aws_eip.go
index <HASH>..<HASH> 100644
--- a/resource_aws_eip.go
+++ b/resource_aws_eip.go
@@ -163,6 +163,11 @@ func resourceAwsEipRead(d *schema.ResourceData, meta interface{}) error {
describeAddresses, err := ec2conn.Addresses(publicIps, assocIds, nil)
if err != nil {
+ if ec2err, ok := err.(*ec2.Error); ok && ec2err.Code == "InvalidAllocationID.NotFound" {
+ d.SetId("")
+ return nil
+ }
+
return fmt.Errorf("Error retrieving EIP: %s", err)
}
|
providers/aws: check for non-exist on refresh
|
diff --git a/openquake/hazardlib/calc/filters.py b/openquake/hazardlib/calc/filters.py
index <HASH>..<HASH> 100644
--- a/openquake/hazardlib/calc/filters.py
+++ b/openquake/hazardlib/calc/filters.py
@@ -411,7 +411,7 @@ class SourceFilter(object):
elif len(indices):
src.indices = indices
yield src, sites.filtered(indices)
- else: # normal filtering
+ else: # slow filtering for sitecol not at sea level
_, maxmag = src.get_min_max_mag()
maxdist = self.integration_distance(
src.tectonic_region_type, maxmag)
|
Improved a comment [skip CI]
|
diff --git a/bika/lims/browser/client.py b/bika/lims/browser/client.py
index <HASH>..<HASH> 100644
--- a/bika/lims/browser/client.py
+++ b/bika/lims/browser/client.py
@@ -106,8 +106,8 @@ class ClientWorkflowAction(AnalysisRequestWorkflowAction):
if Sampler and DateSampled:
workflow.doActionFor(sample, action)
new_state = workflow.getInfoFor(sample, 'review_state')
+ doActionFor(ar, action)
transitioned[new_state].append(sample.Title())
- doActionFor(ar, action)
message = None
for state in transitioned:
|
Fixed indentation error which allowed Sampling without DateSampled being set
|
diff --git a/lib/searchlogic/named_scopes/conditions.rb b/lib/searchlogic/named_scopes/conditions.rb
index <HASH>..<HASH> 100644
--- a/lib/searchlogic/named_scopes/conditions.rb
+++ b/lib/searchlogic/named_scopes/conditions.rb
@@ -50,7 +50,7 @@ module Searchlogic
end
CONDITIONS[:equals_any] = CONDITIONS[:equals_any] + [:in]
- CONDITIONS[:does_not_equal_any] = CONDITIONS[:equals_any] + [:not_in]
+ CONDITIONS[:does_not_equal_any] = CONDITIONS[:does_not_equal_any] + [:not_in]
BOOLEAN_CONDITIONS.each { |condition, aliases| CONDITIONS[condition] = aliases }
|
fix typo, setting does_not_equal_any conditions to equals_any conditions
|
diff --git a/lib/github_cli/command.rb b/lib/github_cli/command.rb
index <HASH>..<HASH> 100644
--- a/lib/github_cli/command.rb
+++ b/lib/github_cli/command.rb
@@ -29,9 +29,15 @@ module GithubCLI
}
end
- map "ls" => :list,
- "all" => :list,
- "del" => :delete
+ ALIASES = {
+ "ls" => :list,
+ "all" => :list,
+ "del" => :delete,
+ "rm" => :delete,
+ "c" => :create,
+ "e" => :edit
+ }
+ map ALIASES
class_option :params, :type => :hash, :default => {}, :aliases => '-p',
:desc => 'Request parameters e.i per_page:100'
|
Add usefull aliases for common commands.
|
diff --git a/osmdroid-android/src/main/java/org/osmdroid/tileprovider/modules/MapTileModuleProviderBase.java b/osmdroid-android/src/main/java/org/osmdroid/tileprovider/modules/MapTileModuleProviderBase.java
index <HASH>..<HASH> 100644
--- a/osmdroid-android/src/main/java/org/osmdroid/tileprovider/modules/MapTileModuleProviderBase.java
+++ b/osmdroid-android/src/main/java/org/osmdroid/tileprovider/modules/MapTileModuleProviderBase.java
@@ -100,7 +100,11 @@ public abstract class MapTileModuleProviderBase implements OpenStreetMapTileProv
@Override
protected boolean removeEldestEntry(
final Map.Entry<MapTile, MapTileRequestState> pEldest) {
- return size() > pPendingQueueSize;
+ if (size() > pPendingQueueSize) {
+ removeTileFromQueues(pEldest.getKey());
+ pEldest.getValue().getCallback().mapTileRequestFailed(pEldest.getValue());
+ }
+ return false;
}
};
}
|
Fix for "stuck" tiles never loading due to old tiles being dropped rather than being reported as failed requests. Fixes issue <I>.
|
diff --git a/src/TestCase.php b/src/TestCase.php
index <HASH>..<HASH> 100644
--- a/src/TestCase.php
+++ b/src/TestCase.php
@@ -108,19 +108,30 @@ abstract class TestCase extends FoundationTestCase
protected function createBrowsersFor(Closure $callback)
{
if (count(static::$browsers) === 0) {
- static::$browsers = collect([new Browser($this->createWebDriver())]);
+ static::$browsers = collect([$this->newBrowser($this->createWebDriver())]);
}
$additional = $this->browsersNeededFor($callback) - 1;
for ($i = 0; $i < $additional; $i++) {
- static::$browsers->push(new Browser($this->createWebDriver()));
+ static::$browsers->push($this->newBrowser($this->createWebDriver()));
}
return static::$browsers;
}
/**
+ * Create a new Browser instance.
+ *
+ * @param \Facebook\WebDriver\Remote\RemoteWebDriver $driver
+ * @return \Laravel\Dusk\Browser
+ */
+ protected function newBrowser($driver)
+ {
+ return new Browser($driver);
+ }
+
+ /**
* Get the number of browsers needed for a given callback.
*
* @param \Closure $callback
|
Add the possibility to extend the browser class.
|
diff --git a/src/com/google/javascript/jscomp/ProcessCommonJSModules.java b/src/com/google/javascript/jscomp/ProcessCommonJSModules.java
index <HASH>..<HASH> 100644
--- a/src/com/google/javascript/jscomp/ProcessCommonJSModules.java
+++ b/src/com/google/javascript/jscomp/ProcessCommonJSModules.java
@@ -527,7 +527,8 @@ public final class ProcessCommonJSModules implements CompilerPass {
initModule.useSourceInfoIfMissingFromForTree(this.script);
Node refChild = this.script.getFirstChild();
- while (refChild.getNext() != null & refChild.getNext().isExprResult()
+ while (refChild.getNext() != null
+ && refChild.getNext().isExprResult()
&& refChild.getNext().getFirstChild().isCall()
&& (refChild.getNext().getFirstFirstChild().matchesQualifiedName("goog.require")
|| refChild.getNext().getFirstFirstChild().matchesQualifiedName("goog.provide"))) {
|
Use && for boolean logic instead of &
I was surprised to find Java allows '&' and I think it even does the right thing, but it's unusual.
-------------
Created by MOE: <URL>
|
diff --git a/pkg/image/controller/trigger/image_trigger_controller_test.go b/pkg/image/controller/trigger/image_trigger_controller_test.go
index <HASH>..<HASH> 100644
--- a/pkg/image/controller/trigger/image_trigger_controller_test.go
+++ b/pkg/image/controller/trigger/image_trigger_controller_test.go
@@ -958,7 +958,7 @@ func updateBuildConfigImages(bc *buildapi.BuildConfig, tagRetriever trigger.TagR
if updated == nil {
updated = bc.DeepCopy()
}
- p = bc.Spec.Triggers[i].ImageChange
+ p = updated.Spec.Triggers[i].ImageChange
p.LastTriggeredImageID = latest
}
return updated, nil
|
Image trigger test was mutating the wrong object
|
diff --git a/misc/plugin/amp.rb b/misc/plugin/amp.rb
index <HASH>..<HASH> 100644
--- a/misc/plugin/amp.rb
+++ b/misc/plugin/amp.rb
@@ -15,7 +15,8 @@ end
add_content_proc('amp') do |date|
diary = @diaries[date]
- ERB.new(File.read("views/amp.rhtml")).result(binding)
+ template = File.read(File.join(TDiary::root, "views/amp.rhtml"))
+ ERB.new(template).result(binding)
end
def amp_body(diary)
|
amp.rb: fix bug, plugin does not work in gem mode
|
diff --git a/src/Qcloud/Cos/ResultTransformer.php b/src/Qcloud/Cos/ResultTransformer.php
index <HASH>..<HASH> 100644
--- a/src/Qcloud/Cos/ResultTransformer.php
+++ b/src/Qcloud/Cos/ResultTransformer.php
@@ -33,7 +33,15 @@ class ResultTransformer {
if ($action == "GetObject") {
if (isset($command['SaveAs'])) {
$fp = fopen($command['SaveAs'], "wb");
- fwrite($fp, $response->getBody());
+ $stream = $response->getBody();
+ $offset = 0;
+ $partsize = 8192;
+ while (!$stream->eof()) {
+ $output = $stream->read($partsize);
+ fseek($fp, $offset);
+ fwrite($fp, $output);
+ $offset += $partsize;
+ }
fclose($fp);
}
}
|
fix getObject with saveas (#<I>)
|
diff --git a/lib/apnotic/version.rb b/lib/apnotic/version.rb
index <HASH>..<HASH> 100644
--- a/lib/apnotic/version.rb
+++ b/lib/apnotic/version.rb
@@ -1,3 +1,3 @@
module Apnotic
- VERSION = '1.6.1'.freeze
+ VERSION = '1.7.0'.freeze
end
|
Bump to <I>.
|
diff --git a/lib/SimpleSAML/Utilities.php b/lib/SimpleSAML/Utilities.php
index <HASH>..<HASH> 100644
--- a/lib/SimpleSAML/Utilities.php
+++ b/lib/SimpleSAML/Utilities.php
@@ -15,7 +15,15 @@ class SimpleSAML_Utilities {
*/
public static function getSelfHost() {
- $currenthost = $_SERVER['HTTP_HOST'];
+ if (array_key_exists('HTTP_HOST', $_SERVER)) {
+ $currenthost = $_SERVER['HTTP_HOST'];
+ } elseif (array_key_exists('SERVER_NAME', $_SERVER)) {
+ $currenthost = $_SERVER['SERVER_NAME'];
+ } else {
+ /* Almost certainly not what you want, but ... */
+ $currenthost = 'localhost';
+ }
+
if(strstr($currenthost, ":")) {
$currenthostdecomposed = explode(":", $currenthost);
$currenthost = $currenthostdecomposed[0];
|
Fix code for determining the current hostname.
|
diff --git a/test/bitgo/keyutil.js b/test/bitgo/keyutil.js
index <HASH>..<HASH> 100644
--- a/test/bitgo/keyutil.js
+++ b/test/bitgo/keyutil.js
@@ -29,6 +29,12 @@ describe('privateKeyBufferFromECPair', function () {
assert.strictEqual(privateKeyBufferFromECPair(keyPair).length, 32)
assert.strictEqual(privateKeyBufferFromECPair(keyPair).toString('hex'), hexString)
})
+
+ it('throws if passed value is not ecpair', function () {
+ assert.throws(function () {
+ privateKeyBufferFromECPair({})
+ }, new RegExp('invalid argument ecpair'))
+ })
})
describe('privateKeyBufferToECPair', function () {
|
Add test for privateKeyBufferFromECPair
Try to bump up coverage above <I>% again.
|
diff --git a/docker/docker_lifecycle_test.go b/docker/docker_lifecycle_test.go
index <HASH>..<HASH> 100644
--- a/docker/docker_lifecycle_test.go
+++ b/docker/docker_lifecycle_test.go
@@ -107,12 +107,12 @@ var _ = Describe(deaUnsupportedTag+"Docker Application Lifecycle", func() {
Eventually(cf.Cf(
"set-env", appName,
"HOME", "/tmp/fakehome"),
- ).Should(Exit(0))
+ DEFAULT_TIMEOUT).Should(Exit(0))
Eventually(cf.Cf(
"set-env", appName,
"TMPDIR", "/tmp/dir"),
- ).Should(Exit(0))
+ DEFAULT_TIMEOUT).Should(Exit(0))
})
It("prefers the env vars from cf set-env over those in the Dockerfile", func() {
|
Add DEFAULT_TIMEOUT to Eventually assertions in docker tests
|
diff --git a/galpy/actionAngle_src/actionAngle.py b/galpy/actionAngle_src/actionAngle.py
index <HASH>..<HASH> 100644
--- a/galpy/actionAngle_src/actionAngle.py
+++ b/galpy/actionAngle_src/actionAngle.py
@@ -78,9 +78,6 @@ class actionAngle:
2) numpy.ndarray: [N] phase-space values for N objects
- 3) numpy.ndarray: [N,M] phase-space values for N objects at M
- times
-
b) Orbit instance: initial condition used if that's it, orbit(t) if there is a time given as well as the second argument
OUTPUT:
@@ -106,9 +103,6 @@ class actionAngle:
2) numpy.ndarray: [N] phase-space values for N objects
- 3) numpy.ndarray: [N,M] phase-space values for N objects at M
- times
-
b) Orbit instance: initial condition used if that's it, orbit(t) if there is a time given as well as the second argument
OUTPUT:
@@ -135,9 +129,6 @@ class actionAngle:
2) numpy.ndarray: [N] phase-space values for N objects
- 3) numpy.ndarray: [N,M] phase-space values for N objects at M
- times
-
b) Orbit instance: initial condition used if that's it, orbit(t) if there is a time given as well as the second argument
OUTPUT:
|
yet another doc fix in actionAngle inputs
|
diff --git a/pysat/_meta.py b/pysat/_meta.py
index <HASH>..<HASH> 100644
--- a/pysat/_meta.py
+++ b/pysat/_meta.py
@@ -746,13 +746,6 @@ class Meta(object):
for i in self.ho_data:
yield i
- def keypairs_ho(self):
- """Yields keypairs for higher order metadata, (key1, attribute1) """
-
- for i in self.ho_data.keys():
- for j in self[i].keys:
- yield (i, j)
-
def attrs(self):
"""Yields metadata products stored for each variable name"""
|
Removed function I not tested and not yet used. Not needed.
|
diff --git a/core/src/main/java/com/google/errorprone/refactors/emptyifstatement/EmptyIfStatement.java b/core/src/main/java/com/google/errorprone/refactors/emptyifstatement/EmptyIfStatement.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/com/google/errorprone/refactors/emptyifstatement/EmptyIfStatement.java
+++ b/core/src/main/java/com/google/errorprone/refactors/emptyifstatement/EmptyIfStatement.java
@@ -105,8 +105,9 @@ public class EmptyIfStatement extends RefactoringMatcher<EmptyStatementTree> {
public Matcher<EmptyStatementTree> emptyIfMatcher = new EmptyIfStatement();
@Override
- public Void visitEmptyStatement(EmptyStatementTree node, VisitorState state) {
- if (emptyIfMatcher.matches(node, state.withPath(getCurrentPath()))) {
+ public Void visitEmptyStatement(EmptyStatementTree node, VisitorState visitorState) {
+ VisitorState state = visitorState.withPath(getCurrentPath());
+ if (emptyIfMatcher.matches(node, state)) {
reportMatch(emptyIfMatcher, node, state);
}
return null;
|
Fixed EmptyIfStatement.Search to correctly pass path in VisitorState to refactor method
|
diff --git a/lib/chef/resource/hostname.rb b/lib/chef/resource/hostname.rb
index <HASH>..<HASH> 100644
--- a/lib/chef/resource/hostname.rb
+++ b/lib/chef/resource/hostname.rb
@@ -53,7 +53,7 @@ class Chef
end
```
- **Change the hostname of a Windows, Domain-joined node (new in 17.3)**:
+ **Change the hostname of a Windows, Domain-joined node (new in 17.2)**:
```ruby
hostname 'renaming a domain-joined computer' do
@@ -91,12 +91,12 @@ class Chef
property :domain_user, String,
description: "A domain account specified in the form of DOMAIN\\user used when renaming a domain-joined device",
- introduced: "17.3"
+ introduced: "17.2"
property :domain_password, String,
description: "The password to accompany the domain_user parameter",
sensitive: true,
- introduced: "17.3"
+ introduced: "17.2"
action_class do
def append_replacing_matching_lines(path, regex, string)
|
Fix incorrect versions this resource was updated in
I was off by one when I added these
|
diff --git a/Twig/Extensions/IsLoadedExtension.php b/Twig/Extensions/IsLoadedExtension.php
index <HASH>..<HASH> 100644
--- a/Twig/Extensions/IsLoadedExtension.php
+++ b/Twig/Extensions/IsLoadedExtension.php
@@ -2,6 +2,8 @@
namespace Librinfo\CoreBundle\Twig\Extensions;
+use Twig_Environment;
+
class IsLoadedExtension extends \Twig_Extension
{
/**
@@ -12,15 +14,27 @@ class IsLoadedExtension extends \Twig_Extension
public function getFunctions()
{
return array(
- new \Twig_SimpleFunction('isExtensionLoaded', [$this, 'isLoaded'], ['needs_environment' => true]),
+ new \Twig_SimpleFunction('isExtensionLoaded', [$this, 'isExtensionLoaded'], ['needs_environment' => true]),
+ new \Twig_SimpleFunction('isFunctionLoaded', [$this, 'isFunctionLoaded'], ['needs_environment' => true]),
);
}
/**
* @param string $name
+ *
+ * @return boolean
+ */
+ function isFunctionLoaded(Twig_Environment $twig, $name)
+ {
+ return $twig->getFunction($name);
+ }
+
+ /**
+ * @param string $name
+ *
* @return boolean
*/
- function isLoaded($twig, $name)
+ function isExtensionLoaded(Twig_Environment $twig, $name)
{
return $twig->hasExtension($name);
}
|
fixed miss use of twig->hasExtension replaced by getFunction($name)
|
diff --git a/public/app/features/dashboard/dashboardNavCtrl.js b/public/app/features/dashboard/dashboardNavCtrl.js
index <HASH>..<HASH> 100644
--- a/public/app/features/dashboard/dashboardNavCtrl.js
+++ b/public/app/features/dashboard/dashboardNavCtrl.js
@@ -52,6 +52,10 @@ function (angular, _) {
};
$scope.saveDashboard = function(options) {
+ if ($scope.dashboardMeta.canSave === false) {
+ return;
+ }
+
var clone = $scope.dashboard.getSaveModelClone();
backendSrv.saveDashboard(clone, options).then(function(data) {
|
Using CTRL+S should not work when dashboardMeta.canSave is false, #<I>
|
diff --git a/fireplace/player.py b/fireplace/player.py
index <HASH>..<HASH> 100644
--- a/fireplace/player.py
+++ b/fireplace/player.py
@@ -32,7 +32,7 @@ class Player(Entity):
return self.name
def __repr__(self):
- return "%s(name=%r, deck=%r)" % (self.__class__.__name__, self.name, self.deck)
+ return "%s(name=%r, hero=%r)" % (self.__class__.__name__, self.name, self.hero)
@property
def slots(self):
|
Give Player a better repr()
|
diff --git a/test/ember/precompiler_test.rb b/test/ember/precompiler_test.rb
index <HASH>..<HASH> 100644
--- a/test/ember/precompiler_test.rb
+++ b/test/ember/precompiler_test.rb
@@ -4,7 +4,7 @@ class EmberPrecompilerTest < MiniTest::Unit::TestCase
def test_calls_the_ember_handlebars_precompiler
result = compile "Hello {{name}}"
assert result
- assert_match /data\.buffer|isHTMLBars: true/, result
+ assert_match /data\.buffer|isHTMLBars: true|"revision": "Ember@/, result
end
def test_is_a_precompiler
|
Fix for ember-source <I>
The handlebars AST seems to be changed.
|
diff --git a/blueprints/ember-frost-bunsen/index.js b/blueprints/ember-frost-bunsen/index.js
index <HASH>..<HASH> 100644
--- a/blueprints/ember-frost-bunsen/index.js
+++ b/blueprints/ember-frost-bunsen/index.js
@@ -1,16 +1,12 @@
-const addBunsenStyleImport = function (project) {
- const isAddon = project.isEmberCLIAddon()
- const pathPrefix = isAddon ? 'tests/dummy/' : ''
-
- return this.insertIntoFile(
- `${pathPrefix}app/styles/app.scss`,
- "@import 'ember-frost-bunsen';"
- )
-}
-
module.exports = {
afterInstall: function () {
- return addBunsenStyleImport(this.project)
+ const isAddon = this.project.isEmberCLIAddon()
+ const pathPrefix = isAddon ? 'tests/dummy/' : ''
+
+ return this.insertIntoFile(
+ `${pathPrefix}app/styles/app.scss`,
+ "@import 'ember-frost-bunsen';"
+ )
},
normalizeEntityName: function () {
@@ -19,7 +15,3 @@ module.exports = {
// to us
}
}
-
-export {
- addBunsenStyleImport
-}
|
change approach of setting style import back to previous non exported function
|
diff --git a/bin/start.js b/bin/start.js
index <HASH>..<HASH> 100755
--- a/bin/start.js
+++ b/bin/start.js
@@ -2,7 +2,7 @@
var cp = require('child_process')
-var BIN = '/Applications/Google Chrome Canary.app/Contents/MacOS/Google Chrome Canary'
+var BIN = process.platform=='linux' ? '/bin/google-chrome' : '/Applications/Google Chrome Canary.app/Contents/MacOS/Google Chrome Canary';
var ARGS = ['--load-and-launch-app=chrome']
var child = cp.spawn(BIN, ARGS)
@@ -11,4 +11,4 @@ var child = cp.spawn(BIN, ARGS)
process.once('SIGUSR2', function () {
child.kill()
process.kill(process.pid, 'SIGUSR2')
-})
\ No newline at end of file
+})
|
Improve the accessibility of the project for linux users.
|
diff --git a/lib/finite_machine/state_parser.rb b/lib/finite_machine/state_parser.rb
index <HASH>..<HASH> 100644
--- a/lib/finite_machine/state_parser.rb
+++ b/lib/finite_machine/state_parser.rb
@@ -21,18 +21,21 @@ module FiniteMachine
# Extract states from attributes
#
+ # @param [Proc] block
+ #
# @example
# StateParpser.new(attr).parase_states
#
# @return [Hash[Symbol]] states
#
# @api public
- def parse_states
- if contains_from_to_keys?
+ def parse_states(&block)
+ transitions = if contains_from_to_keys?
convert_from_to_attributes_to_states_hash
else
convert_attributes_to_states_hash
end
+ block ? transitions.each(&block) : transitions
end
# Check if attributes contain :from or :to key
|
Change to iterate transtion when parsing.
|
diff --git a/code/libraries/joomlatools/component/koowa/template/helper/actionbar.php b/code/libraries/joomlatools/component/koowa/template/helper/actionbar.php
index <HASH>..<HASH> 100644
--- a/code/libraries/joomlatools/component/koowa/template/helper/actionbar.php
+++ b/code/libraries/joomlatools/component/koowa/template/helper/actionbar.php
@@ -30,7 +30,7 @@ class ComKoowaTemplateHelperActionbar extends KTemplateHelperActionbar
// FIXME: take this out when we refactor UI
if (JFactory::getApplication()->isSite()) {
- $html = str_replace('k-toolbar-buttons', 'btn-group', $html);
+ $html = str_replace('k-toolbar-buttons', 'k-toolbar-buttons btn-group', $html);
}
return $html;
|
re #<I>: Use k-toolbar-buttons as well
|
diff --git a/scripts/build_wikidata.js b/scripts/build_wikidata.js
index <HASH>..<HASH> 100644
--- a/scripts/build_wikidata.js
+++ b/scripts/build_wikidata.js
@@ -308,9 +308,10 @@ function processEntities(result) {
// P18 - Image (use this for flags)
imageFile = getClaimValue(entity, 'P18');
} else {
- // P154 - Logo Image
// P8972 - Small Logo or Icon
- imageFile = getClaimValue(entity, 'P8972') || getClaimValue(entity, 'P154');
+ // P154 - Logo Image
+ // P94 - Coat of Arms Image
+ imageFile = getClaimValue(entity, 'P8972') || getClaimValue(entity, 'P154') || getClaimValue(entity, 'P94');
}
if (imageFile) {
const re = /\.svg$/i;
|
Fallback to fetch P<I> Coat of Arms image
(closes #<I>)
|
diff --git a/src/location-factory.js b/src/location-factory.js
index <HASH>..<HASH> 100644
--- a/src/location-factory.js
+++ b/src/location-factory.js
@@ -10,8 +10,8 @@ const LocationFactory = function(_window) {
const Location = {};
- Location.Navigate = function(path, pushState) {
- if (history && pushState !== false) {
+ Location.Navigate = function(path) {
+ if (history) {
history.pushState({path: path}, null, path);
}
ChangeLocation(path);
|
Remove "pushState" option from Location.Navigate
This was a holdover from when "navigate" was being abused to notify
subscribers for window.onpopstate. Since subscriber notification had
been factored out appropriate, this option is no longer necessary to
support onpopstate, without introducing incorrect entries in the browser
history.
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.