diff stringlengths 65 26.7k | message stringlengths 7 9.92k |
|---|---|
diff --git a/lib/multiblock/version.rb b/lib/multiblock/version.rb
index <HASH>..<HASH> 100644
--- a/lib/multiblock/version.rb
+++ b/lib/multiblock/version.rb
@@ -1,3 +1,3 @@
module Multiblock
- VERSION = "0.1.0"
+ VERSION = "0.2.0"
end | Bumped version to <I> |
diff --git a/test/tc_collections.rb b/test/tc_collections.rb
index <HASH>..<HASH> 100644
--- a/test/tc_collections.rb
+++ b/test/tc_collections.rb
@@ -61,7 +61,7 @@ class Grep < Bud
end
def state
- file_reader :text, '../examples/chap1/ulysses.txt'
+ file_reader :text, '../examples/chap2/ulysses.txt'
table :matches, ['lineno', 'text']
end
diff --git a/test/tc_wordcount.rb b/test/tc_wordcount.rb
index <HASH>..<HASH> 100644
--- a/test/tc_wordcount.rb
+++ b/test/tc_wordcount.rb
@@ -11,7 +11,7 @@ class WordCount < Bud
end
def state
- file_reader :text, '../examples/chap1/ulysses.txt'
+ file_reader :text, '../examples/chap2/ulysses.txt'
table :words, ['lineno', 'wordno', 'word']
table :wc, ['word'], ['cnt']
table :wc2, ['word'], ['cnt'] | fix refs to ulysses.txt |
diff --git a/web/src/test/java/uk/ac/ebi/atlas/solr/query/SpeciesLookupServiceIT.java b/web/src/test/java/uk/ac/ebi/atlas/solr/query/SpeciesLookupServiceIT.java
index <HASH>..<HASH> 100644
--- a/web/src/test/java/uk/ac/ebi/atlas/solr/query/SpeciesLookupServiceIT.java
+++ b/web/src/test/java/uk/ac/ebi/atlas/solr/query/SpeciesLookupServiceIT.java
@@ -46,9 +46,9 @@ public class SpeciesLookupServiceIT {
@Test
public void interPro_singleSpeciesGeneSet() {
- SpeciesLookupService.Result result = speciesLookupService.fetchSpeciesForGeneSet("IPR016938");
+ SpeciesLookupService.Result result = speciesLookupService.fetchSpeciesForGeneSet("IPR016970");
assertThat(result.isMultiSpecies(), is(false));
- assertThat(result.firstSpecies(), is("schizosaccharomyces pombe"));
+ assertThat(result.firstSpecies(), is("arabidopsis thaliana"));
}
@Test | change example to match new solr index |
diff --git a/openstack_dashboard/api/rest/utils.py b/openstack_dashboard/api/rest/utils.py
index <HASH>..<HASH> 100644
--- a/openstack_dashboard/api/rest/utils.py
+++ b/openstack_dashboard/api/rest/utils.py
@@ -146,6 +146,12 @@ def ajax(authenticated=True, data_required=False,
return _wrapped
return decorator
+PARAM_MAPPING = {
+ 'None': None,
+ 'True': True,
+ 'False': False
+}
+
def parse_filters_kwargs(request, client_keywords=None):
"""Extract REST filter parameters from the request GET args.
@@ -158,10 +164,11 @@ def parse_filters_kwargs(request, client_keywords=None):
kwargs = {}
client_keywords = client_keywords or {}
for param in request.GET:
+ param_value = PARAM_MAPPING.get(request.GET[param], request.GET[param])
if param in client_keywords:
- kwargs[param] = request.GET[param]
+ kwargs[param] = param_value
else:
- filters[param] = request.GET[param]
+ filters[param] = param_value
return filters, kwargs | Fix getting the images list in Admin->Images
Do this by converting 'None' / 'True' / 'False' to their Python
counterparts.
Change-Id: Ifd<I>f<I>e7a<I>d<I>ee<I>fc9b<I>a
Closes-Bug: #<I> |
diff --git a/flask_appbuilder/tests/test_api.py b/flask_appbuilder/tests/test_api.py
index <HASH>..<HASH> 100644
--- a/flask_appbuilder/tests/test_api.py
+++ b/flask_appbuilder/tests/test_api.py
@@ -287,6 +287,16 @@ class FlaskTestCase(unittest.TestCase):
'field_integer': MODEL1_DATA_SIZE - 1,
'field_string': "test{}".format(MODEL1_DATA_SIZE - 1)
})
+ # Test override
+ rv = client.get('api/v1/model1apiorder/?_o_=field_integer:asc')
+ data = json.loads(rv.data.decode('utf-8'))
+ eq_(data['result'][0], {
+ 'id': 1,
+ 'field_date': None,
+ 'field_float': 0.0,
+ 'field_integer': 0,
+ 'field_string': "test0"
+ })
def test_get_list_page(self):
""" | [tests] New, base_order property override |
diff --git a/lib/learn_open/opener.rb b/lib/learn_open/opener.rb
index <HASH>..<HASH> 100644
--- a/lib/learn_open/opener.rb
+++ b/lib/learn_open/opener.rb
@@ -213,7 +213,7 @@ module LearnOpen
File.write(file_path, 'Forking repository...')
puts "Forking lesson..."
- if !dot_learn || dot_learn[:github] != false
+ if !github_disabled?
begin
Timeout::timeout(15) do
client.fork_repo(repo_name: repo_dir)
@@ -262,7 +262,7 @@ module LearnOpen
end
end
- if dot_learn && dot_learn[:github] == false
+ if github_disabled?
ping_fork_completion
end
end
@@ -404,12 +404,17 @@ module LearnOpen
!!RUBY_PLATFORM.match(/darwin/)
end
+ def github_disabled?
+ !dot_learn.nil? && dot_learn[:github] == false
+ end
+
def ide_environment?
ENV['IDE_CONTAINER'] == "true"
end
def ide_git_wip_enabled?
- return false if dot_learn && dot_learn[:github] == false
+ return false if github_disabled?
+
ENV['IDE_GIT_WIP'] == "true"
end | Create Opener#github_disabled? |
diff --git a/addon/components/weekly-calendar.js b/addon/components/weekly-calendar.js
index <HASH>..<HASH> 100644
--- a/addon/components/weekly-calendar.js
+++ b/addon/components/weekly-calendar.js
@@ -9,11 +9,12 @@ export default class WeeklyCalendarComponent extends Component {
@action
scrollView(calendarElement, [earliestHour]) {
- if (earliestHour === 24 || earliestHour < 2) {
- return;
- }
// all of the hour elements are registered in the template as hour0, hour1, etc
- const hourElement = this[`hour${earliestHour - 2}`];
+ let hourElement = this.hour6;
+
+ if (earliestHour < 24 && earliestHour > 2) {
+ hourElement = this[`hour${earliestHour - 2}`];
+ }
calendarElement.scrollTop = hourElement.offsetTop;
} | Scroll to the middle of the day when there are no events. |
diff --git a/lurklib/__init__.py b/lurklib/__init__.py
index <HASH>..<HASH> 100755
--- a/lurklib/__init__.py
+++ b/lurklib/__init__.py
@@ -267,16 +267,22 @@ class IRC:
set_by = self.from_ (segments [4])
elif self.find (data, '353'):
- names = data.split() [5:]
- names [0] = names [0] [1:]
- names = tuple (names)
+ new_names = data.split() [5:].replace(':', '')
+ try: names.append = new_names
+ except NameError: names = new_names
elif self.find (data, 'JOIN'):
self.channels[data.split() [2] [1:]] = {}
if self.hide_called_events == False: self.buffer.append (data)
elif ncode in self.err_replies.keys(): self.exception (ncode)
elif ncode == '366': break
else: self.buffer.append (data)
-
+ self.channels[channel]['USERS'] = {}
+ for name in names:
+ prefix = ''
+ if name[0] in self.priv_types:
+ prefix = name[0]
+ name = name[1:]
+ self.channels[channel]['USERS'][name] = prefix
return ('JOIN', who, channel, topic, names, set_by, time_set)
else:
try: | Updated stream's SAJOIN detection to use the new caching system |
diff --git a/moco-core/src/main/java/com/github/dreamhead/moco/MocoVersion.java b/moco-core/src/main/java/com/github/dreamhead/moco/MocoVersion.java
index <HASH>..<HASH> 100644
--- a/moco-core/src/main/java/com/github/dreamhead/moco/MocoVersion.java
+++ b/moco-core/src/main/java/com/github/dreamhead/moco/MocoVersion.java
@@ -1,7 +1,7 @@
package com.github.dreamhead.moco;
public final class MocoVersion {
- public static final String VERSION = "0.10.1";
+ public static final String VERSION = "0.10.2";
private MocoVersion() {}
} | bumped version to <I> |
diff --git a/chess/syzygy.py b/chess/syzygy.py
index <HASH>..<HASH> 100644
--- a/chess/syzygy.py
+++ b/chess/syzygy.py
@@ -1472,9 +1472,6 @@ class Tablebases(object):
"""
Manages a collection of tablebase files for probing.
- Syzygy tables come in files like ``KQvKN.rtbw`` or ``KRBvK.rtbz``, one WDL
- (*.rtbw*) and DTZ (*.rtbz*) file for each material composition.
-
If *max_fds* is not ``None``, will at most use *max_fds* open file
descriptors at any given time. The least recently used tables are closed,
if nescessary.
@@ -1521,7 +1518,8 @@ class Tablebases(object):
Loads tables from a directory.
By default all available tables with the correct file names
- (e.g. ``KQvKN.rtbw`` or ``KRBvK.rtbz``) are loaded.
+ (e.g. WDL files like ``KQvKN.rtbw`` and DTZ files like ``KRBvK.rtbz``)
+ are loaded.
Returns the number of successfully openened and loaded tablebase files.
""" | Remove repetition in syzygy docs |
diff --git a/Kwf_js/Utils/HistoryState.js b/Kwf_js/Utils/HistoryState.js
index <HASH>..<HASH> 100644
--- a/Kwf_js/Utils/HistoryState.js
+++ b/Kwf_js/Utils/HistoryState.js
@@ -55,6 +55,11 @@ Kwf.Utils.HistoryStateHash = function() {
Ext.extend(Kwf.Utils.HistoryStateHash, Kwf.Utils.HistoryStateAbstract, {
pushState: function(title, href) {
if (this.disabled) return;
+ if (Ext.isIE6 || Ext.isIE7) {
+ //don't use history state at all, simply open the new url
+ location.href = href;
+ return;
+ }
var prefix = location.protocol+'//'+location.host;
if (href.substr(0, prefix.length) == prefix) { | don't use history state in IE6 and IE7
instead just change to the new url as it would be done without javascript
so everything works but is not as nice |
diff --git a/upload/admin/controller/setting/store.php b/upload/admin/controller/setting/store.php
index <HASH>..<HASH> 100644
--- a/upload/admin/controller/setting/store.php
+++ b/upload/admin/controller/setting/store.php
@@ -85,7 +85,7 @@ class Store extends \Opencart\System\Engine\Controller {
protected function getList() {
if (isset($this->request->get['page'])) {
- $page = $this->request->get['page'];
+ $page = (int)$this->request->get['page'];
} else {
$page = 1;
} | Added integer on $page get request. |
diff --git a/daemon/daemon.go b/daemon/daemon.go
index <HASH>..<HASH> 100644
--- a/daemon/daemon.go
+++ b/daemon/daemon.go
@@ -272,6 +272,10 @@ func (daemon *Daemon) Destroy(container *Container) error {
return err
}
+ // Deregister the container before removing its directory, to avoid race conditions
+ daemon.idIndex.Delete(container.ID)
+ daemon.containers.Remove(element)
+
if err := daemon.driver.Remove(container.ID); err != nil {
return fmt.Errorf("Driver %s failed to remove root filesystem %s: %s", daemon.driver, container.ID, err)
}
@@ -285,9 +289,6 @@ func (daemon *Daemon) Destroy(container *Container) error {
utils.Debugf("Unable to remove container from link graph: %s", err)
}
- // Deregister the container before removing its directory, to avoid race conditions
- daemon.idIndex.Delete(container.ID)
- daemon.containers.Remove(element)
if err := os.RemoveAll(container.root); err != nil {
return fmt.Errorf("Unable to remove filesystem for %v: %v", container.ID, err)
} | deregister containers before removing driver and containerGraph references
This is required to address a race condition described in #<I>,
where a container can be partially deleted -- for example, the
root filesystem but not the init filesystem -- which makes
it impossible to delete the container without re-adding the
missing filesystems manually.
This behavior has been witnessed when rebooting boxes that
are configured to remove containers on shutdown in parallel
with stopping the Docker daemon.
Docker-DCO-<I>- |
diff --git a/gulpfile.js b/gulpfile.js
index <HASH>..<HASH> 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -20,9 +20,9 @@ gulp.task('clean', (cb) => {
// Styles
gulp.task('styles', () => {
- gulp.src('./src/styles/**/*.scss')
- .pipe($.sass().on('error', $.sass.logError))
- .pipe(gulp.dest('./dist/css'));
+ return gulp.src('./src/styles/**/*.scss')
+ .pipe($.sass().on('error', $.sass.logError))
+ .pipe(gulp.dest('./dist/css'));
});
// browserify | Fix build process where the browser was reloaded before libsass compiled css |
diff --git a/add_popover.py b/add_popover.py
index <HASH>..<HASH> 100644
--- a/add_popover.py
+++ b/add_popover.py
@@ -79,11 +79,20 @@ class Add_Popover(Gtk.Window):
widget.set_margin_bottom(margin)
def on_addButton_clicked(self, button, addPopover):
+ print("test")
if addPopover.get_visible():
addPopover.hide()
else:
+ for i in range(0, len(self.data.transactionsMenu)):
+ self.addCategoryComboBoxText.remove(0)
+
+ if self.addIncomeRadio.get_active() == True:
+ self.selected = "income"
+ elif self.addExpenseRadio.get_active() == True:
+ self.selected = "expense"
+
for i in range(0,len(self.data.transactionsMenu)):
- if self.data.transactionsMenu[i][2] == "income":
+ if self.data.transactionsMenu[i][2] == self.selected:
if self.data.transactionsMenu[i][1] != "Uncategorized":
self.addCategoryComboBoxText.append_text(self.data.transactionsMenu[i][1])
addPopover.show_all() | Fixed category list in add popover when closing and repopening it. |
diff --git a/src/Graviton/SwaggerBundle/Command/SwaggerGenerateCommand.php b/src/Graviton/SwaggerBundle/Command/SwaggerGenerateCommand.php
index <HASH>..<HASH> 100644
--- a/src/Graviton/SwaggerBundle/Command/SwaggerGenerateCommand.php
+++ b/src/Graviton/SwaggerBundle/Command/SwaggerGenerateCommand.php
@@ -121,14 +121,6 @@ class SwaggerGenerateCommand extends Command
*/
protected function execute(InputInterface $input, OutputInterface $output)
{
- /**
- * somehow as the swagger spec generation digs deep in the utils/router stuff,
- * somewhere Request is needed.. so we need to enter the request scope
- * manually.. maybe there is another possibility for this?
- */
- $this->container->enterScope('request');
- $this->container->set('request', new Request(), 'request');
-
$this->filesystem->dumpFile(
$this->rootDir.'/../app/cache/swagger.json',
json_encode($this->apidoc->getSwaggerSpec()) | there is no need anymore for this - swagger.json has no difference whether this is done or not - and it's deprecated stuff |
diff --git a/presto-druid/src/main/java/com/facebook/presto/druid/segment/V9SegmentIndexSource.java b/presto-druid/src/main/java/com/facebook/presto/druid/segment/V9SegmentIndexSource.java
index <HASH>..<HASH> 100644
--- a/presto-druid/src/main/java/com/facebook/presto/druid/segment/V9SegmentIndexSource.java
+++ b/presto-druid/src/main/java/com/facebook/presto/druid/segment/V9SegmentIndexSource.java
@@ -22,6 +22,7 @@ import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Supplier;
import com.google.common.collect.Streams;
+import org.apache.druid.common.config.NullHandling;
import org.apache.druid.common.utils.SerializerUtils;
import org.apache.druid.jackson.DefaultObjectMapper;
import org.apache.druid.java.util.common.Intervals;
@@ -64,6 +65,7 @@ public class V9SegmentIndexSource
public V9SegmentIndexSource(SegmentColumnSource segmentColumnSource)
{
this.segmentColumnSource = requireNonNull(segmentColumnSource, "segmentColumnSource is null");
+ NullHandling.initializeForTests();
}
@Override | Fix druid connector segment scan
Caused by: com.fasterxml.jackson.databind.exc.InvalidDefinitionException: No serializer found for class org.joda.time.Interval |
diff --git a/lib/devise/controllers/helpers.rb b/lib/devise/controllers/helpers.rb
index <HASH>..<HASH> 100644
--- a/lib/devise/controllers/helpers.rb
+++ b/lib/devise/controllers/helpers.rb
@@ -33,8 +33,7 @@ module Devise
# current_blogger :user # Preferably returns a User if one is signed in
#
def devise_group(group_name, opts={})
- opts[:contains].map! { |m| ":#{m}" }
- mappings = "[#{ opts[:contains].join(',') }]"
+ mappings = "[#{ opts[:contains].map { |m| ":#{m}" }.join(',') }]"
class_eval <<-METHODS, __FILE__, __LINE__ + 1
def authenticate_#{group_name}!(favourite=nil, opts={}) | Do not mutate the receiving arguments |
diff --git a/lib/auditor/recorder.rb b/lib/auditor/recorder.rb
index <HASH>..<HASH> 100644
--- a/lib/auditor/recorder.rb
+++ b/lib/auditor/recorder.rb
@@ -22,7 +22,8 @@ module Auditor
user = Auditor::User.current_user
audit = Audit.new
- audit.auditable = model
+ audit.auditable_id = model.id
+ audit.auditable_type = model.class.name
audit.audited_changes = prepare_changes(model.changes) if changes_available?(action)
audit.action = action
audit.comment = @blk.call(model, user) if @blk | Fixed polymorphic relationship to return the auditable subclass.
Setting the auditable object via audit.auditable = results in the parent
class always being returned by the auditable relationship. Setting the
audit.auditable_id and audit.auditable_type individually results in the
relationship returning the correct subclass type. |
diff --git a/cmd/syncthing/locations.go b/cmd/syncthing/locations.go
index <HASH>..<HASH> 100644
--- a/cmd/syncthing/locations.go
+++ b/cmd/syncthing/locations.go
@@ -31,6 +31,7 @@ const (
locCsrfTokens = "csrfTokens"
locPanicLog = "panicLog"
locAuditLog = "auditLog"
+ locGUIAssets = "GUIAssets"
locDefFolder = "defFolder"
)
@@ -52,6 +53,7 @@ var locations = map[locationEnum]string{
locCsrfTokens: "${config}/csrftokens.txt",
locPanicLog: "${config}/panic-${timestamp}.log",
locAuditLog: "${config}/audit-${timestamp}.log",
+ locGUIAssets: "${config}/gui",
locDefFolder: "${home}/Sync",
}
diff --git a/cmd/syncthing/main.go b/cmd/syncthing/main.go
index <HASH>..<HASH> 100644
--- a/cmd/syncthing/main.go
+++ b/cmd/syncthing/main.go
@@ -252,6 +252,10 @@ func main() {
l.Fatalln(err)
}
+ if guiAssets == "" {
+ guiAssets = locations[locGUIAssets]
+ }
+
if runtime.GOOS == "windows" {
if logFile == "" {
// Use the default log file location | Default GUI override dir
If STGUIASSETS is not set, look for assets in $confdir/gui by default.
Simplifies deploying overrides and stuff. |
diff --git a/git_code_debt/repo_parser.py b/git_code_debt/repo_parser.py
index <HASH>..<HASH> 100644
--- a/git_code_debt/repo_parser.py
+++ b/git_code_debt/repo_parser.py
@@ -1,5 +1,4 @@
import contextlib
-import shutil
import subprocess
import tempfile
from typing import Generator
@@ -31,17 +30,16 @@ class RepoParser:
@contextlib.contextmanager
def repo_checked_out(self) -> Generator[None, None, None]:
assert not self.tempdir
- self.tempdir = tempfile.mkdtemp(suffix='temp-repo')
- try:
- subprocess.check_call((
- 'git', 'clone',
- '--no-checkout', '--quiet', '--shared',
- self.git_repo, self.tempdir,
- ))
- yield
- finally:
- shutil.rmtree(self.tempdir)
- self.tempdir = None
+ with tempfile.TemporaryDirectory(suffix='temp-repo') as self.tempdir:
+ try:
+ subprocess.check_call((
+ 'git', 'clone',
+ '--no-checkout', '--quiet', '--shared',
+ self.git_repo, self.tempdir,
+ ))
+ yield
+ finally:
+ self.tempdir = None
def get_commit(self, sha: str) -> Commit:
output = cmd_output( | Use TemporaryDirectory instead of mkdtemp to fix permission issues on windows |
diff --git a/src/main/java/org/casbin/jcasbin/util/Util.java b/src/main/java/org/casbin/jcasbin/util/Util.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/casbin/jcasbin/util/Util.java
+++ b/src/main/java/org/casbin/jcasbin/util/Util.java
@@ -232,7 +232,7 @@ public class Util {
String[] records = null;
if (s != null) {
try {
- CSVParser csvParser = CSVFormat.DEFAULT.parse(new StringReader(s));
+ CSVParser csvParser = CSVFormat.DEFAULT.withEscape('\\').parse(new StringReader(s));
List<CSVRecord> csvRecords = csvParser.getRecords();
records = new String[csvRecords.get(0).size()];
for (int i = 0; i < csvRecords.get(0).size(); i++) { | feat: support escape character in policy rule (#<I>) |
diff --git a/test/k8sT/DatapathConfiguration.go b/test/k8sT/DatapathConfiguration.go
index <HASH>..<HASH> 100644
--- a/test/k8sT/DatapathConfiguration.go
+++ b/test/k8sT/DatapathConfiguration.go
@@ -254,11 +254,10 @@ var _ = Describe("K8sDatapathConfig", func() {
Expect(testPodConnectivityAcrossNodes(kubectl)).Should(BeTrue(), "Connectivity test between nodes failed")
})
- It("Check vxlan connectivity with per endpoint routes", func() {
- Skip("Encapsulation mode is not supported with per-endpoint routes")
-
+ It("Check vxlan connectivity with per-endpoint routes", func() {
deploymentManager.DeployCilium(map[string]string{
- "global.autoDirectNodeRoutes": "true",
+ "global.tunnel": "vxlan",
+ "global.endpointRoutes.enabled": "true",
}, DeployCiliumOptionsAndDNS)
Expect(testPodConnectivityAcrossNodes(kubectl)).Should(BeTrue(), "Connectivity test between nodes failed") | test: Test for vxlan + per-endpoint routes
<I>a<I> ("datapath: Support enable-endpoint-routes with encapsulation")
enabled combining per-endpoint routes with vxlan encapsulation. This
commit adds a test for that setup. |
diff --git a/lib/observable/on/index.js b/lib/observable/on/index.js
index <HASH>..<HASH> 100644
--- a/lib/observable/on/index.js
+++ b/lib/observable/on/index.js
@@ -28,7 +28,7 @@ exports.define = {
set.on[type] = {}
context = this._context
if (context) {
- observable = this.resolveContextSet(set, false, context, true)
+ observable = this.resolveContext(set, false, context, true)
} else {
this.set(set, false)
} | use resolveContext instead of resolvecontextSet |
diff --git a/activesupport/test/multibyte_conformance_test.rb b/activesupport/test/multibyte_conformance_test.rb
index <HASH>..<HASH> 100644
--- a/activesupport/test/multibyte_conformance_test.rb
+++ b/activesupport/test/multibyte_conformance_test.rb
@@ -10,7 +10,6 @@ require 'tmpdir'
class Downloader
def self.download(from, to)
unless File.exist?(to)
- $stderr.puts "Downloading #{from} to #{to}"
unless File.exist?(File.dirname(to))
system "mkdir -p #{File.dirname(to)}"
end | Silence the output downloading a file
This output isn't used anywhere for assertions so we can simply remove
it. The introducing commit was f<I>d<I>. |
diff --git a/structr-ui/src/main/java/org/structr/web/property/ContentPathProperty.java b/structr-ui/src/main/java/org/structr/web/property/ContentPathProperty.java
index <HASH>..<HASH> 100644
--- a/structr-ui/src/main/java/org/structr/web/property/ContentPathProperty.java
+++ b/structr-ui/src/main/java/org/structr/web/property/ContentPathProperty.java
@@ -69,7 +69,7 @@ public class ContentPathProperty extends AbstractReadOnlyProperty<String> {
containerPath = obj.getProperty(GraphObject.id);
}
- while (parentContainer != null) {
+ while (parentContainer != null && !parentContainer.equals(obj)) {
containerPath = parentContainer.getName().concat("/").concat(containerPath);
parentContainer = parentContainer.getParent(); | Fix: Adds condition to prevent possible infinite loop for content container parent attribute. |
diff --git a/lib/stream.js b/lib/stream.js
index <HASH>..<HASH> 100644
--- a/lib/stream.js
+++ b/lib/stream.js
@@ -22,6 +22,7 @@ util.inherits(ReadableStream, Readable);
ReadableStream.prototype._setCursor = function(cursor) {
if (cursor instanceof Cursor === false) {
this.emit('error', new Error('Cannot create a stream on a single value.'));
+ this.push(null);
return this;
}
this._cursor = cursor;
@@ -86,6 +87,7 @@ ReadableStream.prototype._fetchAndDecrement = function() {
}
else {
self.emit('error', error);
+ self.push(null);
}
});
}
@@ -138,6 +140,7 @@ ReadableStream.prototype._fetch = function() {
}
else {
self.emit('error', error);
+ self.push(null);
}
});
} | Close the stream if an error is emitted since we can't recover frm it |
diff --git a/packages/babel-types/src/index.js b/packages/babel-types/src/index.js
index <HASH>..<HASH> 100644
--- a/packages/babel-types/src/index.js
+++ b/packages/babel-types/src/index.js
@@ -1,5 +1,4 @@
import toFastProperties from "to-fast-properties";
-import compact from "lodash/compact";
import loClone from "lodash/clone";
import uniq from "lodash/uniq";
@@ -398,7 +397,10 @@ export function inheritInnerComments(child: Object, parent: Object) {
function _inheritComments(key, child, parent) {
if (child && parent) {
- child[key] = uniq(compact([].concat(child[key], parent[key])));
+ child[key] = uniq(
+ [].concat(child[key], parent[key])
+ .filter(Boolean)
+ );
}
} | Remove uses of lodash/compact (#<I>) |
diff --git a/gwpy/cli/cliproduct.py b/gwpy/cli/cliproduct.py
index <HASH>..<HASH> 100644
--- a/gwpy/cli/cliproduct.py
+++ b/gwpy/cli/cliproduct.py
@@ -732,7 +732,8 @@ class CliProduct(object):
self.plot_num += 1
def add_segs(self, args):
- """ If requested add DQ segments"""
+ """ If requested add DQ segments
+ """
std_segments = [
'{ifo}:DMT-GRD_ISC_LOCK_NOMINAL:1',
'{ifo}:DMT-DC_READOUT_LOCKED:1',
@@ -764,14 +765,9 @@ class CliProduct(object):
for segment in segments:
seg_name = segment.replace('{ifo}', ifo)
- try:
- seg_data = DataQualityFlag. \
- query_dqsegdb(seg_name, start, end,
- url='https://segments.ligo.org')
- except: # noqa: E722
- seg_data = DataQualityFlag. \
- query_dqsegdb(seg_name, start, end,
- url='https://segments-backup.ligo.org/')
+ seg_data = DataQualityFlag.query_dqsegdb(
+ seg_name, start, end)
+
self.plot.add_segments_bar(seg_data, label=seg_name) | cliproduct.py - remove bare except and segdb url. Format quotes on a doc string. |
diff --git a/src/core/hub.js b/src/core/hub.js
index <HASH>..<HASH> 100755
--- a/src/core/hub.js
+++ b/src/core/hub.js
@@ -1,5 +1,6 @@
import net from 'net';
import logger from 'winston';
+import {Config} from './config';
import {Socket} from './socket';
import {Profile} from './profile';
import {Balancer} from './balancer';
@@ -22,7 +23,10 @@ export class Hub {
_isClosed = false;
- constructor() {
+ constructor(config) {
+ if (config) {
+ Config.init(config);
+ }
this._hub = net.createServer();
this._hub.on('close', this.onClose.bind(this));
this._hub.on('connection', this.onConnect.bind(this)); | chore(hub): allow pass config directly to contructor |
diff --git a/app/Functions/FunctionsPrintLists.php b/app/Functions/FunctionsPrintLists.php
index <HASH>..<HASH> 100644
--- a/app/Functions/FunctionsPrintLists.php
+++ b/app/Functions/FunctionsPrintLists.php
@@ -1216,9 +1216,6 @@ class FunctionsPrintLists {
// Media object name(s)
$html .= '<td data-sort="' . Html::escape($media_object->getSortName()) . '">';
$html .= '<a href="' . $media_object->getHtmlUrl() . '" class="list_item name2">' . $name . '</a>';
- if (Auth::isEditor($media_object->getTree())) {
- $html .= '<br><a href="' . $media_object->getHtmlUrl() . '">' . basename($media_object->getFilename()) . '</a>';
- }
$html .= '</td>';
// Count of linked individuals | Fix - media objects no longer have a filename. (They have many) |
diff --git a/spec/unix_spec.rb b/spec/unix_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/unix_spec.rb
+++ b/spec/unix_spec.rb
@@ -12,7 +12,7 @@ if ChildProcess.unix? && !ChildProcess.jruby? && !ChildProcess.posix_spawn?
process.stub!(:fork).and_return('fakepid')
process.stub!(:send_term)
process.stub!(:poll_for_exit).and_raise(ChildProcess::TimeoutError)
- process.stub!(:send_kill).and_raise(Errno::ECHILD)
+ process.stub!(:send_kill).and_raise(Errno::ECHILD.new)
process.start
lambda { process.stop }.should_not raise_error
@@ -26,7 +26,7 @@ if ChildProcess.unix? && !ChildProcess.jruby? && !ChildProcess.posix_spawn?
process.stub!(:fork).and_return('fakepid')
process.stub!(:send_term)
process.stub!(:poll_for_exit).and_raise(ChildProcess::TimeoutError)
- process.stub!(:send_kill).and_raise(Errno::ESRCH)
+ process.stub!(:send_kill).and_raise(Errno::ESRCH.new)
process.start
lambda { process.stop }.should_not raise_error | Fix spec for rbx |
diff --git a/tango.py b/tango.py
index <HASH>..<HASH> 100644
--- a/tango.py
+++ b/tango.py
@@ -26,8 +26,10 @@ class tango:
return formattedTimeline
def getTrendingTopics(self):
+ # Returns an array of dictionary items containing the current trends
trendingTopicsURL = "http://search.twitter.com/trends.json"
trendingTopics = simplejson.load(urllib.urlopen(trendingTopicsURL))
- pass # for now, coming soon
-
-
+ trendingTopicsArray = []
+ for topic in trendingTopics['trends']:
+ trendingTopicsArray.append({"name" : topic['name'], "url" : topic['url']})
+ return trendingTopicsArray | Implemented a trending topics search function. Returns an array of dictionary items to loop through - fairly snazzy. |
diff --git a/sql/core/src/test/java/org/apache/spark/sql/api/java/JavaApplySchemaSuite.java b/sql/core/src/test/java/org/apache/spark/sql/api/java/JavaApplySchemaSuite.java
index <HASH>..<HASH> 100644
--- a/sql/core/src/test/java/org/apache/spark/sql/api/java/JavaApplySchemaSuite.java
+++ b/sql/core/src/test/java/org/apache/spark/sql/api/java/JavaApplySchemaSuite.java
@@ -156,7 +156,7 @@ public class JavaApplySchemaSuite implements Serializable {
JavaSchemaRDD schemaRDD2 = javaSqlCtx.jsonRDD(jsonRDD, expectedSchema);
StructType actualSchema2 = schemaRDD2.schema();
Assert.assertEquals(expectedSchema, actualSchema2);
- schemaRDD1.registerTempTable("jsonTable2");
+ schemaRDD2.registerTempTable("jsonTable2");
List<Row> actual2 = javaSqlCtx.sql("select * from jsonTable2").collect();
Assert.assertEquals(expectedResult, actual2);
} | [SQL] Correct a variable name in JavaApplySchemaSuite.applySchemaToJSON
`schemaRDD2` is not tested because `schemaRDD1` is registered again. |
diff --git a/lib/tty/cli.rb b/lib/tty/cli.rb
index <HASH>..<HASH> 100644
--- a/lib/tty/cli.rb
+++ b/lib/tty/cli.rb
@@ -73,6 +73,9 @@ EOS
method_option :force, type: :boolean, aliases: '-f',
desc: 'Overwrite existing command'
method_option :help, aliases: '-h', desc: 'Display usage information'
+ method_option :test, type: :string, aliases: '-t',
+ desc: 'Generate a test setup',
+ banner: 'rspec', enum: %w(rspec minitest)
def add(*names)
if options[:help]
invoke :help, ['add'] | Add ability to set testing framework for add command |
diff --git a/hexify.py b/hexify.py
index <HASH>..<HASH> 100755
--- a/hexify.py
+++ b/hexify.py
@@ -4,10 +4,9 @@ import sys
import os
_HELP_TEXT = """
-Creates hexified versions of micropython scripts.
-Intended for saving files to the local filesystem, _NOT_ the microbit.
-Does not autodetect a microbit.
-Accepts multiple imput scripts and optionally one output directory.
+A simple utility script intended for creating hexified versions of MicroPython
+scripts on the local filesystem _NOT_ the microbit. Does not autodetect a
+microbit. Accepts multiple input scripts and optionally one output directory.
"""
def main(argv=None): | Help text edit
Attempted to better word the help text. |
diff --git a/dvc/remote/s3.py b/dvc/remote/s3.py
index <HASH>..<HASH> 100644
--- a/dvc/remote/s3.py
+++ b/dvc/remote/s3.py
@@ -108,11 +108,13 @@ class RemoteS3(RemoteBase):
Logger.debug('Removing s3://{}/{}'.format(path_info['bucket'],
path_info['key']))
+ obj = self.s3.Object(path_info['bucket'], path_info['key'])
try:
- obj = self.s3.Object(path_info['bucket'], path_info['key']).get()
- obj.delete()
+ obj.get()
except Exception:
- pass
+ return
+
+ obj.delete()
def md5s_to_path_infos(self, md5s):
return [{'scheme': self.scheme, | remote: s3: properly delete key |
diff --git a/examples/decision_tree.py b/examples/decision_tree.py
index <HASH>..<HASH> 100644
--- a/examples/decision_tree.py
+++ b/examples/decision_tree.py
@@ -72,20 +72,7 @@ class DecisionNode(Node):
return node.name, node.ev
-# def make_file_system_tree(root_folder, _parent=None):
-# """This function makes a tree from folders and files.
-# """
-# root_node = Node(os.path.basename(root_folder), _parent)
-# root_node.path = root_folder
-# for item in os.listdir(root_folder):
-# item_path = os.path.join(root_folder, item)
-# if os.path.isfile(item_path):
-# file_node = Node(os.path.basename(item), root_node)
-# file_node.path = item_path
-# elif os.path.isdir(item_path):
-# #folder_path = os.path.join(root_folder, item)
-# make_file_system_tree(item_path, _parent=root_node)
-# return root_node
+ | dummy commit to rebuild docs |
diff --git a/lib/disney/index.js b/lib/disney/index.js
index <HASH>..<HASH> 100644
--- a/lib/disney/index.js
+++ b/lib/disney/index.js
@@ -58,6 +58,10 @@ class DisneyPark extends Park {
channel: `${this[s_ResortCode]}.facilitystatus.1_0`,
});
+ /* eslint-disable no-console */
+ FacilityStatusChannels[this[s_ResortCode]].on("error", console.error);
+ /* eslint-enable no-console */
+
// sync facility status channel
FacilityStatusChannels[this[s_ResortCode]].Start();
} | [~] Output facility status errors to the error output |
diff --git a/core/networkserver/networkserver.go b/core/networkserver/networkserver.go
index <HASH>..<HASH> 100644
--- a/core/networkserver/networkserver.go
+++ b/core/networkserver/networkserver.go
@@ -76,7 +76,10 @@ func (n *networkServer) HandlePrepareActivation(activation *pb_broker.Deduplicat
// Build lorawan metadata if not present
if lorawan := activation.ActivationMetadata.GetLorawan(); lorawan == nil {
activation.ActivationMetadata.Protocol = &pb_protocol.ActivationMetadata_Lorawan{
- Lorawan: &pb_lorawan.ActivationMetadata{},
+ Lorawan: &pb_lorawan.ActivationMetadata{
+ DevEui: activation.DevEui,
+ AppEui: activation.AppEui,
+ },
}
}
// Generate random DevAddr | Add DevEUI and AppEUI to ActivationMetadata |
diff --git a/payment_paypal/tests/controllers_test.py b/payment_paypal/tests/controllers_test.py
index <HASH>..<HASH> 100644
--- a/payment_paypal/tests/controllers_test.py
+++ b/payment_paypal/tests/controllers_test.py
@@ -32,6 +32,8 @@ from indico_payment_paypal.plugin import PaypalPaymentPlugin
def test_ipn_verify_business(business, expected, dummy_event):
rh = RHPaypalIPN()
rh.event = dummy_event
+ rh.registration = MagicMock()
+ rh.registration.registration_form.event = dummy_event
PaypalPaymentPlugin.event_settings.set(dummy_event, 'business', 'test')
request.form = {'business': business}
with PaypalPaymentPlugin.instance.plugin_context(): | Payment/PayPal: Fix tests |
diff --git a/php/utils.php b/php/utils.php
index <HASH>..<HASH> 100644
--- a/php/utils.php
+++ b/php/utils.php
@@ -30,7 +30,9 @@ function extract_from_phar( $path ) {
register_shutdown_function(
function() use ( $tmp_path ) {
- unlink( $tmp_path );
+ if ( file_exists( $tmp_path ) ) {
+ unlink( $tmp_path );
+ }
}
); | Only attempt to remove when the file exists |
diff --git a/cmd/ssh-proxy/main.go b/cmd/ssh-proxy/main.go
index <HASH>..<HASH> 100644
--- a/cmd/ssh-proxy/main.go
+++ b/cmd/ssh-proxy/main.go
@@ -192,7 +192,7 @@ func configureProxy(logger lager.Logger) (*ssh.ServerConfig, error) {
if *enableCFAuth {
if *ccAPIURL == "" {
err := errors.New("ccAPIURL is required for Cloud Foundry authentication")
- logger.Fatal("uaa-url-required", err)
+ logger.Fatal("api-url-required", err)
}
_, err = url.Parse(*ccAPIURL) | improve fatal log messages around CF authentication |
diff --git a/snakebite/client.py b/snakebite/client.py
index <HASH>..<HASH> 100644
--- a/snakebite/client.py
+++ b/snakebite/client.py
@@ -753,7 +753,7 @@ class Client(object):
# Source is a file
elif self._is_file(node):
temporary_target = "%s._COPYING_" % target
- f = open(temporary_target, 'w')
+ f = open(temporary_target, 'wb')
try:
for load in self._read_file(path, node, tail_only=False, check_crc=check_crc):
f.write(load) | Changing the 'open' command to open a temporary file as binary. The lack of this parameter causes a bug when using copyToLocal to copy a file from a Linux HDFS cluster to a Windows client box. The file that ends up on Windows isn't byte-identical to the starting file on Linux, due to some end-of-line conversion issue. |
diff --git a/shared/constants/chat2/message.js b/shared/constants/chat2/message.js
index <HASH>..<HASH> 100644
--- a/shared/constants/chat2/message.js
+++ b/shared/constants/chat2/message.js
@@ -402,6 +402,7 @@ const outboxUIMessagetoMessage = (
errorReason,
ordinal: Types.numberToOrdinal(o.ordinal),
outboxID: Types.stringToOutboxID(o.outboxID),
+ submitState: 'pending',
text: new HiddenString(o.body),
timestamp: o.ctime,
}) | set submitState on loading pending (#<I>) |
diff --git a/src/Common/Model/Base.php b/src/Common/Model/Base.php
index <HASH>..<HASH> 100644
--- a/src/Common/Model/Base.php
+++ b/src/Common/Model/Base.php
@@ -633,6 +633,12 @@ abstract class Base
*/
public function getAll($iPage = null, $iPerPage = null, $aData = [], $bIncludeDeleted = false)
{
+ // If the first value is an array then treat as if called with getAll(null, null, $aData);
+ if (is_array($iPage)) {
+ $aData = $iPage;
+ $iPage = null;
+ }
+
$oResults = $this->getAllRawQuery($iPage, $iPerPage, $aData, $bIncludeDeleted);
$aResults = $oResults->result();
$iNumResults = count($aResults); | Adding support for passing the `$aData` array as the first parameter to `getAll` |
diff --git a/Library/Installation/Updater/Updater040800.php b/Library/Installation/Updater/Updater040800.php
index <HASH>..<HASH> 100644
--- a/Library/Installation/Updater/Updater040800.php
+++ b/Library/Installation/Updater/Updater040800.php
@@ -173,16 +173,16 @@ class Updater040800 extends Updater
$workspaces = $wsRepo->findAll();
$i = 0;
- foreach ($worspaces as $workspace) {
+ foreach ($workspaces as $workspace) {
$workspace->setMaxUsers(10000);
$em->persist($workspace);
if ($i % 200 === 0) {
- $i = 0;
$em->flush();
}
$i++;
}
+ $em->flush();
}
} | [CoreBundle] Fix mismatched var names in Updater<I> |
diff --git a/src/main/java/org/cp/elements/beans/model/Property.java b/src/main/java/org/cp/elements/beans/model/Property.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/cp/elements/beans/model/Property.java
+++ b/src/main/java/org/cp/elements/beans/model/Property.java
@@ -592,6 +592,7 @@ public class Property implements Comparable<Property>, Nameable<String> {
*
* @return a boolean value indicating whether this {@link Property} can be read.
* @see #getReadMethod()
+ * @see #isWritable()
*/
public boolean isReadable() {
return getReadMethod() != null;
@@ -636,6 +637,7 @@ public class Property implements Comparable<Property>, Nameable<String> {
* annotation.
*
* @return a boolean value indicating whether this {@link Property} is transient.
+ * @see #isSerializable()
*/
public boolean isTransient() {
@@ -649,6 +651,7 @@ public class Property implements Comparable<Property>, Nameable<String> {
*
* @return a boolean value indicating whether this {@link Property} can be written.
* @see #getWriteMethod()
+ * @see #isReadable()
*/
public boolean isWritable() {
return getWriteMethod() != null; | Edit Javadoc in the Property class. |
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -753,11 +753,11 @@ utils.normalize = function(s, key) {
}
}
- if (key.name === 'p' && key.ctrl) {
+ if (key.name === 'p' && key.ctrl && !key.shift && !key.meta) {
key.name = 'up';
}
- if (key.name === 'n' && key.ctrl) {
+ if (key.name === 'n' && key.ctrl && !key.shift && !key.meta) {
key.name = 'down';
} | ensure shift and meta are not pressed |
diff --git a/internal/jobobject/jobobject_test.go b/internal/jobobject/jobobject_test.go
index <HASH>..<HASH> 100644
--- a/internal/jobobject/jobobject_test.go
+++ b/internal/jobobject/jobobject_test.go
@@ -70,7 +70,6 @@ func TestJobStats(t *testing.T) {
ctx = context.Background()
options = &Options{
Name: "test",
- Silo: true,
EnableIOTracking: true,
}
)
@@ -110,7 +109,6 @@ func TestIOTracking(t *testing.T) {
ctx = context.Background()
options = &Options{
Name: "test",
- Silo: true,
}
)
job, err := Create(ctx, options) | Remove uneccessary use of silos in jobobject tests (#<I>)
Two tests added recently by yours truly don't need to be running as
silos. Remove the silo field set to true. Was running into this when
trying to backport a fix to a branch that doesn't have the silo work. |
diff --git a/nbt/nbt.py b/nbt/nbt.py
index <HASH>..<HASH> 100644
--- a/nbt/nbt.py
+++ b/nbt/nbt.py
@@ -90,9 +90,8 @@ class TAG_Double(_TAG_Numeric):
class TAG_Byte_Array(TAG):
id = TAG_BYTE_ARRAY
- def __init__(self, buffer=None):
+ def __init__(self, name=None, value=None, buffer=None):
super(TAG_Byte_Array, self).__init__()
- self.value = ''
if buffer:
self._parse_buffer(buffer) | Make TAG_Byte_Array instantiate like everything else. |
diff --git a/src/views/view-registry.js b/src/views/view-registry.js
index <HASH>..<HASH> 100644
--- a/src/views/view-registry.js
+++ b/src/views/view-registry.js
@@ -9,6 +9,7 @@ const VIEW_REGISTRY = {
piechart: JuttleViz.Piechart,
scatterchart: JuttleViz.Scatterchart,
less: JuttleViz.Less,
+ markdown: JuttleViz.Markdown,
events: JuttleViz.Events,
file: JuttleViz.File,
timechartvizjs: JuttleViz.TimechartVizJs | view-registry: add markdown view |
diff --git a/spec/integration/resource_spec.rb b/spec/integration/resource_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/integration/resource_spec.rb
+++ b/spec/integration/resource_spec.rb
@@ -133,7 +133,7 @@ if ADAPTER
class Geek < Male
property :awkward, Boolean, :default => true
end
-
+
Geek.auto_migrate!(ADAPTER)
repository(ADAPTER) do
@@ -146,6 +146,26 @@ if ADAPTER
Maniac.create!(:name => 'William')
Psycho.create!(:name => 'Norman')
end
+
+ class Flanimal
+ include DataMapper::Resource
+ property :id, Integer, :serial => true
+ property :type, Discriminator
+ property :name, String
+
+ end
+
+ class Sprog < Flanimal; end
+
+ Flanimal.auto_migrate!(ADAPTER)
+
+ end
+
+ it "should test bug ticket #302" do
+ repository(ADAPTER) do
+ Sprog.create(:name => 'Marty')
+ Sprog.first(:name => 'Marty').should_not be_nil
+ end
end
it "should select appropriate types" do | added spec for ticket #<I>, passing |
diff --git a/atlassian/rest_client.py b/atlassian/rest_client.py
index <HASH>..<HASH> 100644
--- a/atlassian/rest_client.py
+++ b/atlassian/rest_client.py
@@ -125,6 +125,7 @@ class AtlassianRestAPI(object):
verify=self.verify_ssl,
files=files
)
+ response.encoding = 'utf-8'
if self.advanced_mode:
self.response = response
return response | Set response encoding to utf-8
For every request the requests module guesses the correct encoding, which takes time.
Therefore this commit sets the encoding to uft-8. Also see <URL> |
diff --git a/lib/test/examiner.js b/lib/test/examiner.js
index <HASH>..<HASH> 100644
--- a/lib/test/examiner.js
+++ b/lib/test/examiner.js
@@ -407,7 +407,7 @@ Test.prototype.run = function(options) {
this.status = stati.fail;
this.failures.push({ message: '' + ex });
console.error(ex);
- if (ex.stack) {
+ if (options.isNode && ex.stack) {
console.error(ex.stack);
}
} | Bug <I> (extratests): Only report stack traces where needed
- i.e. Node. The web is cooler about this |
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
@@ -1,6 +1,5 @@
$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rspec'
require 'active_support'
require 'action_view'
require 'smart_titles' | Rspec is required automatically by bundler |
diff --git a/lib/ey-deploy/configuration.rb b/lib/ey-deploy/configuration.rb
index <HASH>..<HASH> 100644
--- a/lib/ey-deploy/configuration.rb
+++ b/lib/ey-deploy/configuration.rb
@@ -1,5 +1,6 @@
require 'json'
require 'thor'
+require 'etc'
module EY
class Deploy::Configuration
@@ -73,7 +74,7 @@ module EY
end
def user
- node['users'].first['username'] || 'nobody'
+ Etc.getlogin
end
alias :group :user | Get the username from the system, rather than the node
Change-Id: I6ff<I>cde<I>fc<I>dfc8bb3afdbaa<I>a6f4d<I>c |
diff --git a/pkg/dockerregistry/client.go b/pkg/dockerregistry/client.go
index <HASH>..<HASH> 100644
--- a/pkg/dockerregistry/client.go
+++ b/pkg/dockerregistry/client.go
@@ -184,17 +184,17 @@ func unmarshalDockerImage(body []byte) (*docker.Image, error) {
return nil, err
}
- image := &docker.Image{}
- image.ID = imagePre012.ID
- image.Parent = imagePre012.Parent
- image.Comment = imagePre012.Comment
- image.Created = imagePre012.Created
- image.Container = imagePre012.Container
- image.ContainerConfig = imagePre012.ContainerConfig
- image.DockerVersion = imagePre012.DockerVersion
- image.Author = imagePre012.Author
- image.Config = imagePre012.Config
- image.Architecture = imagePre012.Architecture
- image.Size = imagePre012.Size
- return image, nil
+ return &docker.Image{
+ ID: imagePre012.ID,
+ Parent: imagePre012.Parent,
+ Comment: imagePre012.Comment,
+ Created: imagePre012.Created,
+ Container: imagePre012.Container,
+ ContainerConfig: imagePre012.ContainerConfig,
+ DockerVersion: imagePre012.DockerVersion,
+ Author: imagePre012.Author,
+ Config: imagePre012.Config,
+ Architecture: imagePre012.Architecture,
+ Size: imagePre012.Size,
+ }, nil
} | Initialize image by using struct literal |
diff --git a/src/app/rocket/spec/ei/EiEngine.php b/src/app/rocket/spec/ei/EiEngine.php
index <HASH>..<HASH> 100644
--- a/src/app/rocket/spec/ei/EiEngine.php
+++ b/src/app/rocket/spec/ei/EiEngine.php
@@ -61,6 +61,10 @@ class EiEngine {
private $genericEiDefinition;
private $scalarEiDefinition;
+ /**
+ * @param EiType $eiType
+ * @param EiMask $eiMask
+ */
public function __construct(EiType $eiType, EiMask $eiMask = null) {
$this->eiType = $eiType;
$this->eiMask = $eiMask;
@@ -69,6 +73,9 @@ class EiEngine {
$this->eiModificatorCollection = new EiModificatorCollection($this);
}
+ /**
+ *
+ */
public function clear() {
$this->guiDefinition = null;
$this->draftDefinition = null; | Http 2 server push support added |
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ setup(name='DPark',
author='Davies Liu',
author_email='davies.liu@gmail.com',
license= 'BSD License',
- packages=['dpark', 'dpark.moosefs'],
+ packages=['dpark', 'dpark.moosefs', 'dpark.pymesos'],
include_package_data=True,
zip_safe=False,
install_requires=[ | update setup.py to include dpark.pymesos |
diff --git a/lib/actv/event.rb b/lib/actv/event.rb
index <HASH>..<HASH> 100644
--- a/lib/actv/event.rb
+++ b/lib/actv/event.rb
@@ -115,7 +115,7 @@ module ACTV
if image.blank?
if (self.logoUrlAdr && self.logoUrlAdr != defaultImage && self.logoUrlAdr =~ URI::regexp)
- self.logoUrlAdr
+ image = self.logoUrlAdr
end
end
image | applied the logoUrlAdr as a secondary image should the imageUrlAdr not exists |
diff --git a/src/Block.js b/src/Block.js
index <HASH>..<HASH> 100644
--- a/src/Block.js
+++ b/src/Block.js
@@ -19,6 +19,7 @@ import {
rootBlocks, rootMixins
} from './constants';
import { initApp } from './initApp';
+import { Mixin } from './Mixin';
/**
* @typedef {Error} EvaluationError | Fix Mixin name resolving. |
diff --git a/mod/quiz/report/overview/report.php b/mod/quiz/report/overview/report.php
index <HASH>..<HASH> 100644
--- a/mod/quiz/report/overview/report.php
+++ b/mod/quiz/report/overview/report.php
@@ -6,7 +6,7 @@ class quiz_report extends quiz_default_report {
function display($quiz, $cm, $course) { /// This function just displays the report
- global $CFG;
+ global $CFG, $QUIZ_GRADE_METHOD;
if (!$grades = quiz_get_grade_records($quiz)) {
return;
@@ -14,7 +14,7 @@ class quiz_report extends quiz_default_report {
$strname = get_string("name");
$strattempts = get_string("attempts", "quiz");
- $strbestgrade = get_string("bestgrade", "quiz");
+ $strbestgrade = $QUIZ_GRADE_METHOD[$quiz->grademethod];
$table->head = array(" ", $strname, $strattempts, "$strbestgrade /$quiz->grade");
$table->align = array("center", "left", "left", "center"); | Name of final grade column makes more sense now |
diff --git a/lib/extensions.js b/lib/extensions.js
index <HASH>..<HASH> 100644
--- a/lib/extensions.js
+++ b/lib/extensions.js
@@ -17,7 +17,9 @@ Chai.Assertion.addMethod("class", function(classNames){
classList.contains(name),
"expected classList '" + subject.className + "' to include #{exp}",
"expected classList '" + subject.className + "' not to include #{exp}",
- name
+ subject.className,
+ name,
+ false
);
}
}); | Avoid printing "HTMLSpanElement" in failed class-matches |
diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/api/DashboardAPIImpl.java b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/api/DashboardAPIImpl.java
index <HASH>..<HASH> 100644
--- a/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/api/DashboardAPIImpl.java
+++ b/moskito-webui/src/main/java/net/anotheria/moskito/webui/dashboards/api/DashboardAPIImpl.java
@@ -258,7 +258,6 @@ public class DashboardAPIImpl extends AbstractMoskitoAPIImpl implements Dashboar
ChartConfig newChartConfig = new ChartConfig();
newChartConfig.setAccumulators(accNames);
- newChartConfig.setCaption(" ");
new_cc_array[new_cc_array.length-1] = newChartConfig;
config.setCharts(new_cc_array);
@@ -388,7 +387,7 @@ public class DashboardAPIImpl extends AbstractMoskitoAPIImpl implements Dashboar
if (cc.getCaption()!=null){
bean.setCaption(cc.getCaption());
} else{
- bean.setCaption(cc.buildCaption());
+ bean.setCaption(StringUtils.trimString(cc.buildCaption(),"", 50));
}
LinkedList<String> chartIds = new LinkedList<String>(); | MSK-<I> Accumulators for dashboards. Caption |
diff --git a/spec/ffi/id3tag_spec.rb b/spec/ffi/id3tag_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/ffi/id3tag_spec.rb
+++ b/spec/ffi/id3tag_spec.rb
@@ -85,16 +85,15 @@ module LAME
LAME.id3tag_set_genre(@flags_pointer, pointer_from_string("Rock")).should eql 0
end
- # fixed set of allowed fields (see id3tag.c)
+ # There is a fixed set of allowed fields (see id3tag.c)
+ # LAME 3.99.4 fixed some bugs in setting field values, this could crash for certain tags.
it "sets the fieldvalue" do
- # NOTE: LAME 3.99.4 fixed some bugs in setting field values.
LAME.id3tag_set_fieldvalue(@flags_pointer, pointer_from_string("TIT2=foofoo")).should eql 0
end
- it "sets the fieldvalue (utf16)" do
- pending "UTF-16 is a low priority for now.."
- LAME.id3tag_set_fieldvalue_utf16(@flags_pointer, "LINK=foofoo".encode("UTF-16")).should eql 0
- end
+ # it "sets the fieldvalue (utf16)" do
+ # LAME.id3tag_set_fieldvalue_utf16(@flags_pointer, "LINK=foofoo".encode("UTF-16")).should eql 0
+ # end
it "sets album art" do
buffer_size = 1024 | Remove pending UTF-<I> test. |
diff --git a/quark/backend.py b/quark/backend.py
index <HASH>..<HASH> 100644
--- a/quark/backend.py
+++ b/quark/backend.py
@@ -46,7 +46,8 @@ class Backend(object):
self.dist = du
def visit_Dependency(self, dep):
- self.dependencies["%s:%s.%s-%s" % (dep.lang, dep.group, dep.artifact, dep.version)] = dep
+ if dep.file.depth == 0:
+ self.dependencies["%s:%s.%s-%s" % (dep.lang, dep.group, dep.artifact, dep.version)] = dep
def visit_Use(self, use):
name, ver = namever(use.target) | Don't emit your dependencies' dependencies as your own |
diff --git a/src/language/CSSUtils.js b/src/language/CSSUtils.js
index <HASH>..<HASH> 100644
--- a/src/language/CSSUtils.js
+++ b/src/language/CSSUtils.js
@@ -357,8 +357,9 @@ define(function (require, exports, module) {
}
if (_isInPropName(ctx)) {
- if (ctx.token.string.length > 0 &&
- (ctx.token.string === "{" || !ctx.token.string.match(/\S/))) {
+ if (ctx.token.className === "property" || ctx.token.className === "property error" || ctx.token.className === "tag") {
+ propName = ctx.token.string;
+ } else {
var testPos = {ch: ctx.pos.ch + 1, line: ctx.pos.line},
testToken = editor._codeMirror.getTokenAt(testPos);
@@ -366,8 +367,6 @@ define(function (require, exports, module) {
propName = testToken.string;
offset = 0;
}
- } else if (ctx.token.className === "property" || ctx.token.className === "property error" || ctx.token.className === "tag") {
- propName = ctx.token.string;
}
// If we're in property name context but not in an existing property name, | Always check the next token for the property name after the current cursor position. |
diff --git a/Branch-SDK/src/io/branch/referral/Branch.java b/Branch-SDK/src/io/branch/referral/Branch.java
index <HASH>..<HASH> 100644
--- a/Branch-SDK/src/io/branch/referral/Branch.java
+++ b/Branch-SDK/src/io/branch/referral/Branch.java
@@ -3015,16 +3015,20 @@ public class Branch {
} catch (Exception ignore) {
}
}
- //Publish success to listeners
- thisReq_.onRequestSucceeded(serverResponse, branchReferral_);
+ requestQueue_.dequeue();
+
//If this request changes a session update the session-id to queued requests.
if (thisReq_.isSessionInitRequest()) {
updateAllRequestsInQueue();
initState_ = SESSION_STATE.INITIALISED;
+ //Publish success to listeners
+ thisReq_.onRequestSucceeded(serverResponse, branchReferral_);
checkForAutoDeepLinkConfiguration();
+ }else {
+ //Publish success to listeners
+ thisReq_.onRequestSucceeded(serverResponse, branchReferral_);
}
- requestQueue_.dequeue();
}
networkCount_ = 0;
if (hasNetwork_ && initState_ != SESSION_STATE.UNINITIALISED) { | Fixing issue of calling init finished before setting init state
Init sate is set before calling resultant callbacks to notify Async
result |
diff --git a/mockserver_test.go b/mockserver_test.go
index <HASH>..<HASH> 100644
--- a/mockserver_test.go
+++ b/mockserver_test.go
@@ -40,7 +40,6 @@ var (
)
// newLockListener creates a new listener on the local IP.
-// If listen fails it panics
func newLocalListener() (net.Listener, error) {
l, err := net.Listen("tcp", "127.0.0.1:0")
if err != nil { | Removed out of date comment in mock servers
Removed out of date comment about panic from newLocalListener. |
diff --git a/modules/events.js b/modules/events.js
index <HASH>..<HASH> 100644
--- a/modules/events.js
+++ b/modules/events.js
@@ -129,7 +129,7 @@ EventEmitter.prototype.addListener = function addListener(type, listener) {
} else if (isArray(this._events[type])) {
// If we've already got an array, just append.
- this._events[type].push(listener);
+ this._events[type]['fail' === type ? 'unshift' : 'push'](listener);
// Check for listener leak
if (!this._events[type].warned) {
@@ -151,7 +151,7 @@ EventEmitter.prototype.addListener = function addListener(type, listener) {
}
} else {
// Adding the second element, need to change to array.
- this._events[type] = [this._events[type], listener];
+ this._events[type] = 'fail' === type ? [listener, this._events[type]] : [this._events[type], listener];
}
return this; | Refs #<I> -- ACTUALLY fixes the issue :-) by special-casing 'fail' events for prepending |
diff --git a/integration/build/build_test.go b/integration/build/build_test.go
index <HASH>..<HASH> 100644
--- a/integration/build/build_test.go
+++ b/integration/build/build_test.go
@@ -175,7 +175,7 @@ func TestBuildMultiStageParentConfig(t *testing.T) {
// Test cases in #36996
func TestBuildLabelWithTargets(t *testing.T) {
- skip.If(t, versions.LessThan(testEnv.DaemonAPIVersion(), "1.37"), "test added after 1.37")
+ skip.If(t, versions.LessThan(testEnv.DaemonAPIVersion(), "1.38"), "test added after 1.38")
bldName := "build-a"
testLabels := map[string]string{
"foo": "bar", | Adjust API version to match correct release
This fix was not yet included in Docker <I>, so
API version <I> was not the right selector (Docker
<I>, <I> and <I> all support API <I>).
We should change these checks for engine versions,
or use a different method to skip tests when running
against older engines. |
diff --git a/userprofiles/contrib/emailverification/views.py b/userprofiles/contrib/emailverification/views.py
index <HASH>..<HASH> 100644
--- a/userprofiles/contrib/emailverification/views.py
+++ b/userprofiles/contrib/emailverification/views.py
@@ -36,6 +36,7 @@ email_change_requested = EmailChangeRequestedView.as_view()
class EmailChangeApproveView(LoginRequiredMixin, RedirectView):
+ permanent = False
def get_redirect_url(self, token, code):
try:
verification = EmailVerification.objects.get(token=token, code=code, | Changed emailchangeapproveview to non permanent redirect. |
diff --git a/PHPCI/Helper/BaseCommandExecutor.php b/PHPCI/Helper/BaseCommandExecutor.php
index <HASH>..<HASH> 100644
--- a/PHPCI/Helper/BaseCommandExecutor.php
+++ b/PHPCI/Helper/BaseCommandExecutor.php
@@ -98,4 +98,4 @@ abstract class BaseCommandExecutor implements CommandExecutor
* @return null|string
*/
abstract public function findBinary($binary);
-}
\ No newline at end of file
+} | Add missing newline to end of BaseCommandExecutor. |
diff --git a/bcloud/Downloader.py b/bcloud/Downloader.py
index <HASH>..<HASH> 100644
--- a/bcloud/Downloader.py
+++ b/bcloud/Downloader.py
@@ -16,7 +16,7 @@ from bcloud.const import State
from bcloud.net import ForbiddenHandler
from bcloud import pcs
-CHUNK_SIZE = 16384 # 16K
+CHUNK_SIZE = 131072 # 128K
RETRIES = 5 # 下载数据出错时重试的次数
TIMEOUT = 20
THRESHOLD_TO_FLUSH = 100 # 磁盘写入数据次数超过这个值时, 就进行一次同步. | Set downloading chunk size to <I>k |
diff --git a/sprd/entity/Address.js b/sprd/entity/Address.js
index <HASH>..<HASH> 100644
--- a/sprd/entity/Address.js
+++ b/sprd/entity/Address.js
@@ -72,8 +72,22 @@ define(["js/data/Entity", "sprd/entity/ShippingState", "sprd/entity/ShippingCoun
delete data.state;
}
+ if (this.get('type') === ADDRESS_TYPES.PACKSTATION) {
+ data.street = "Packstation " + data.street;
+ }
+
return data;
},
+
+ parse: function (data) {
+ if (data.type === ADDRESS_TYPES.PACKSTATION) {
+
+ }
+ return this.callBase();
+ },
+ isPackStation: function () {
+ return this.$.type == ADDRESS_TYPES.PACKSTATION;
+ }.onChange('type')
});
Address.ADDRESS_TYPES = ADDRESS_TYPES; | added isPackStation as well as parsing and composing of PackStation address |
diff --git a/lib/index.js b/lib/index.js
index <HASH>..<HASH> 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -31,7 +31,10 @@ module.exports = (rootDir, config, { watch, fingerprint, compact }) => {
return;
}
- let plugin = load(plugins[type]);
+ let plugin = plugins[type];
+ if(!plugin.call) {
+ plugin = load(plugin);
+ }
plugin(pluginConfig, assetManager, { watcher, browsers, compact });
});
}; | added support for function plugins
as suggested by @mkhl, it's sometimes useful to define ad-hoc plugins
within a project's faucet configuration (e.g. while developing a new
plugin) |
diff --git a/packages/eslint-plugin-swissquote/src/typescript-best-practices.js b/packages/eslint-plugin-swissquote/src/typescript-best-practices.js
index <HASH>..<HASH> 100644
--- a/packages/eslint-plugin-swissquote/src/typescript-best-practices.js
+++ b/packages/eslint-plugin-swissquote/src/typescript-best-practices.js
@@ -33,7 +33,7 @@ module.exports = {
// Overrides of TypeScript recommended
"@swissquote/swissquote/@typescript-eslint/explicit-function-return-type": "off",
"@swissquote/swissquote/@typescript-eslint/explicit-member-accessibility": "off",
-
+ "@swissquote/swissquote/@typescript-eslint/no-empty-function": "warn",
}
}; | set no-empty-function as warn in typescript |
diff --git a/src/Controller/InstallerController.php b/src/Controller/InstallerController.php
index <HASH>..<HASH> 100755
--- a/src/Controller/InstallerController.php
+++ b/src/Controller/InstallerController.php
@@ -1024,7 +1024,7 @@ class InstallerController extends AbstractActionController
$container['framework_name'] = $frameworkName;
//Include MelisPlatformFrameworks module
- $mpFwModule = ['MelisPlatformFrameworks' => 'melisplatform/melis-platform-frameworks:dev-develop'];
+ $mpFwModule = ['MelisPlatformFrameworks' => 'melisplatform/melis-platform-frameworks:"dev-develop as 3.1"'];
array_push($container['install_modules'], 'MelisPlatformFrameworks');
$container['download_modules'] = array_merge($container['download_modules'], $mpFwModule);
$container['install_platform_frameworks'] = $mpFwModule; | Added temporarily an alias on develop branch |
diff --git a/pycm/pycm_param.py b/pycm/pycm_param.py
index <HASH>..<HASH> 100644
--- a/pycm/pycm_param.py
+++ b/pycm/pycm_param.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Parameters and constants."""
-VERSION = "1.9"
+VERSION = "2.0"
OVERVIEW = ''' | fix : version tag in pycm_param fixed |
diff --git a/lib/android/manifest.rb b/lib/android/manifest.rb
index <HASH>..<HASH> 100644
--- a/lib/android/manifest.rb
+++ b/lib/android/manifest.rb
@@ -38,6 +38,7 @@ module Android
@intent_filters = []
unless elem.elements['intent-filter'].nil?
elem.elements['intent-filter'].each do |e|
+ next unless e.instance_of? REXML::Element
@intent_filters << IntentFilter.parse(e)
end
end
diff --git a/spec/manifest_spec.rb b/spec/manifest_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/manifest_spec.rb
+++ b/spec/manifest_spec.rb
@@ -122,6 +122,23 @@ describe Android::Manifest do
context "with no components" do
it { should be_empty }
end
+ context 'with text element in intent-filter element. (issue #3)' do
+ before do
+ app = REXML::Element.new('application')
+ activity = REXML::Element.new('activity')
+ intent_filter = REXML::Element.new('intent-filter')
+ text = REXML::Text.new('sample')
+
+ intent_filter << text
+ activity << intent_filter
+ app << activity
+ dummy_xml.root << app
+ end
+ it "should have components" do
+ subject.should have(1).items
+ end
+ it { expect { subject }.to_not raise_error }
+ end
end
end | fixed #3. check object class before creating IntentFilter object. |
diff --git a/discourse.js b/discourse.js
index <HASH>..<HASH> 100644
--- a/discourse.js
+++ b/discourse.js
@@ -321,11 +321,14 @@ function handleResponse(callback) {
}
if (resp.statusCode === 429) {
var msg = 'E429: Too Many Requests';
- if (resp.method) {
- msg += ', Method: ' + resp.method;
- }
- if (resp.url) {
- msg += ', URL: ' + resp.url;
+ if (resp.request) {
+ var request = resp.request;
+ if (request.method) {
+ msg += ', Method: ' + request.method;
+ }
+ if (request.url) {
+ msg += ', URL: ' + request.url;
+ }
}
exports.warn(msg);
delayUntil = new Date().getTime() + 2 * 60 * 1000; | Fixed E<I> messages
method and url are now fetched from the right object |
diff --git a/gulpfile.js b/gulpfile.js
index <HASH>..<HASH> 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -22,6 +22,7 @@ gulp.task('build', function () {
.pipe(header(banner, {pkg: pkg}))
.pipe(rename('blooming-menu.min.js'))
.pipe(gulp.dest('build'))
+ .pipe(gulp.dest('example/js'))
})
gulp.task('deploy:ghpages', function () { | Copy builded file to example/js/ on build |
diff --git a/etk/etk.py b/etk/etk.py
index <HASH>..<HASH> 100644
--- a/etk/etk.py
+++ b/etk/etk.py
@@ -1,7 +1,7 @@
import platform
import tempfile
from typing import List, Dict
-import spacy, copy, json, os, jsonpath_ng, importlib, logging, sys
+import spacy, copy, json, os, jsonpath_ng.ext, importlib, logging, sys
from etk.tokenizer import Tokenizer
from etk.document import Document
from etk.etk_exceptions import InvalidJsonPathError
@@ -33,7 +33,7 @@ class ETK(object):
)
self.logger = logging.getLogger('ETK')
- self.parser = jsonpath_ng.parse
+ self.parser = jsonpath_ng.ext.parse
self.default_nlp = spacy.load('en_core_web_sm')
self.default_tokenizer = Tokenizer(copy.deepcopy(self.default_nlp))
self.parsed = dict()
@@ -297,4 +297,3 @@ class ETK(object):
self.logger.critical(message)
elif level == "exception":
self.logger.exception(message)
-
\ No newline at end of file | Use jsonpath_ng extension instead of jsonpath_ng |
diff --git a/lib/core/proxy.js b/lib/core/proxy.js
index <HASH>..<HASH> 100644
--- a/lib/core/proxy.js
+++ b/lib/core/proxy.js
@@ -70,7 +70,7 @@ exports.serve = function(ipc, host, port, ws){
});
proxy.on('error', function (e) {
- console.error(__("Error forwarding requests to blockchain/simulator"), e);
+ console.error(__("Error forwarding requests to blockchain/simulator"), e.message);
});
proxy.on('proxyRes', (proxyRes) => { | Proxy error message "Error forwarding requests to blockchain/simulator [Object(object)]" was showing in console. Have replace [Object(object)] with `error.message` |
diff --git a/sacred/observers/mongo.py b/sacred/observers/mongo.py
index <HASH>..<HASH> 100644
--- a/sacred/observers/mongo.py
+++ b/sacred/observers/mongo.py
@@ -53,14 +53,15 @@ class MongoObserver(RunObserver):
VERSION = 'MongoObserver-0.7.0'
@staticmethod
- def create(url='localhost', db_name='sacred', collection='runs',
+ def create(url=None, db_name='sacred', collection='runs',
overwrite=None, priority=DEFAULT_MONGO_PRIORITY,
- client=None,**kwargs):
+ client=None, **kwargs):
import pymongo
import gridfs
if client is not None:
assert isinstance(client, pymongo.MongoClient)
+ assert url is None, 'Cannot pass both a client and an url.'
else:
client = pymongo.MongoClient(url, **kwargs)
database = client[db_name] | added a sanity check to prevent passing both client and url to MongoObserver.
see #<I> |
diff --git a/ecabc/abc.py b/ecabc/abc.py
index <HASH>..<HASH> 100644
--- a/ecabc/abc.py
+++ b/ecabc/abc.py
@@ -34,7 +34,7 @@ class ABC:
if self.saving:
try:
self.settings.importSettings()
- except ValueError:
+ except FileNotFoundError:
self.output.print("Creating new settings file")
self.settings.saveSettings()
self.fitnessFunction = fitnessFunction
diff --git a/ecabc/settings.py b/ecabc/settings.py
index <HASH>..<HASH> 100644
--- a/ecabc/settings.py
+++ b/ecabc/settings.py
@@ -47,7 +47,7 @@ class Settings:
def importSettings(self):
self._filename = self._filename
if not os.path.isfile(self._filename):
- raise ValueError('could not open setting file')
+ raise FileNotFoundError('could not open setting file')
else:
with open(self._filename, 'r') as jsonFile:
data = json.load(jsonFile) | changed ValueError -> FileNotFoundError |
diff --git a/src/Traits/ApplicationInitiatorTrait.php b/src/Traits/ApplicationInitiatorTrait.php
index <HASH>..<HASH> 100644
--- a/src/Traits/ApplicationInitiatorTrait.php
+++ b/src/Traits/ApplicationInitiatorTrait.php
@@ -61,4 +61,17 @@ trait ApplicationInitiatorTrait {
}
return false;
}
+
+ /**
+ * Define environment setup.
+ *
+ * @param \Illuminate\Foundation\Application $app
+ *
+ * @return void
+ *
+ * @see \Orchestra\Testbench\Traits\ApplicationTrait
+ */
+ protected function getEnvironmentSetUp($app){
+ // Define your environment setup.
+ }
}
\ No newline at end of file | getEnvironmentSetUp() implemented in trait |
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -12,7 +12,7 @@ exports.transpile = function() {
try {
var src = ts2dart.translateFile(file.path);
file.contents = new Buffer(src);
- file.path = file.path.replace(/.ts$/, '.dart');
+ file.path = file.path.replace(/.[tj]s$/, '.dart');
done(null, file);
} catch (e) {
hadErrors = true; | Support .js extensions, too. |
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -527,7 +527,7 @@ else:
def run_tests(self):
import pytest
- sys.exit(pytest.main(["--pyargs", "tests"]))
+ sys.exit(pytest.main([]))
distutils_cmdclass["test"] = TestCommand | make 'setup.py test' collect tests outside the project's 'tests' folder |
diff --git a/landsat/landsat.py b/landsat/landsat.py
index <HASH>..<HASH> 100755
--- a/landsat/landsat.py
+++ b/landsat/landsat.py
@@ -362,11 +362,16 @@ def main(args):
d = Downloader(download_dir=args.dest)
try:
bands = convert_to_integer_list(args.bands)
- if args.pansharpen:
- bands.append(8)
- if args.ndvi or args.ndvigrey:
- bands = [4, 5]
+ if args.process:
+ if args.pansharpen:
+ bands.append(8)
+
+ if args.ndvi or args.ndvigrey:
+ bands = [4, 5]
+
+ if not args.bands:
+ bands = [4, 3, 2]
downloaded = d.download(args.scenes, bands) | apply pansharpen and ndvi only if -p is used |
diff --git a/discord_test.go b/discord_test.go
index <HASH>..<HASH> 100644
--- a/discord_test.go
+++ b/discord_test.go
@@ -189,6 +189,7 @@ func TestNewUserPassToken(t *testing.T) {
}
}
+/*
func TestOpenClose(t *testing.T) {
if envToken == "" {
t.Skip("Skipping TestClose, DG_TOKEN not set")
@@ -199,6 +200,7 @@ func TestOpenClose(t *testing.T) {
t.Fatalf("TestClose, New(envToken) returned error: %+v", err)
}
+ d.Debug = true
if err = d.Open(); err != nil {
t.Fatalf("TestClose, d.Open failed: %+v", err)
}
@@ -224,6 +226,7 @@ func TestOpenClose(t *testing.T) {
t.Fatalf("TestClose, d.Close failed: %+v", err)
}
}
+*/
func TestAddHandler(t *testing.T) {
testHandlerCalled := 0 | Removed test causing odd problems.
Will debug and re-eval. |
diff --git a/api/settings.js b/api/settings.js
index <HASH>..<HASH> 100644
--- a/api/settings.js
+++ b/api/settings.js
@@ -50,6 +50,8 @@ function _requestAccountSettings(remote, account, callback) {
settings[field.name] = value;
}
+ settings.transaction_sequence = String(settings.transaction_sequence);
+
callback(null, settings);
});
}; | Cast transaction_sequence to a String |
diff --git a/org.carewebframework.ui-parent/org.carewebframework.ui.sharedforms/src/main/java/org/carewebframework/ui/sharedforms/ListViewForm.java b/org.carewebframework.ui-parent/org.carewebframework.ui.sharedforms/src/main/java/org/carewebframework/ui/sharedforms/ListViewForm.java
index <HASH>..<HASH> 100644
--- a/org.carewebframework.ui-parent/org.carewebframework.ui.sharedforms/src/main/java/org/carewebframework/ui/sharedforms/ListViewForm.java
+++ b/org.carewebframework.ui-parent/org.carewebframework.ui.sharedforms/src/main/java/org/carewebframework/ui/sharedforms/ListViewForm.java
@@ -85,6 +85,7 @@ public abstract class ListViewForm<DAO> extends CaptionedForm {
@Override
protected void renderItem(Listitem item, DAO object) {
+ item.addForward(Events.ON_CLICK, listbox, Events.ON_SELECT);
ListViewForm.this.renderItem(item, object);
} | Fix regression - list item click events again being processed. |
diff --git a/src/client/actions/UserUpdate.js b/src/client/actions/UserUpdate.js
index <HASH>..<HASH> 100644
--- a/src/client/actions/UserUpdate.js
+++ b/src/client/actions/UserUpdate.js
@@ -7,7 +7,7 @@ class UserUpdateAction extends Action {
handle(data) {
const client = this.client;
- const newUser = client.users.cache.get(data.id);
+ const newUser = data.id === client.user.id ? client.user : client.users.cache.get(data.id);
const oldUser = newUser._update(data);
if (!oldUser.equals(newUser)) { | fix(UserUpdateAction): rely on client.user when ids match (#<I>) |
diff --git a/packages/build-tools/create-webpack-config.js b/packages/build-tools/create-webpack-config.js
index <HASH>..<HASH> 100644
--- a/packages/build-tools/create-webpack-config.js
+++ b/packages/build-tools/create-webpack-config.js
@@ -551,6 +551,7 @@ async function createWebpackConfig(buildConfig) {
},
plugins: [
new webpack.DefinePlugin(getGlobalJSData(true)),
+ new CopyWebpackPlugin(config.copy ? config.copy : []),
new MiniCssExtractPlugin({
filename: `[name]${langSuffix}.css`,
chunkFilename: `[id]${langSuffix}.css`, | fix: add copy plugin to modern JS build so that copy task runs in local dev mode |
diff --git a/lib/github_api/api.rb b/lib/github_api/api.rb
index <HASH>..<HASH> 100644
--- a/lib/github_api/api.rb
+++ b/lib/github_api/api.rb
@@ -38,8 +38,10 @@ module Github
end
# Creates new API
- def initialize(options = {}, &block)
+ def initialize(options={}, &block)
+ super()
options = Github.options.merge(options)
+
Configuration::VALID_OPTIONS_KEYS.each do |key|
send("#{key}=", options[key])
end | Ensure proper instantiation of api classes. |
diff --git a/server/build/webpack.js b/server/build/webpack.js
index <HASH>..<HASH> 100644
--- a/server/build/webpack.js
+++ b/server/build/webpack.js
@@ -156,7 +156,7 @@ export default async function createCompiler (dir, { dev = false, quiet = false
}
const transpiled = babelCore.transform(content, {
- presets: ['es2015'],
+ presets: [require.resolve('babel-preset-es2015')],
sourceMaps: dev ? 'both' : false,
inputSourceMap: sourceMap
}) | Resolve preset es<I> from next directory (#<I>) |
diff --git a/src/system/modules/metamodelsattribute_translatedtags/languages/de/tl_metamodel_attribute.php b/src/system/modules/metamodelsattribute_translatedtags/languages/de/tl_metamodel_attribute.php
index <HASH>..<HASH> 100644
--- a/src/system/modules/metamodelsattribute_translatedtags/languages/de/tl_metamodel_attribute.php
+++ b/src/system/modules/metamodelsattribute_translatedtags/languages/de/tl_metamodel_attribute.php
@@ -9,6 +9,7 @@
* @package MetaModels
* @subpackage Backend
* @author Christian Schiffler <c.schiffler@cyberspectrum.de>
+ * @author Christian Kolb <info@kolbchristian.de>
* @copyright The MetaModels team.
* @license LGPL.
* @filesource
@@ -23,4 +24,4 @@ if (!defined('TL_ROOT'))
*/
$GLOBALS['TL_LANG']['tl_metamodel_attribute']['typeOptions']['translatedtags'] = 'Übersetzte Tags';
-?>
\ No newline at end of file
+$GLOBALS['TL_LANG']['tl_metamodel_attribute']['tag_langcolumn'] = array('Sprachenspalte', 'Bitte wählen Sie die Spalte aus, die den Sprachcode ISO 639-1 beinhaltet.'); | Add german translation
Add a german translation for the langcolumn field |
diff --git a/generator/templates/base/src/background.js b/generator/templates/base/src/background.js
index <HASH>..<HASH> 100644
--- a/generator/templates/base/src/background.js
+++ b/generator/templates/base/src/background.js
@@ -19,7 +19,7 @@ function createWindow () {
// Create the browser window.
win = new BrowserWindow({ width: 800, height: 600, webPreferences: {
// Use pluginOptions.nodeIntegration, leave this alone
- // See nklayman.github.io/vue-cli-plugin-electron-builder/guide/configuration.html#node-integration for more info
+ // See nklayman.github.io/vue-cli-plugin-electron-builder/guide/security.html#node-integration for more info
nodeIntegration: process.env.ELECTRON_NODE_INTEGRATION
} }) | fix(templates/background): update docs link |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.