diff
stringlengths
65
26.7k
message
stringlengths
7
9.92k
diff --git a/app/controllers/concerns/scim_rails/exception_handler.rb b/app/controllers/concerns/scim_rails/exception_handler.rb index <HASH>..<HASH> 100644 --- a/app/controllers/concerns/scim_rails/exception_handler.rb +++ b/app/controllers/concerns/scim_rails/exception_handler.rb @@ -68,6 +68,20 @@ module ScimRails ) end end + + ## StandardError must be ordered last or it will catch all exceptions + if Rails.env.production? + rescue_from StandardError do |e| + json_response( + { + schemas: ["urn:ietf:params:scim:api:messages:2.0:Error"], + detail: e.message, + status: "500" + }, + :internal_server_error + ) + end + end end end end
• rescue StandardError when the unknown goes wrong
diff --git a/lib/rubocop/cop/util.rb b/lib/rubocop/cop/util.rb index <HASH>..<HASH> 100644 --- a/lib/rubocop/cop/util.rb +++ b/lib/rubocop/cop/util.rb @@ -24,7 +24,7 @@ module RuboCop # Match literal regex characters, not including anchors, character # classes, alternatives, groups, repetitions, references, etc - LITERAL_REGEX = /[\w\s\-,"'!#%&<>=;:`~]|\\[^AbBdDgGhHkpPRwWXsSzZS0-9]/ + LITERAL_REGEX = /[\w\s\-,"'!#%&<>=;:`~]|\\[^AbBdDgGhHkpPRwWXsSzZ0-9]/ module_function
:warning: character class has duplicated range There're two "S"s in the literal
diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java index <HASH>..<HASH> 100644 --- a/core/src/main/java/hudson/PluginManager.java +++ b/core/src/main/java/hudson/PluginManager.java @@ -650,7 +650,17 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas continue; } - String artifactId = dependencyToken.split(":")[0]; + String[] artifactIdVersionPair = dependencyToken.split(":"); + String artifactId = artifactIdVersionPair[0]; + VersionNumber dependencyVersion = new VersionNumber(artifactIdVersionPair[1]); + + PluginManager manager = Jenkins.getActiveInstance().getPluginManager(); + VersionNumber installedVersion = manager.getPluginVersion(manager.rootDir, artifactId); + if (installedVersion != null && installedVersion.isNewerThan(dependencyVersion)) { + // Do not downgrade dependencies that are already installed. + continue; + } + URL dependencyURL = context.getResource(fromPath + "/" + artifactId + ".hpi"); if (dependencyURL == null) {
Do not downgrade installed plugins when loading detached plugins
diff --git a/tensor2tensor/utils/cloud_mlengine.py b/tensor2tensor/utils/cloud_mlengine.py index <HASH>..<HASH> 100755 --- a/tensor2tensor/utils/cloud_mlengine.py +++ b/tensor2tensor/utils/cloud_mlengine.py @@ -232,7 +232,7 @@ def _tar_and_copy(src_dir, target_dir): tmp_dir = tempfile.gettempdir().rstrip("/") src_base = os.path.basename(src_dir) shell_run( - "tar -zcf {tmp_dir}/{src_base}.tar.gz -C {src_dir} .", + "tar --exclude=.git -zcf {tmp_dir}/{src_base}.tar.gz -C {src_dir} .", src_dir=src_dir, src_base=src_base, tmp_dir=tmp_dir)
Exclude .git/ directory when submitting to Cloud ML Engine (#<I>) The `.git` directory isn't used on Cloud ML Engine, therefor we should ignore it in the uploaded archive. This reduces the size of the `.tar.gz` archive from a fresh clone of `tensor2tensor` from <I> MB to only <I> MB.
diff --git a/lib/netsuite/records/discount_item.rb b/lib/netsuite/records/discount_item.rb index <HASH>..<HASH> 100644 --- a/lib/netsuite/records/discount_item.rb +++ b/lib/netsuite/records/discount_item.rb @@ -7,9 +7,9 @@ module NetSuite include Support::Actions include Namespaces::ListAcct - actions :get, :get_list, :add, :delete, :upsert + actions :get, :get_list, :add, :delete, :search, :upsert - fields :available_to_partners, :created_date, :description, :display_name, :include_children, :is_inactive, :is_pretax, + fields :available_to_partners, :created_date, :description, :display_name, :include_children, :is_inactive, :is_pre_tax, :item_id, :last_modified_date, :non_posting, :rate, :upc_code, :vendor_name record_refs :account, :custom_form, :deferred_revenue_account, :department, :expense_account, @@ -27,6 +27,10 @@ module NetSuite initialize_from_attributes_hash(attributes) end + def self.search_class_name + "Item" + end + end end end
Adding search to discount item, fixing field configuration, fixing search class
diff --git a/testing/conftest.py b/testing/conftest.py index <HASH>..<HASH> 100644 --- a/testing/conftest.py +++ b/testing/conftest.py @@ -24,8 +24,8 @@ def restore_settrace(): newtrace = sys.gettrace() if newtrace is not _orig_trace: - assert newtrace is None sys.settrace(_orig_trace) + assert newtrace is None @pytest.fixture
tests: restore_settrace: restore before failing (#<I>)
diff --git a/Classes/Flowpack/ElasticSearch/Indexer/Object/IndexInformer.php b/Classes/Flowpack/ElasticSearch/Indexer/Object/IndexInformer.php index <HASH>..<HASH> 100644 --- a/Classes/Flowpack/ElasticSearch/Indexer/Object/IndexInformer.php +++ b/Classes/Flowpack/ElasticSearch/Indexer/Object/IndexInformer.php @@ -115,7 +115,6 @@ class IndexInformer * @throws \Flowpack\ElasticSearch\Exception * @param ObjectManagerInterface $objectManager * @return array - * @Flow\CompileStatic */ public static function buildIndexClassesAndProperties($objectManager) {
BUGFIX: buildIndexClassesAndProperties cannot compile static The class was annotated as CompileStatic but actually cannot be compiled because it returns objects. A better solution with CompileStatic can be found but for now this just removes the annotation.
diff --git a/account/middleware.py b/account/middleware.py index <HASH>..<HASH> 100644 --- a/account/middleware.py +++ b/account/middleware.py @@ -33,7 +33,7 @@ class LocaleMiddleware(object): return response -class AccountTimezoneMiddleware(object): +class TimezoneMiddleware(object): """ This middleware sets the timezone used to display dates in templates to the user's timezone.
Decided to change AccountTimezoneMiddleware to TimezoneMiddleware This change helps unify the naming. Originally it was decided to add the "Account" prefix, but now realizing it breaks consistency.
diff --git a/packer.go b/packer.go index <HASH>..<HASH> 100644 --- a/packer.go +++ b/packer.go @@ -8,6 +8,7 @@ import ( "io/ioutil" "log" "os" + "runtime" ) func main() { @@ -19,6 +20,11 @@ func main() { log.SetOutput(os.Stderr) } + // If there is no explicit number of Go threads to use, then set it + if os.Getenv("GOMAXPROCS") == "" { + runtime.GOMAXPROCS(runtime.NumCPU()) + } + defer plugin.CleanupClients() config, err := parseConfig(defaultConfig)
packer: Set GOMAXPROCS for number of CPU if n ot set
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/FileSystemMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/FileSystemMediumTest.java index <HASH>..<HASH> 100644 --- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/FileSystemMediumTest.java +++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/FileSystemMediumTest.java @@ -767,7 +767,8 @@ public class FileSystemMediumTest { ScannerMediumTester.AnalysisBuilder analysis = tester .newAnalysis(new File(projectDir, "sonar-project.properties")) .property("sonar.sources", "XOURCES") - .property("sonar.tests", "TESTX"); + .property("sonar.tests", "TESTX") + .property("sonar.scm.exclusions.disabled", "true"); if (System2.INSTANCE.isOsWindows()) { // Windows is file path case-insensitive AnalysisResult result = analysis.execute();
Fix scanner engine test failing on macOS
diff --git a/util.py b/util.py index <HASH>..<HASH> 100644 --- a/util.py +++ b/util.py @@ -29,8 +29,27 @@ def get_platform (): irix-5.3 irix64-6.2 - For non-POSIX platforms, currently just returns 'sys.platform'. + Windows will return one of: + win-x86_64 (64bit Windows on x86_64 (AMD64)) + win-ia64 (64bit Windows on Itanium) + win32 (all others - specifically, sys.platform is returned) + + For other non-POSIX platforms, currently just returns 'sys.platform'. """ + if os.name == 'nt': + # sniff sys.version for architecture. + prefix = " bit (" + i = string.find(sys.version, prefix) + if i == -1: + return sys.platform + j = string.find(sys.version, ")", i) + look = sys.version[i+len(prefix):j].lower() + if look=='amd64': + return 'win-x86_64' + if look=='itanium': + return 'win-ia64' + return sys.platform + if os.name != "posix" or not hasattr(os, 'uname'): # XXX what about the architecture? NT is Intel or Alpha, # Mac OS is M68k or PPC, etc.
[ <I> ] distutils.util.get_platform() return value on <I>bit Windows As discussed on distutils-sig: Allows the generated installer name on <I>bit Windows platforms to be different than the name generated for <I>bit Windows platforms.
diff --git a/lib/classes/navigation/views/secondary.php b/lib/classes/navigation/views/secondary.php index <HASH>..<HASH> 100644 --- a/lib/classes/navigation/views/secondary.php +++ b/lib/classes/navigation/views/secondary.php @@ -89,13 +89,13 @@ class secondary extends view { return [ self::TYPE_SETTING => [ 'modedit' => 1, - 'roleoverride' => 3, - 'rolecheck' => 3.1, - 'logreport' => 4, - "mod_{$this->page->activityname}_useroverrides" => 5, // Overrides are module specific. - "mod_{$this->page->activityname}_groupoverrides" => 6, - 'roleassign' => 7, - 'filtermanage' => 8, + "mod_{$this->page->activityname}_useroverrides" => 3, // Overrides are module specific. + "mod_{$this->page->activityname}_groupoverrides" => 4, + 'roleassign' => 5, + 'filtermanage' => 6, + 'roleoverride' => 7, + 'rolecheck' => 7.1, + 'logreport' => 8, 'backup' => 9, 'restore' => 10, 'competencybreakdown' => 11,
MDL-<I> core: Update the secondary nav nodes order - Part of: MDL-<I>
diff --git a/spec/net_x/http_unix_spec.rb b/spec/net_x/http_unix_spec.rb index <HASH>..<HASH> 100644 --- a/spec/net_x/http_unix_spec.rb +++ b/spec/net_x/http_unix_spec.rb @@ -22,7 +22,7 @@ describe NetX::HTTPUnix do conn.puts "HTTP/1.1 200 OK" conn.puts "" conn.puts "Hello from TCP server" - conn.close + conn.close_write end end end @@ -34,7 +34,7 @@ describe NetX::HTTPUnix do conn.puts "HTTP/1.1 200 OK" conn.puts "" conn.puts "Hello from UNIX server" - conn.close + conn.close_write end end end
(maint) improve test suite to work on modern rubies Without this change, tests would fail with Errno::ECONNRESET or Errno::EPIPE as the server would close the connection without reading all of the client's messages. Trying to actually read the request lead to lock-ups. Since this doesn't actually have to read anything, `close_write` works well enough for this.
diff --git a/sendgrid/helpers/inbound/parse.py b/sendgrid/helpers/inbound/parse.py index <HASH>..<HASH> 100644 --- a/sendgrid/helpers/inbound/parse.py +++ b/sendgrid/helpers/inbound/parse.py @@ -38,14 +38,15 @@ class Parse(object): contents = base64 encoded file contents""" attachments = None if 'attachment-info' in self.payload: - attachments = self._get_attachments(self.payload, self.request) + attachments = self._get_attachments(self.request) # Check if we have a raw message raw_email = self.get_raw_email() if raw_email is not None: - attachments = self._get_attachments_raw(self.payload) + attachments = self._get_attachments_raw(raw_email) return attachments - def _get_attachments(self, payload, request): + def _get_attachments(self, request): + attachments = [] for _, filestorage in request.files.iteritems(): attachment = {} if filestorage.filename not in (None, 'fdopen', '<fdopen>'): @@ -56,7 +57,7 @@ class Parse(object): attachments.append(attachment) return attachments - def _get_attachments_raw(self, payload): + def _get_attachments_raw(self, raw_email): attachments = [] counter = 1 for part in raw_email.walk():
Fixed some errors with the refactoring
diff --git a/ghost/admin/testem.js b/ghost/admin/testem.js index <HASH>..<HASH> 100644 --- a/ghost/admin/testem.js +++ b/ghost/admin/testem.js @@ -5,6 +5,7 @@ let launch_in_ci = [process.env.BROWSER || 'Chrome']; module.exports = { framework: 'mocha', + browser_start_timeout: 120, browser_disconnect_timeout: 60, test_page: 'tests/index.html?hidepassed', disable_watching: true,
Increased testem's `browser_start_timeout` to <I>s no issue - we're seeing random failures in CI with the error "Browser failed to connect within <I>s. testem.js not loaded?" - bumped the timeout to <I>s to determine if it's due to occasional CI-related slowness or something else
diff --git a/src/draw/handler/Draw.Polyline.js b/src/draw/handler/Draw.Polyline.js index <HASH>..<HASH> 100644 --- a/src/draw/handler/Draw.Polyline.js +++ b/src/draw/handler/Draw.Polyline.js @@ -220,6 +220,8 @@ L.Draw.Polyline = L.Draw.Feature.extend({ }, _onTouch: function (e) { + // #TODO: fix the glitchyness of not closing the polyline + // #TODO: use touchstart and touchend vs using click(touch start & end). this._onMouseDown(e); this._onMouseUp(e); },
#TODO: fix ployline glitchyness on shape completion
diff --git a/lib/sshkit/host.rb b/lib/sshkit/host.rb index <HASH>..<HASH> 100644 --- a/lib/sshkit/host.rb +++ b/lib/sshkit/host.rb @@ -72,10 +72,11 @@ module SSHKit def netssh_options {}.tap do |sho| - sho[:keys] = keys if keys.any? - sho[:port] = port if port - sho[:user] = user if user - sho[:password] = password if password + sho[:keys] = keys if keys.any? + sho[:port] = port if port + sho[:user] = user if user + sho[:password] = password if password + sho[:forward_agent] = true end end
Enable agent forwarding by default for all hosts
diff --git a/lib/aws/api_translator.rb b/lib/aws/api_translator.rb index <HASH>..<HASH> 100644 --- a/lib/aws/api_translator.rb +++ b/lib/aws/api_translator.rb @@ -121,7 +121,8 @@ module Aws end property :name - property :documentation_url + + ignore :documentation_url ignore :alias def set_http(http)
Removed documentation urls (for now).
diff --git a/salt/minion.py b/salt/minion.py index <HASH>..<HASH> 100644 --- a/salt/minion.py +++ b/salt/minion.py @@ -726,8 +726,8 @@ class Minion(object): ret['fun'] = data['fun'] minion_instance._return_pub(ret) if data['ret']: + ret['id'] = opts['id'] for returner in set(data['ret'].split(',')): - ret['id'] = opts['id'] try: minion_instance.returners['{0}.returner'.format( returner
Only need to set ret id once Don't set it inside the for loop when it's the same all the time.
diff --git a/test/mixin.rb b/test/mixin.rb index <HASH>..<HASH> 100644 --- a/test/mixin.rb +++ b/test/mixin.rb @@ -18,6 +18,7 @@ module MixinTest def teardown super Timecop.return + GC.start end module Checker
Fix test failure at in_object_space. Depending on GC timing, mock object at test/mixin.rb are remains while test/in_object_space.rb. But lib/fluentd/in_object_space.rb call Object#class on all un-GCed object, including mock object. Because unexpected method expectations are happen, in_object_space reports failure.
diff --git a/lib/bbcloud/commands/users-update.rb b/lib/bbcloud/commands/users-update.rb index <HASH>..<HASH> 100644 --- a/lib/bbcloud/commands/users-update.rb +++ b/lib/bbcloud/commands/users-update.rb @@ -2,6 +2,7 @@ desc 'Update user details' arg_name 'user-id...' command [:update] do |c| c.desc "Path to public ssh key file" + c.long_desc "This is the path to the public ssh key that you'd like to use for new servers. You can specify '-' to read from stdin" c.flag [:f, "ssh-key"] c.desc "Name"
users-update: added long description
diff --git a/test/tests/clone.js b/test/tests/clone.js index <HASH>..<HASH> 100644 --- a/test/tests/clone.js +++ b/test/tests/clone.js @@ -25,7 +25,7 @@ describe("Clone", function() { }); }); - it("can clone with http", function() { + it.skip("can clone with http", function() { var test = this; var url = "http://git.tbranyen.com/smart/site-content";
Skip http clone test We're having an issue reaching the server for the http clone test so I'm just going to skip it for right now.
diff --git a/python/bigdl/dllib/nn/layer.py b/python/bigdl/dllib/nn/layer.py index <HASH>..<HASH> 100644 --- a/python/bigdl/dllib/nn/layer.py +++ b/python/bigdl/dllib/nn/layer.py @@ -902,6 +902,34 @@ class Model(Container): callBigDlFunc(bigdl_type, "saveGraphTopology", self.value, log_path) return self +class Attention(Layer): + + ''' + Implementation of multiheaded attention and self-attention layers. + + >>> attention = Attention(8, 4, 1.0) + creating: createAttention + ''' + + def __init__(self, hidden_size, num_heads, attention_dropout, bigdl_type="float"): + super(Attention, self).__init__(None, bigdl_type, + hidden_size, num_heads, attention_dropout) + +class FeedForwardNetwork(Layer): + + ''' + Implementation FeedForwardNetwork constructed with fully connected network. + Input with shape (batch_size, length, hidden_size) + Output with shape (batch_size, length, hidden_size) + + >>> ffn = FeedForwardNetwork(8, 4, 1.0) + creating: createFeedForwardNetwork + ''' + + def __init__(self, hidden_size, filter_size, relu_dropout, bigdl_type="float"): + super(FeedForwardNetwork, self).__init__(None, bigdl_type, + hidden_size, filter_size, relu_dropout) + class Linear(Layer): '''
[New feature] Add attention layer and ffn layer (#<I>) * add attention layer * add ffn layer and more unit tests * refactor according to pr comments * add SerializationTest * fix unit tests * add python api
diff --git a/guizero/tkmixins.py b/guizero/tkmixins.py index <HASH>..<HASH> 100644 --- a/guizero/tkmixins.py +++ b/guizero/tkmixins.py @@ -25,14 +25,15 @@ class ScheduleMixin(): """Fired by tk.after, gets the callback and either executes the function and cancels or repeats""" # execute the function function(*args) - repeat = self._callback[function][1] - if repeat: - # setup the call back again and update the id - callback_id = self.tk.after(time, self._call_wrapper, time, function, *args) - self._callback[function][0] = callback_id - else: - # remove it from the call back dictionary - self._callback.pop(function) + if function in self._callback.keys(): + repeat = self._callback[function][1] + if repeat: + # setup the call back again and update the id + callback_id = self.tk.after(time, self._call_wrapper, time, function, *args) + self._callback[function][0] = callback_id + else: + # remove it from the call back dictionary + self._callback.pop(function) class DestroyMixin(): def destroy(self): @@ -112,4 +113,4 @@ class ReprMixin: def __repr__(self): return self.description - \ No newline at end of file +
Fix scheduled function cancellation Cancelling a scheduled function that is running can result in an exception. This can occur if the function cancels itself. We can prevent this by checking if the function exists in self._callback
diff --git a/hamper/plugins/karma.py b/hamper/plugins/karma.py index <HASH>..<HASH> 100644 --- a/hamper/plugins/karma.py +++ b/hamper/plugins/karma.py @@ -178,11 +178,14 @@ class Karma(ChatCommandPlugin): # Play nice when the user isn't in the db kt = bot.factory.loader.db.session.query(KarmaTable) thing = ude(groups[0].strip().lower()) - user = kt.filter(KarmaTable.user == thing).first() + rec_list = kt.filter(KarmaTable.receiver == thing).all() - if user: + if rec_list: + total = 0 + for r in rec_list: + total += r.kcount bot.reply( - comm, '%s has %d points' % (uen(user.user), user.kcount), + comm, '%s has %d points' % (uen(thing), total), encode=False ) else:
karma: update UserKarma for the new row structure
diff --git a/loguru/_logger.py b/loguru/_logger.py index <HASH>..<HASH> 100644 --- a/loguru/_logger.py +++ b/loguru/_logger.py @@ -762,6 +762,11 @@ class Logger: The id of the sink to remove, as it was returned by the |add| method. If ``None``, all handlers are removed. The pre-configured handler is guaranteed to have the index ``0``. + Raises + ------ + ValueError + If ``handler_id`` is not ``None`` but there is no active handler with such id. + Examples -------- >>> i = logger.add(sys.stderr, format="{message}")
Add documentation about exception possibly raised by ".remove()"
diff --git a/code/template/helper/actionbar.php b/code/template/helper/actionbar.php index <HASH>..<HASH> 100644 --- a/code/template/helper/actionbar.php +++ b/code/template/helper/actionbar.php @@ -58,7 +58,7 @@ class KTemplateHelperActionbar extends KTemplateHelperAbstract $html .= '</div>'; $buttons = ''; - foreach ($config->toolbar->getCommands() as $command) + foreach ($config->toolbar as $command) { $name = $command->getName(); @@ -96,7 +96,7 @@ class KTemplateHelperActionbar extends KTemplateHelperAbstract $command->attribs->class->append(array('disabled', 'unauthorized')); } - //Add a toolbar class + //Add a toolbar class $command->attribs->class->append(array('toolbar')); //Create the href
re #<I> - Toolbar can be traversed.
diff --git a/workspaces/amber-lib/src/index.js b/workspaces/amber-lib/src/index.js index <HASH>..<HASH> 100644 --- a/workspaces/amber-lib/src/index.js +++ b/workspaces/amber-lib/src/index.js @@ -5,6 +5,7 @@ import { import Form from 'unformed'; import FormFields from 'unformed-fields'; import { Icon, resources as ContentResources } from '@amber-engine/amber-content'; +import { components as AnalyticsComponents, analytics } from '@amber-engine/amber-analytics'; const { FormSuccessSection, @@ -28,11 +29,13 @@ export const components = { ...FormFields, }, }, + AnalyticsComponents, }; export const utils = { ...FormUtils, ...SharedUtils, + analytics, }; export const resources = {
Adding analytics components/utils.
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100755 --- a/setup.py +++ b/setup.py @@ -17,10 +17,10 @@ except: pass if sys.platform == "win32": - ext = Extension("tlslite.utils.win32prng", - sources=["tlslite/utils/win32prng.c"], - libraries=["advapi32"]) - exts = [ext] + #ext = Extension("tlslite.utils.win32prng", + # sources=["tlslite/utils/win32prng.c"], + # libraries=["advapi32"]) + exts = []#[ext] else: exts = []
win<I>prng ext no longer beckoned for if platform is win<I> Looking for win<I>prng during setup was causing failed installations. Will use os.urandom() instead.
diff --git a/src/Buffered/Utils/BufferCollection.php b/src/Buffered/Utils/BufferCollection.php index <HASH>..<HASH> 100644 --- a/src/Buffered/Utils/BufferCollection.php +++ b/src/Buffered/Utils/BufferCollection.php @@ -5,7 +5,7 @@ namespace MatthiasMullie\Scrapbook\Buffered\Utils; use MatthiasMullie\Scrapbook\Adapters\Collections\MemoryStore as MemoryStoreCollection; /** - * @todo + * A collection implementation for Buffer. * * @author Matthias Mullie <scrapbook@mullie.eu> * @copyright Copyright (c) 2014, Matthias Mullie. All rights reserved
Get rid of a stray todo
diff --git a/dosagelib/plugins/g.py b/dosagelib/plugins/g.py index <HASH>..<HASH> 100644 --- a/dosagelib/plugins/g.py +++ b/dosagelib/plugins/g.py @@ -64,6 +64,25 @@ class GeeksNextDoor(_BasicScraper): help = 'Index format: yyyy-mm-dd' +# disallowed by robots.txt +class _GeneralProtectionFault(_BasicScraper): + description = u'General Protection Fault' + url = 'http://www.gpf-comics.com/' + rurl = escape(url) + stripUrl = url + 'archive/%s' + firstStripUrl = stripUrl % '1998/11/02' + imageSearch = compile(tagre("img", "src", r'(/comics/[^"]*)')) + prevSearch = compile(tagre("a", "href", r'(%s[^"]+)' % rurl) + + tagre("img", "alt", "Previous Comic")) + help = 'Index format: yyyy/mm/dd' + + @classmethod + def namer(cls, imageUrl, pageUrl): + """Remove random stuff from filename.""" + imageName = imageUrl.split('/')[-1] + return imageName[:11] + imageName[-4:] + + class GirlsWithSlingshots(_BasicScraper): url = 'http://www.girlswithslingshots.com/' rurl = escape(url)
Add GeneralProtectionFault (disallowed by robots.txt)
diff --git a/xds/src/main/java/io/grpc/xds/ClientXdsClient.java b/xds/src/main/java/io/grpc/xds/ClientXdsClient.java index <HASH>..<HASH> 100644 --- a/xds/src/main/java/io/grpc/xds/ClientXdsClient.java +++ b/xds/src/main/java/io/grpc/xds/ClientXdsClient.java @@ -169,7 +169,7 @@ final class ClientXdsClient extends XdsClient implements XdsResponseHandler, Res || Boolean.parseBoolean(System.getenv("GRPC_EXPERIMENTAL_XDS_CUSTOM_LB_CONFIG")); @VisibleForTesting static boolean enableOutlierDetection = - !Strings.isNullOrEmpty(System.getenv("GRPC_EXPERIMENTAL_ENABLE_OUTLIER_DETECTION")) + Strings.isNullOrEmpty(System.getenv("GRPC_EXPERIMENTAL_ENABLE_OUTLIER_DETECTION")) || Boolean.parseBoolean(System.getenv("GRPC_EXPERIMENTAL_ENABLE_OUTLIER_DETECTION")); private static final String TYPE_URL_HTTP_CONNECTION_MANAGER_V2 = "type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2"
core: Enable outlier detection by default. (#<I>)
diff --git a/lib/agent/index.js b/lib/agent/index.js index <HASH>..<HASH> 100644 --- a/lib/agent/index.js +++ b/lib/agent/index.js @@ -164,10 +164,16 @@ var load_plugin = function(name, cb) { var run_from_command_line = function() { if (!program.debug) logger.pause(); + hooks.on('data', console.log); hooks.on('error', console.log); hooks.on('report', console.log); - commands.perform(commands.parse(program.run)[1]); + + var parsed = commands.parse(program.run); + if (!parsed) + return console.log('Invalid command.'); + + commands.perform(parsed[1]); } ////////////////////////////////////////////////////////////////////
Handle invalid command in agent/index.
diff --git a/tests/Http/RequestTest.php b/tests/Http/RequestTest.php index <HASH>..<HASH> 100644 --- a/tests/Http/RequestTest.php +++ b/tests/Http/RequestTest.php @@ -694,7 +694,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase $body = new RequestBody(); $body->write('foo=bar'); $request = new Request($method, $uri, $headers, $cookies, $serverParams, $body); - $this->assertEquals((object)['foo' => 'bar'], $request->getParsedBody()); + $this->assertEquals(['foo' => 'bar'], $request->getParsedBody()); } public function testGetParsedBodyJson() @@ -709,7 +709,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase $body->write('{"foo":"bar"}'); $request = new Request($method, $uri, $headers, $cookies, $serverParams, $body); - $this->assertEquals((object)['foo' => 'bar'], $request->getParsedBody()); + $this->assertEquals(['foo' => 'bar'], $request->getParsedBody()); } public function testGetParsedBodyXml()
Update unit tests to expect arrays from getParsedBody()
diff --git a/NavigationReactNative/src/android/app/src/main/java/com/navigation/reactnative/SceneActivity.java b/NavigationReactNative/src/android/app/src/main/java/com/navigation/reactnative/SceneActivity.java index <HASH>..<HASH> 100644 --- a/NavigationReactNative/src/android/app/src/main/java/com/navigation/reactnative/SceneActivity.java +++ b/NavigationReactNative/src/android/app/src/main/java/com/navigation/reactnative/SceneActivity.java @@ -36,8 +36,8 @@ public class SceneActivity extends Activity implements DefaultHardwareBackBtnHan super.onCreate(savedInstanceState); int crumb = getIntent().getIntExtra(CRUMB, 0); rootView = new SceneRootViewGroup(getReactNativeHost().getReactInstanceManager().getCurrentReactContext()); - crumb = Math.min(crumb, NavigationStackView.scenes.size() - 1); - rootView.addView(NavigationStackView.scenes.get(crumb).view); + if (crumb < NavigationStackView.scenes.size()) + rootView.addView(NavigationStackView.scenes.get(crumb).view); setContentView(rootView); @SuppressWarnings("unchecked") HashSet<String> sharedElements = (HashSet<String>) getIntent().getSerializableExtra(SHARED_ELEMENTS);
Changed fluent navigation then back check if navigate from A --> B --> C --> D --> E and fluently from C to E, then navigate back 3 to B then it will come in the create activity of D because it wasn't created. At that time it will have the crumb for D but there won't be a scene view for it. Still created the host view because onNewIntent is about to run and needs a container
diff --git a/pathquery/__init__.py b/pathquery/__init__.py index <HASH>..<HASH> 100644 --- a/pathquery/__init__.py +++ b/pathquery/__init__.py @@ -56,16 +56,14 @@ class pathq(object): return is_match def __iter__(self): - matches = [] for root, dirnames, filenames_in_dir in walk(self._head): if self._is_match(root): if root.startswith("./"): root = root[2:] - matches.append(Path(root)) + yield Path(root) for filename_in_dir in filenames_in_dir: full_filename = join(root, filename_in_dir) if self._is_match(full_filename): if full_filename.startswith("./"): full_filename = full_filename[2:] - matches.append(Path(full_filename)) - return iter(matches) + yield Path(full_filename)
REFACTOR : Turned iterator over a list into a generator to increase performance.
diff --git a/lib/spaceship/client.rb b/lib/spaceship/client.rb index <HASH>..<HASH> 100644 --- a/lib/spaceship/client.rb +++ b/lib/spaceship/client.rb @@ -200,7 +200,7 @@ module Spaceship end # Set a new team ID which will be used from now on - def current_team_id=(team_id) + def team_id=(team_id) @current_team_id = team_id end diff --git a/spec/client_spec.rb b/spec/client_spec.rb index <HASH>..<HASH> 100644 --- a/spec/client_spec.rb +++ b/spec/client_spec.rb @@ -62,6 +62,12 @@ describe Spaceship::Client do it 'returns the default team_id' do expect(subject.team_id).to eq('XXXXXXXXXX') end + + it "set custom Team ID" do + team_id = "ABCDEF" + subject.team_id = team_id + expect(subject.team_id).to eq(team_id) + end end describe "test timeout catching" do diff --git a/spec/spaceship_spec.rb b/spec/spaceship_spec.rb index <HASH>..<HASH> 100644 --- a/spec/spaceship_spec.rb +++ b/spec/spaceship_spec.rb @@ -18,6 +18,7 @@ describe Spaceship do expect(subject.device).to eq(Spaceship::Device) expect(subject.provisioning_profile).to eq(Spaceship::ProvisioningProfile) end + it 'passes the client to the models' do expect(subject.device.client).to eq(subject.client) end
Renamed current_team_id= to team_id= in client
diff --git a/examples/standalone_proxy/plugIt/views.py b/examples/standalone_proxy/plugIt/views.py index <HASH>..<HASH> 100644 --- a/examples/standalone_proxy/plugIt/views.py +++ b/examples/standalone_proxy/plugIt/views.py @@ -887,6 +887,8 @@ def api_user(request, userPk, key=None, hproPk=None): if not check_api_key(request, key, hproPk): raise Http404 + hproject = None + if settings.PIAPI_STANDALONE: if not settings.PIAPI_REALUSERS: user = generate_user(pk=userPk)
Added hrpoject to None
diff --git a/src/ClassTrait.php b/src/ClassTrait.php index <HASH>..<HASH> 100644 --- a/src/ClassTrait.php +++ b/src/ClassTrait.php @@ -33,20 +33,6 @@ trait ClassTrait } /** - * @return Monomelodies\Reflex\ReflectionProperty[] - */ - public function getDefaultProperties() : array - { - $properties = parent::getDefaultProperties(); - if ($properties) { - array_walk($properties, function (&$property) { - $property = new ReflectionProperty($this->getName(), $property->getName()); - }); - } - return $properties; - } - - /** * @param int|null $filter * @return Monomelodies\Reflex\ReflectionProperty[] */
that works weird and did not need an override
diff --git a/src/metpy/calc/thermo.py b/src/metpy/calc/thermo.py index <HASH>..<HASH> 100644 --- a/src/metpy/calc/thermo.py +++ b/src/metpy/calc/thermo.py @@ -3278,12 +3278,12 @@ def specific_humidity_from_dewpoint(pressure, dewpoint): Parameters ---------- - dewpoint: `pint.Quantity` - Dewpoint temperature - pressure: `pint.Quantity` Pressure + dewpoint: `pint.Quantity` + Dewpoint temperature + Returns ------- `pint.Quantity`
DOC: switch order of Parameters in specific_humidity_from_dewpoint
diff --git a/pythran/transformations/handle_import.py b/pythran/transformations/handle_import.py index <HASH>..<HASH> 100644 --- a/pythran/transformations/handle_import.py +++ b/pythran/transformations/handle_import.py @@ -363,8 +363,9 @@ class HandleImport(Transformation): # Patch module body: prepend all imported function and import nodes imported = self.registry.generate_ImportList() - external_modules_name = [f for f in self.module.imported_modules - if not is_builtin_module_name(f)] + imported_modules = self.module.imported_modules.items() + external_modules_name = [alias for alias, name in imported_modules + if not is_builtin_module_name(name)] if not imported and external_modules_name: # We can't raise an exception as it may just be an unused import. # FIXME : To improve this, we have to handle aliasing so that we
Fix import warning. * It was looking for builtin modules based on alias name which is incorrect.
diff --git a/modules/lazyLoadableImages/scope.js b/modules/lazyLoadableImages/scope.js index <HASH>..<HASH> 100644 --- a/modules/lazyLoadableImages/scope.js +++ b/modules/lazyLoadableImages/scope.js @@ -4,7 +4,7 @@ "setting up which images can be lazy-loaded analysis" ); - window.addEventListener("beforeunload", () => { + window.addEventListener("load", () => { phantomas.spyEnabled(false, "analyzing which images can be lazy-loaded"); var images = document.body.getElementsByTagName("img"),
lazyLoadableImages/scope.js: bind to window.load event
diff --git a/ui/app/routes/jobs/job/task-group.js b/ui/app/routes/jobs/job/task-group.js index <HASH>..<HASH> 100644 --- a/ui/app/routes/jobs/job/task-group.js +++ b/ui/app/routes/jobs/job/task-group.js @@ -1,4 +1,6 @@ import Route from '@ember/routing/route'; +import { collect } from '@ember/object/computed'; +import { watchRecord, watchRelationship } from 'nomad-ui/utils/properties/watch'; export default Route.extend({ model({ name }) { @@ -15,4 +17,27 @@ export default Route.extend({ }); }); }, + + setupController(controller, model) { + const job = model.get('job'); + controller.set('watchers', { + job: this.get('watchJob').perform(job), + summary: this.get('watchSummary').perform(job), + allocations: this.get('watchAllocations').perform(job), + }); + return this._super(...arguments); + }, + + deactivate() { + this.get('allWatchers').forEach(watcher => { + watcher.cancelAll(); + }); + return this._super(...arguments); + }, + + watchJob: watchRecord('job'), + watchSummary: watchRelationship('summary'), + watchAllocations: watchRelationship('allocations'), + + allWatchers: collect('watchJob', 'watchSummary', 'watchAllocations'), });
Watch job, job-summary, and job-allocs on the task group page
diff --git a/simulation_test.go b/simulation_test.go index <HASH>..<HASH> 100644 --- a/simulation_test.go +++ b/simulation_test.go @@ -10,7 +10,7 @@ import ( "github.com/boltdb/bolt" ) -func TestSimulate_1op_1p(t *testing.T) { testSimulate(t, 100, 1) } +func TestSimulate_1op_1p(t *testing.T) { testSimulate(t, 1, 1) } func TestSimulate_10op_1p(t *testing.T) { testSimulate(t, 10, 1) } func TestSimulate_100op_1p(t *testing.T) { testSimulate(t, 100, 1) } func TestSimulate_1000op_1p(t *testing.T) { testSimulate(t, 1000, 1) }
FIX: Incorrect threadCount in simulation_test.go TestSimulate_1op_1p should pass 1 as the threadCount instead of <I>
diff --git a/tang/src/main/java/com/microsoft/tang/implementation/ConfigurationImpl.java b/tang/src/main/java/com/microsoft/tang/implementation/ConfigurationImpl.java index <HASH>..<HASH> 100644 --- a/tang/src/main/java/com/microsoft/tang/implementation/ConfigurationImpl.java +++ b/tang/src/main/java/com/microsoft/tang/implementation/ConfigurationImpl.java @@ -103,9 +103,9 @@ public class ConfigurationImpl implements Configuration { } Map<String, String> ret = new HashMap<String, String>(); - for (Class<?> opt : namespace.getRegisteredClasses()) { - ret.put(opt.getName(), REGISTERED); - } +// for (Class<?> opt : namespace.getRegisteredClasses()) { +// ret.put(opt.getName(), REGISTERED); +// } for (Node opt : boundImpls.keySet()) { ret.put(opt.getFullName(), boundImpls.get(opt).getName()); }
comment out line that emits regitered lines in config file
diff --git a/core/src/main/java/io/micronaut/core/io/socket/SocketUtils.java b/core/src/main/java/io/micronaut/core/io/socket/SocketUtils.java index <HASH>..<HASH> 100644 --- a/core/src/main/java/io/micronaut/core/io/socket/SocketUtils.java +++ b/core/src/main/java/io/micronaut/core/io/socket/SocketUtils.java @@ -17,6 +17,7 @@ package io.micronaut.core.io.socket; import io.micronaut.core.util.ArgumentUtils; +import java.net.ConnectException; import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.Socket; @@ -89,8 +90,10 @@ public class SocketUtils { try (Socket socket = new Socket()) { socket.connect(new InetSocketAddress(InetAddress.getLocalHost(), currentPort), 20); return false; - } catch (Throwable e) { + } catch (ConnectException e) { return true; + } catch (Throwable e) { + return false; } }
SocketUtils considers a port available if a ConnectException is thrown during connect attempt (#<I>) (#<I>)
diff --git a/packages/cli/lib/commands/create.js b/packages/cli/lib/commands/create.js index <HASH>..<HASH> 100644 --- a/packages/cli/lib/commands/create.js +++ b/packages/cli/lib/commands/create.js @@ -12,8 +12,13 @@ module.exports = async (name, starter = 'default') => { const starters = ['default', 'wordpress'] const hasYarn = await useYarn() - if (fs.existsSync(dir)) { - return console.log(chalk.red(`Directory «${projectName}» already exists.`)) + try { + const files = fs.readdirSync(dir) + if (files.length > 1) { + return console.log(chalk.red(`Directory «${projectName}» is not empty.`)) + } + } catch (err) { + throw new Error(err.message) } if (starters.includes(starter)) {
fix(cli): create project in current directory (#<I>)
diff --git a/common_mnoe_dependencies.rb b/common_mnoe_dependencies.rb index <HASH>..<HASH> 100644 --- a/common_mnoe_dependencies.rb +++ b/common_mnoe_dependencies.rb @@ -3,7 +3,8 @@ # the one component of Mnoe. source 'https://rubygems.org' -gem 'sqlite3' +# sqlite3_adapter requires 1.3.x +gem 'sqlite3', '~> 1.3.13' group :test do gem 'rspec-rails'
Add dependency constraint on sqlite3 sqlite3 <I> is conflicting with sqlite3_adapter which requires <I>.x See <URL>
diff --git a/lib/vagrant/util/ssh.rb b/lib/vagrant/util/ssh.rb index <HASH>..<HASH> 100644 --- a/lib/vagrant/util/ssh.rb +++ b/lib/vagrant/util/ssh.rb @@ -101,10 +101,13 @@ module Vagrant "-o", "ForwardX11Trusted=yes"] end - # Configurables -- extra_args should always be last due to the way the ssh args parser works; - # e.g. if the user wants to use the -t option, any shell command(s) she'd like to run on the - # remote server would have to be the last part of the 'ssh' command: - # $: ssh localhost -t -p 2222 "cd mydirectory; bash" + # Configurables -- extra_args should always be last due to the way the + # ssh args parser works. e.g. if the user wants to use the -t option, + # any shell command(s) she'd like to run on the remote server would + # have to be the last part of the 'ssh' command: + # + # $ ssh localhost -t -p 2222 "cd mydirectory; bash" + # # Without having extra_args be last, the user loses this ability command_options += ["-o", "ForwardAgent=yes"] if ssh_info[:forward_agent] command_options.concat(opts[:extra_args]) if opts[:extra_args]
Reformat some comments to be within <I> chars
diff --git a/lib/sup/crypto.rb b/lib/sup/crypto.rb index <HASH>..<HASH> 100644 --- a/lib/sup/crypto.rb +++ b/lib/sup/crypto.rb @@ -313,7 +313,7 @@ private if signature.validity != GPGME::GPGME_VALIDITY_FULL && signature.validity != GPGME::GPGME_VALIDITY_MARGINAL output_lines << "WARNING: This key is not certified with a trusted signature!" output_lines << "There is no indication that the signature belongs to the owner" - output_lines << "Full fingerprint is: " + (0..9).map {|i| signature.fpr[(i*2),2]}.join(":") + output_lines << "Full fingerprint is: " + (0..9).map {|i| signature.fpr[(i*4),4]}.join(":") else trusted = true end
show the FULL key fingerprint, not just the first half
diff --git a/lib/3scale/core/version.rb b/lib/3scale/core/version.rb index <HASH>..<HASH> 100644 --- a/lib/3scale/core/version.rb +++ b/lib/3scale/core/version.rb @@ -1,5 +1,5 @@ module ThreeScale module Core - VERSION = '1.2.2' + VERSION = '1.2.3' end end
core: bugfix release <I>
diff --git a/py/test/rsession/executor.py b/py/test/rsession/executor.py index <HASH>..<HASH> 100644 --- a/py/test/rsession/executor.py +++ b/py/test/rsession/executor.py @@ -29,6 +29,8 @@ class RunExecutor(object): outcome = Outcome() except Skipped, e: outcome = Outcome(skipped=str(e)) + except (SystemExit, KeyboardInterrupt): + raise except: excinfo = py.code.ExceptionInfo() if isinstance(self.item, py.test.Function):
[svn r<I>] No, this is needed for C-c to work. --HG-- branch : trunk
diff --git a/__init__.py b/__init__.py index <HASH>..<HASH> 100644 --- a/__init__.py +++ b/__init__.py @@ -39,7 +39,7 @@ if not settings.LDAP: settings.LDAP[DEFAULT_LDAP_ALIAS]["TLS_CA"] = settings.LDAP_TLS_CA if DEFAULT_LDAP_ALIAS not in settings.LDAP: - raise ImproperlyConfigured("You must define a '%s' ldap database" % DEFAULT_LDAP_ALIAS) + raise RuntimeError("You must define a '%s' ldap database" % DEFAULT_LDAP_ALIAS) connections = ConnectionHandler(settings.LDAP) connection = connections[DEFAULT_LDAP_ALIAS]
ImproperlyConfigured not defined here, use RuntimeError instead.
diff --git a/lib/cache/FileCachePlugin.js b/lib/cache/FileCachePlugin.js index <HASH>..<HASH> 100644 --- a/lib/cache/FileCachePlugin.js +++ b/lib/cache/FileCachePlugin.js @@ -173,7 +173,7 @@ class FileCachePlugin { (identifier, etag, data) => { const entry = { identifier, - data: store === "pack" ? data : () => data, + data: etag ? () => data : data, etag, version };
use lazy serialization when etag is passed
diff --git a/services/injection.js b/services/injection.js index <HASH>..<HASH> 100644 --- a/services/injection.js +++ b/services/injection.js @@ -215,6 +215,17 @@ exports.initializeScopedThen = function (Q) { } || fn; })); }; + var superNodeify = Q.makePromise.prototype.nodeify; + Q.makePromise.prototype.nodeify = function () { + var storedScope = exports.storeScope(); + + return superNodeify.apply(this, _.map(arguments, function (fn) { + return _.isFunction(fn) && function () { + var resolveArgs = arguments; + return exports.restoreScope(storedScope, function () { return fn.apply(null, resolveArgs) }); + } || fn; + })); + }; Q.makePromise.prototype.scopedThenInitialized = true; };
Q.nodeify doesn't propagate injection scope Fixes #<I>
diff --git a/activemodel/lib/active_model/secure_password.rb b/activemodel/lib/active_model/secure_password.rb index <HASH>..<HASH> 100644 --- a/activemodel/lib/active_model/secure_password.rb +++ b/activemodel/lib/active_model/secure_password.rb @@ -4,8 +4,8 @@ module ActiveModel module SecurePassword extend ActiveSupport::Concern - # BCrypt hash function can handle maximum 72 characters, and if we pass - # password of length more than 72 characters it ignores extra characters. + # BCrypt hash function can handle maximum 72 bytes, and if we pass + # password of length more than 72 bytes it ignores extra characters. # Hence need to put a restriction on password length. MAX_PASSWORD_LENGTH_ALLOWED = 72 @@ -20,7 +20,7 @@ module ActiveModel # # The following validations are added automatically: # * Password must be present on creation - # * Password length should be less than or equal to 72 characters + # * Password length should be less than or equal to 72 bytes # * Confirmation of password (using a +password_confirmation+ attribute) # # If password confirmation validation is not needed, simply leave out the
Talk about bytes not characters [ci skip] Closes #<I>
diff --git a/proton-c/bindings/ruby/lib/qpid_proton/messenger.rb b/proton-c/bindings/ruby/lib/qpid_proton/messenger.rb index <HASH>..<HASH> 100644 --- a/proton-c/bindings/ruby/lib/qpid_proton/messenger.rb +++ b/proton-c/bindings/ruby/lib/qpid_proton/messenger.rb @@ -208,10 +208,10 @@ module Qpid Cproton.pn_messenger_stop(@impl) end - # Returns true iff a Messenger is in the stopped state. + # Returns true if a Messenger is in the stopped state. # This function does not block. # - def stopped + def stopped? Cproton.pn_messenger_stopped(@impl) end @@ -389,7 +389,8 @@ module Qpid Cproton.pn_messenger_recv(@impl, limit) end - def receiving + # Returns true if the messenger is currently receiving data. + def receiving? Cproton.pn_messenger_receiving(@impl) end
NO-JIRA: Fix a few Ruby method names to fit naming conventions. Messenger::receiving and Messenger::stopped renamed to Messenger::receiving? and Messenger::stopped? Also fixed a typo in one rdoc and added rdoc to receiving?
diff --git a/internal/merger/merger.go b/internal/merger/merger.go index <HASH>..<HASH> 100644 --- a/internal/merger/merger.go +++ b/internal/merger/merger.go @@ -99,7 +99,6 @@ func init() { "go_proto_library", }, attrs: []string{ - "compilers", "proto", }, }, {
internal/merger: make "compilers" attribute unmergeable (#<I>) Gazelle won't modify or delete this attribute if it's set in existing rules. Fixes #<I>
diff --git a/client/fileuploader.js b/client/fileuploader.js index <HASH>..<HASH> 100755 --- a/client/fileuploader.js +++ b/client/fileuploader.js @@ -920,6 +920,8 @@ qq.extend(qq.FileUploader.prototype, { qq.preventDefault(e); var item = target.parentNode; + while(item.qqFileId == undefined) { item = target = target.parentNode; } + self._handler.cancel(item.qqFileId); qq.remove(item); }
Fix for nested cancel button/link Cancel handler not work if `fileTemplate` root node is different of cancel `parentNode`, maybe it's not good idea use a `while` but if file template root node always have a `qqFileId` [line <I>](#L<I>) property why not?
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ import sys import os from setuptools import setup -__version__ = '0.8.1' +__version__ = '0.8.2' __description__ = 'A Python package for building Alexa skills.' needs_pytest = {'pytest', 'test', 'ptr'}.intersection(sys.argv) diff --git a/skillful/controller.py b/skillful/controller.py index <HASH>..<HASH> 100644 --- a/skillful/controller.py +++ b/skillful/controller.py @@ -112,8 +112,7 @@ class Skill(object): response. Args: - body: dict. HTTP request body. If str is passed, attempts conversion - to dict. + body: str. HTTP request body. url: str. SignatureCertChainUrl header value sent by request. PEM-encoded X.509 certificate chain that Alexa used to sign the message. diff --git a/skillful/interface.py b/skillful/interface.py index <HASH>..<HASH> 100644 --- a/skillful/interface.py +++ b/skillful/interface.py @@ -113,8 +113,7 @@ class RequestBody(Body): """Parse JSON request, storing content in object attributes. Args: - body: dict. HTTP request body. If str is passed, parse will attempt - conversion to dict. + body: str. HTTP request body. Returns: self
Updated doc to indicate body is str type.
diff --git a/test/test_torconfig.py b/test/test_torconfig.py index <HASH>..<HASH> 100644 --- a/test/test_torconfig.py +++ b/test/test_torconfig.py @@ -469,14 +469,16 @@ class CreateTorrcTests(unittest.TestCase): config.Log = ['80 127.0.0.1:80', '90 127.0.0.1:90'] config.save() torrc = config.create_torrc() - self.assertEqual(torrc, '''HiddenServiceDir /some/dir + lines = torrc.split('\n') + lines.sort() + torrc = '\n'.join(lines).strip() + self.assertEqual(torrc, '''HiddenServiceAuthorizeClient auth +HiddenServiceDir /some/dir HiddenServicePort 80 127.0.0.1:1234 HiddenServiceVersion 2 -HiddenServiceAuthorizeClient auth Log 80 127.0.0.1:80 Log 90 127.0.0.1:90 -SocksPort 1234 -''') +SocksPort 1234''') class HiddenServiceTests(unittest.TestCase):
re-organize test so it's always alphabetical
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb index <HASH>..<HASH> 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -711,12 +711,13 @@ module ActiveRecord end def rename_column_sql(table_name, column_name, new_column_name) - options = { name: new_column_name } column = column_for(table_name, column_name) - - options[:default] = column.default - options[:null] = column.null - options[:auto_increment] = column.extra == "auto_increment" + options = { + name: new_column_name, + default: column.default, + null: column.null, + auto_increment: column.extra == "auto_increment" + } current_type = select_one("SHOW COLUMNS FROM #{quote_table_name(table_name)} LIKE '#{column_name}'", 'SCHEMA')["Type"] schema_creation.accept ChangeColumnDefinition.new column, current_type, options
Simplify building options hash in rename column method for mysql
diff --git a/MicroTokenizer/training/train.py b/MicroTokenizer/training/train.py index <HASH>..<HASH> 100644 --- a/MicroTokenizer/training/train.py +++ b/MicroTokenizer/training/train.py @@ -59,7 +59,7 @@ def train(input_files_list, output_dir, **kwargs): corpus = [] for input_file in input_files_list: - with open(input_file) as fd: + with open(input_file, encoding="utf-8") as fd: for raw_line in fd: line = raw_line.strip()
fix file read encoding issue on Windows
diff --git a/Tests/IntegrationTest.php b/Tests/IntegrationTest.php index <HASH>..<HASH> 100644 --- a/Tests/IntegrationTest.php +++ b/Tests/IntegrationTest.php @@ -25,9 +25,9 @@ class IntegrationTest extends ProviderIntegrationTest protected $testIpv6 = false; protected $skippedTests = [ - 'testGeocodeQuery' => 'Geopunt provider supports Brussels (Belgium) only.', - 'testReverseQuery' => 'Geopunt provider supports Brussels (Belgium) only.', - 'testReverseQueryWithNoResults' => 'Geopunt provider supports Brussels (Belgium) only.', + 'testGeocodeQuery' => 'Geopunt provider supports Brussels and Flanders (Belgium) only.', + 'testReverseQuery' => 'Geopunt provider supports Brussels and Flanders (Belgium) only.', + 'testReverseQueryWithNoResults' => 'Geopunt provider supports Brussels and Flanders (Belgium) only.', ]; protected function createProvider(HttpClient $httpClient)
Update Tests/IntegrationTest.php
diff --git a/code/macroeco/form_func.py b/code/macroeco/form_func.py index <HASH>..<HASH> 100644 --- a/code/macroeco/form_func.py +++ b/code/macroeco/form_func.py @@ -102,7 +102,7 @@ def make_spec_dict(spp_array): unq_specs = np.unique(spp_array) unq_ints = np.linspace(0, len(unq_specs) - 1, num=len(unq_specs)) spec_dict = np.empty(len(unq_ints), dtype=[('spp_code', np.int), \ - ('spp', 'S10')]) + ('spp', 'S29')]) spec_dict['spp'] = unq_specs spec_dict['spp_code'] = unq_ints return spec_dict
Checked in KORU dataset This data set still needs metadata.
diff --git a/js/app.js b/js/app.js index <HASH>..<HASH> 100644 --- a/js/app.js +++ b/js/app.js @@ -735,7 +735,9 @@ App.prototype.registerAssessment = function( name, assessment, pluginName ) { * Disables markers visually in the UI. */ App.prototype.disableMarkers = function() { - this.seoAssessorPresenter.disableMarker(); + if ( !isUndefined( this.seoAssessorPresenter ) ) { + this.seoAssessorPresenter.disableMarker(); + } if ( !isUndefined( this.contentAssessorPresenter ) ) { this.contentAssessorPresenter.disableMarker();
Added a missing if around the seoAssessorPresenter
diff --git a/test/terrific-modules/terrific.js b/test/terrific-modules/terrific.js index <HASH>..<HASH> 100644 --- a/test/terrific-modules/terrific.js +++ b/test/terrific-modules/terrific.js @@ -80,7 +80,6 @@ describe('terrific::renderModule', function() { }); it('should render a basic module, with a nested module', function() { var actual = terrific.renderModule({}, { name: 'basic', template: 'nested' }); - console.log(actual) var expected = grunt.file.read('test/terrific-modules/expected/basic/basic-nested.html'); assert.equal(actual, expected); });
Whoops. Remove console.log from a test.
diff --git a/src/Http/Firewall/SessionExpirationListener.php b/src/Http/Firewall/SessionExpirationListener.php index <HASH>..<HASH> 100644 --- a/src/Http/Firewall/SessionExpirationListener.php +++ b/src/Http/Firewall/SessionExpirationListener.php @@ -14,7 +14,7 @@ namespace Ajgl\Security\Http\Firewall; use Ajgl\Security\Core\Exception\SessionExpiredException; use Symfony\Component\HttpFoundation\Session\SessionInterface; use Symfony\Component\HttpKernel\Event\GetResponseEvent; -use Symfony\Component\HttpKernel\Log\LoggerInterface; +use Psr\Log\LoggerInterface; use Symfony\Component\Security\Core\SecurityContextInterface; use Symfony\Component\Security\Http\Firewall\ListenerInterface; use Symfony\Component\Security\Http\HttpUtils;
Use the PSR LoggerInterface instead of the deprecated one
diff --git a/org.ektorp.android/src/main/java/org/ektorp/android/http/AndroidHttpResponse.java b/org.ektorp.android/src/main/java/org/ektorp/android/http/AndroidHttpResponse.java index <HASH>..<HASH> 100644 --- a/org.ektorp.android/src/main/java/org/ektorp/android/http/AndroidHttpResponse.java +++ b/org.ektorp.android/src/main/java/org/ektorp/android/http/AndroidHttpResponse.java @@ -57,8 +57,8 @@ public class AndroidHttpResponse implements HttpResponse { } @Override - public int getContentLength() { - return (int) entity.getContentLength(); + public long getContentLength() { + return entity.getContentLength(); } @Override
fix compilation issue for Android introduced by <I>da<I>af5df7fb<I>baddae<I>d<I>c<I>cf0f
diff --git a/aeron-client/src/main/java/io/aeron/ClientConductor.java b/aeron-client/src/main/java/io/aeron/ClientConductor.java index <HASH>..<HASH> 100644 --- a/aeron-client/src/main/java/io/aeron/ClientConductor.java +++ b/aeron-client/src/main/java/io/aeron/ClientConductor.java @@ -775,7 +775,7 @@ class ClientConductor implements Agent, DriverEventsListener } while (nanoClock.nanoTime() < deadlineNs); - throw new DriverTimeoutException("No response from MediaDriver within (ns):" + driverTimeoutNs); + throw new DriverTimeoutException("No response from MediaDriver within (ns): " + driverTimeoutNs); } private int onCheckTimeouts()
[Java] Error formatting.
diff --git a/fastlane/lib/fastlane/documentation/docs_generator.rb b/fastlane/lib/fastlane/documentation/docs_generator.rb index <HASH>..<HASH> 100644 --- a/fastlane/lib/fastlane/documentation/docs_generator.rb +++ b/fastlane/lib/fastlane/documentation/docs_generator.rb @@ -18,9 +18,9 @@ module Fastlane output << "" output << "<table width=\"100%\" >" output << "<tr>" - output << "<th width=\"33%\"><a href=\"http://brew.sh\">Homebrew</a></td>" - output << "<th width=\"33%\">Installer Script</td>" - output << "<th width=\"33%\">RubyGems</td>" + output << "<th width=\"33%\"><a href=\"http://brew.sh\">Homebrew</a></th>" + output << "<th width=\"33%\">Installer Script</th>" + output << "<th width=\"33%\">RubyGems</th>" output << "</tr>" output << "<tr>" output << "<td width=\"33%\" align=\"center\">macOS</td>"
Fix mismatched <th> tags in docs_generator (#<I>)
diff --git a/reana_commons/utils.py b/reana_commons/utils.py index <HASH>..<HASH> 100644 --- a/reana_commons/utils.py +++ b/reana_commons/utils.py @@ -19,7 +19,7 @@ # In applying this license, CERN does not waive the privileges and immunities # granted to it by virtue of its status as an Intergovernmental Organization or # submit itself to any jurisdiction. -"""REANA commons utils.""" +"""REANA-Commons utils.""" import hashlib import json @@ -52,14 +52,14 @@ def click_table_printer(headers, _filter, data): click.echo(formatted_output.format(*row)) -def get_user_analyses_dir(org, user): - """Build the analyses directory path for certain user and organization. +def get_user_workflows_dir(org, user): + """Build the workflow directory path for certain user and organization. :param org: Organization which user is part of. :param user: Working directory owner. - :return: Path to the user's analyses directory. + :return: Path to the user's workflow directories. """ - return fs.path.join(org, user, 'analyses') + return fs.path.join(org, user, 'workflows') def calculate_hash_of_dir(directory, file_list=None):
utils: analyses renaming to workflows
diff --git a/py/__init__.py b/py/__init__.py index <HASH>..<HASH> 100644 --- a/py/__init__.py +++ b/py/__init__.py @@ -36,7 +36,6 @@ py_ignore_service_list = { "Cache", "CardinalityEstimator", "Client.addPartitionLostListener", - "Client.authenticationCustom", "Client.createProxies", "Client.removeMigrationListener", "Client.removePartitionLostListener",
Enables custom authentication for the Python client (#<I>)
diff --git a/classes/phing/tasks/system/ImportTask.php b/classes/phing/tasks/system/ImportTask.php index <HASH>..<HASH> 100644 --- a/classes/phing/tasks/system/ImportTask.php +++ b/classes/phing/tasks/system/ImportTask.php @@ -106,6 +106,7 @@ class ImportTask extends Task { $msg = "Unable to find build file: {$file->getPath()}"; if ($this->optional) { $this->log($msg . '... skipped'); + return; } else { throw new BuildException($msg); }
Refs #<I> - import task doesn't skip file if optional is set to true
diff --git a/src/Controller/Component/AuthComponent.php b/src/Controller/Component/AuthComponent.php index <HASH>..<HASH> 100644 --- a/src/Controller/Component/AuthComponent.php +++ b/src/Controller/Component/AuthComponent.php @@ -656,8 +656,8 @@ class AuthComponent extends Component /** * Get the current user from storage. * - * @param string $key Field to retrieve. Leave null to get entire User record. - * @return mixed Either User record or null if no user is logged in, or retrieved field if key is specified. + * @param string|null $key Field to retrieve. Leave null to get entire User record. + * @return mixed|null Either User record or null if no user is logged in, or retrieved field if key is specified. * @link http://book.cakephp.org/3.0/en/controllers/components/authentication.html#accessing-the-logged-in-user */ public function user($key = null)
Update phpdoc in AuthComponent
diff --git a/spyder/plugins/editor/widgets/editor.py b/spyder/plugins/editor/widgets/editor.py index <HASH>..<HASH> 100644 --- a/spyder/plugins/editor/widgets/editor.py +++ b/spyder/plugins/editor/widgets/editor.py @@ -866,7 +866,7 @@ class EditorStack(QWidget): def get_plugin_title(self): """Get the plugin title of the parent widget.""" # Needed for the editor stack to use its own fileswitcher instance. - # See issue # 9469 + # See spyder-ide/spyder#9469 return self.parent().plugin.get_plugin_title() def get_current_tab_manager(self):
Editor: Change comment to use URL awareness
diff --git a/pylint/checkers/base.py b/pylint/checkers/base.py index <HASH>..<HASH> 100644 --- a/pylint/checkers/base.py +++ b/pylint/checkers/base.py @@ -1944,8 +1944,6 @@ class MultipleTypesChecker(BaseChecker): var_type = var_type.pytype() types.add(var_type) if len(types) > 1: - print ('more than one possible type for node %s (%s, %s)' - % (node.as_string(), types.pop(), types.pop())) return except InferenceError: return
Drop print related to issue #<I>
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/web/GwtExtension.java b/sonar-plugin-api/src/main/java/org/sonar/api/web/GwtExtension.java index <HASH>..<HASH> 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/web/GwtExtension.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/web/GwtExtension.java @@ -23,7 +23,9 @@ import org.sonar.api.ServerExtension; /** * @since 1.10 + * @deprecated in 3.7. Replaced by Ruby on Rails extensions */ +@Deprecated public interface GwtExtension extends ServerExtension { String getGwtId(); } diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/web/GwtPage.java b/sonar-plugin-api/src/main/java/org/sonar/api/web/GwtPage.java index <HASH>..<HASH> 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/web/GwtPage.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/web/GwtPage.java @@ -21,7 +21,9 @@ package org.sonar.api.web; /** * @since 1.11 + * @deprecated in 3.7. Replaced by Ruby on Rails pages. */ +@Deprecated public abstract class GwtPage implements Page, GwtExtension { public final String getId() {
Deprecated Gwt API
diff --git a/DBAL/Types/AbstractEnumType.php b/DBAL/Types/AbstractEnumType.php index <HASH>..<HASH> 100644 --- a/DBAL/Types/AbstractEnumType.php +++ b/DBAL/Types/AbstractEnumType.php @@ -93,7 +93,7 @@ abstract class AbstractEnumType extends Type */ public function getName() { - return $this->name ?: (new \ReflectionClass(get_class($this)))->getShortName(); + return $this->name ?: array_search(get_class($this), self::getTypesMap(), true); } /**
Fix mapping of types when using a key other than the short class name
diff --git a/pywindow/utilities.py b/pywindow/utilities.py index <HASH>..<HASH> 100644 --- a/pywindow/utilities.py +++ b/pywindow/utilities.py @@ -1329,8 +1329,8 @@ def find_avarage_diameter(elements, coordinates, adjust=1, increment=0.1, average_2 = 0 for i, j in zip(weighted_avarage, normalised): if i: - average_1 += np.mean(i) * j[1] - average_2 += j[1] + average_1 += np.mean(i) * len(i) + average_2 += len(i) average = average_1 / average_2 return average * 2
Fixed a bug in the weighted avarage diameter feature. No longer it weights for the overall density, just the count of vectors. Seems to work better
diff --git a/shared/util/feature-flags.native.js b/shared/util/feature-flags.native.js index <HASH>..<HASH> 100644 --- a/shared/util/feature-flags.native.js +++ b/shared/util/feature-flags.native.js @@ -7,7 +7,7 @@ const ff: FeatureFlags = { plansEnabled: false, recentFilesEnabled: false, tabPeopleEnabled: false, - teamChatEnabled: false, + teamChatEnabled: true, } if (__DEV__) {
teams features for mobile (#<I>)
diff --git a/lib/epuber/server.rb b/lib/epuber/server.rb index <HASH>..<HASH> 100644 --- a/lib/epuber/server.rb +++ b/lib/epuber/server.rb @@ -241,8 +241,8 @@ module Epuber src = node[attribute_name] unless src.nil? - abs_path = File.expand_path(src, File.join(build_path, File.dirname(context_path))) - relative_path = abs_path.sub(File.expand_path(build_path), '') + abs_path = File.expand_path(src, File.join(build_path, File.dirname(context_path))).unicode_normalize + relative_path = abs_path.sub(File.expand_path(build_path).unicode_normalize, '') node[attribute_name] = File.join('', 'raw', relative_path.to_s) end
[Server] add support for unicode paths
diff --git a/test/bulletproof.py b/test/bulletproof.py index <HASH>..<HASH> 100644 --- a/test/bulletproof.py +++ b/test/bulletproof.py @@ -48,7 +48,7 @@ class TestJpypeModule(unittest.TestCase): expect=c[1] if expect==None: method(*args) - print("PASS: %s => None "%n) + #print("PASS: %s => None "%n) else: self.assertRaises(expect, method, *args)
removed dbg statement [ci skip]
diff --git a/airflow/www/static/js/graph.js b/airflow/www/static/js/graph.js index <HASH>..<HASH> 100644 --- a/airflow/www/static/js/graph.js +++ b/airflow/www/static/js/graph.js @@ -102,7 +102,12 @@ const updateNodeLabels = (node, instances) => { haveLabelsChanged = true; } - if (node.children) return node.children.some((n) => updateNodeLabels(n, instances)); + if (node.children) { + // Iterate through children and return true if at least one has been changed + const updatedNodes = node.children.map((n) => updateNodeLabels(n, instances)); + return updatedNodes.some((changed) => changed); + } + return haveLabelsChanged; };
Make sure all mapped nodes are updated. (#<I>)
diff --git a/XBRL-US-TaxonomyPackage.php b/XBRL-US-TaxonomyPackage.php index <HASH>..<HASH> 100644 --- a/XBRL-US-TaxonomyPackage.php +++ b/XBRL-US-TaxonomyPackage.php @@ -65,6 +65,31 @@ EOT; const namespacePrefix = "http://fasb.org/us-gaap/"; /** + * Provides a URL for the entity publishing the taxonomy. This element SHOULD be used to provide + * the primary website of the publishing entity. The URL used SHOULD be the same as that used in + * other Taxonomy Packages published by the same entity. + * @var string + */ + public $publisherURL; + + /** + * Provides a date on which the taxonomy was published. + * @var string + */ + public $publicationDate = ""; + + /** + * Default constructor + * @param ZipArchive $zipArchive + */ + public function __construct( ZipArchive $zipArchive ) + { + parent::__construct( $zipArchive ); + + $this->publisherURL = XBRL_US_TaxonomyPackage::filePrefix; + } + + /** * Returns true if the zip file represents an SEC package * {@inheritDoc} * @see XBRL_IPackage::isPackage() @@ -84,6 +109,8 @@ EOT; return false; } + $this->publicationDate = $matches['date']; + $found = false; $this->traverseContents( function( $path, $name, $type ) use( &$found ) {
Updated to add publishURL and publicationDate
diff --git a/src/scriptworker/constants.py b/src/scriptworker/constants.py index <HASH>..<HASH> 100644 --- a/src/scriptworker/constants.py +++ b/src/scriptworker/constants.py @@ -372,7 +372,7 @@ DEFAULT_CONFIG: immutabledict[str, Any] = immutabledict( "project:comm:thunderbird:releng:balrog:server:esr": "esr", "project:comm:thunderbird:releng:beetmover:bucket:nightly": "all-nightly-branches", "project:comm:thunderbird:releng:beetmover:bucket:release": "all-release-branches", - "project:comm:thunderbird:releng:bouncer:server:production": "all-release-branches", + "project:comm:thunderbird:releng:bouncer:server:production": "all-nightly-branches", "project:comm:thunderbird:releng:signing:cert:nightly-signing": "all-nightly-branches", "project:comm:thunderbird:releng:signing:cert:release-signing": "all-release-branches", }
Bug <I> - Allow comm-central to use production bouncer scope. (#<I>) The scope is used by the "bouncer-locations" on comm-central to keep the Thunderbird Daily bouncer products pointing to the latest version.
diff --git a/tests/rules/test_sudo.py b/tests/rules/test_sudo.py index <HASH>..<HASH> 100644 --- a/tests/rules/test_sudo.py +++ b/tests/rules/test_sudo.py @@ -10,6 +10,8 @@ from thefuck.types import Command 'requested operation requires superuser privilege', 'need to be root', 'need root', + 'shutdown: NOT super-user', + 'Error: This command has to be run with superuser privileges (under the root user on most systems).', 'must be root', 'You don\'t have access to the history DB.', "error: [Errno 13] Permission denied: '/usr/local/lib/python2.7/dist-packages/ipaddr.py'"]) diff --git a/thefuck/rules/sudo.py b/thefuck/rules/sudo.py index <HASH>..<HASH> 100644 --- a/thefuck/rules/sudo.py +++ b/thefuck/rules/sudo.py @@ -4,6 +4,8 @@ patterns = ['permission denied', 'you cannot perform this operation unless you are root', 'non-root users cannot', 'operation not permitted', + 'not super-user', + 'superuser privilege', 'root privilege', 'this command has to be run under the root user.', 'this operation requires root.',
#<I>: Add two more patterns to sudo rule (#<I>) * macos shutdown sudo fix * Update tests/rules/test_sudo.py * Update thefuck/rules/sudo.py * Update tests/rules/test_sudo.py * Update thefuck/rules/sudo.py
diff --git a/serenata_toolbox/datasets/__init__.py b/serenata_toolbox/datasets/__init__.py index <HASH>..<HASH> 100644 --- a/serenata_toolbox/datasets/__init__.py +++ b/serenata_toolbox/datasets/__init__.py @@ -79,8 +79,8 @@ def fetch_latest_backup(destination_path): datasets = Datasets(destination_path) files = tuple( - f for f in datasets.downloader.LATEST - if not os.path.exists(os.path.join(destination_path, f)) + dataset_file for dataset_file in datasets.downloader.LATEST + if not os.path.exists(os.path.join(destination_path, dataset_file)) ) if not files:
Avoids variable with one letter on __init__ for datasets
diff --git a/modules.js b/modules.js index <HASH>..<HASH> 100644 --- a/modules.js +++ b/modules.js @@ -69,8 +69,11 @@ const make = () => { assert(_.is.Object(module), "second argument must an object or inferred, got: " + typeof module); if (module.binding && !module.Bridge) { + console.log("DEBUG: will _use_binding", module); + return _use_binding(module.binding); } + console.log("DEBUG: standard module:", _.is.String(module_name) ? module_name : null); module.module_name = module_name; @@ -102,7 +105,8 @@ const make = () => { new_binding.bridge = new_module.Bridge; new_binding.__sideload = true; - new_module.bindings = old_module.bindings.concat(new_binding); + new_module.bindings = Object.assign([], old_module.bindings); + new_module.bindings.splice(0, 0, new_binding); _moduled[module_name] = new_module }
sideload to front of array, not back
diff --git a/Kwc/Newsletter/Detail/RecipientsAction.js b/Kwc/Newsletter/Detail/RecipientsAction.js index <HASH>..<HASH> 100644 --- a/Kwc/Newsletter/Detail/RecipientsAction.js +++ b/Kwc/Newsletter/Detail/RecipientsAction.js @@ -33,7 +33,12 @@ Kwc.Newsletter.Detail.RecipientsAction = Ext.extend(Ext.Action, { msgText += ':<div class="recipientsStatusRtr">'+r.rtrExcluded.join('<br />')+'</div>'; } Ext.MessageBox.alert(trlKwf('Status'), msgText, function() { - this.findParentByType('kwc.newsletter.recipients').fireEvent('queueChanged'); + this.findParentBy(function (container) { + if (container instanceof Kwc.Newsletter.Detail.RecipientsPanel) { + return true; + } + return false; + }, this).fireEvent('queueChanged'); }, this); }, progress: true,
Find parent with instanceof instead of xtype-compare This enables to override parent (kwc.newsletter.recipients) in web. Was needed for TIS to add a custom action to filter recipients.
diff --git a/decidim-assemblies/spec/commands/update_assembly_member_spec.rb b/decidim-assemblies/spec/commands/update_assembly_member_spec.rb index <HASH>..<HASH> 100644 --- a/decidim-assemblies/spec/commands/update_assembly_member_spec.rb +++ b/decidim-assemblies/spec/commands/update_assembly_member_spec.rb @@ -30,7 +30,7 @@ module Decidim::Assemblies ceased_date: nil, designation_date: Time.current, position: Decidim::AssemblyMember::POSITIONS.sample, - position_other: "", + position_other: Faker::Lorem.word, existing_user: existing_user, non_user_avatar: non_user_avatar, user_id: user&.id
Fix flaky test in UpdateAssemblyMember (#<I>)
diff --git a/src/HelpScout/ApiClient.php b/src/HelpScout/ApiClient.php index <HASH>..<HASH> 100644 --- a/src/HelpScout/ApiClient.php +++ b/src/HelpScout/ApiClient.php @@ -718,6 +718,7 @@ final class ApiClient { */ private function checkStatus($statusCode, $type, $expected = 200, $responseBody = array()) { $expected = (array) $expected; + $responseBody = $responseBody ?: array(); if (!in_array($statusCode, $expected)) { $exception = new ApiException(
Fix issue where a null response body in `checkStatus` would trigger a type violation on `getErrorMessage`
diff --git a/test/component/bin.spec.js b/test/component/bin.spec.js index <HASH>..<HASH> 100644 --- a/test/component/bin.spec.js +++ b/test/component/bin.spec.js @@ -32,7 +32,6 @@ describe('bin', () => { beforeEach(() => { sandbox = sinon.sandbox.create(); - sandbox.stub(path, 'resolve').returnsArg(1); sandbox.stub(path, 'relative').returnsArg(1); on = sandbox.stub(); spawn = sandbox.stub(child_process, 'spawn').returns({
Do not stub path.resolve (#<I>)
diff --git a/aiogram/dispatcher/handler.py b/aiogram/dispatcher/handler.py index <HASH>..<HASH> 100644 --- a/aiogram/dispatcher/handler.py +++ b/aiogram/dispatcher/handler.py @@ -72,7 +72,7 @@ class Handler: context.set_value('handler', handler) await self.dispatcher.middleware.trigger(f"process_{self.middleware_key}", args) response = await handler(*args) - if results is not None: + if response is not None: results.append(response) if self.once: break
Fix response None check in handlers
diff --git a/test/src/main/java/org/vertexium/test/GraphTestBase.java b/test/src/main/java/org/vertexium/test/GraphTestBase.java index <HASH>..<HASH> 100644 --- a/test/src/main/java/org/vertexium/test/GraphTestBase.java +++ b/test/src/main/java/org/vertexium/test/GraphTestBase.java @@ -2544,7 +2544,7 @@ public abstract class GraphTestBase { Assert.assertEquals(1, count(v.getProperties())); assertEquals("value1", v.getPropertyValue("prop1")); - m.save(AUTHORIZATIONS_A_AND_B); + v = m.save(AUTHORIZATIONS_A_AND_B); Assert.assertEquals(2, count(v.getProperties())); assertEquals("value2", v.getPropertyValue("prop1")); assertEquals("value2", v.getPropertyValue("prop2"));
try fixing test that only fails on Jenkins
diff --git a/gflags/flag.py b/gflags/flag.py index <HASH>..<HASH> 100644 --- a/gflags/flag.py +++ b/gflags/flag.py @@ -29,12 +29,13 @@ """Contains Flag class - information about single command-line flag.""" - +from functools import total_ordering from gflags import _helpers from gflags import argument_parser from gflags import exceptions +@total_ordering class Flag(object): """Information about a command-line flag.
Class Flag defines __eq__ and __lt__ but does not define other relations. Since there are no implied relationships among the comparison operators, to automatically generate ordering operations from a single root operation functools.total_ordering() used. <URL>
diff --git a/aws-java-sdk-s3/src/main/java/com/amazonaws/services/s3/AmazonS3Client.java b/aws-java-sdk-s3/src/main/java/com/amazonaws/services/s3/AmazonS3Client.java index <HASH>..<HASH> 100644 --- a/aws-java-sdk-s3/src/main/java/com/amazonaws/services/s3/AmazonS3Client.java +++ b/aws-java-sdk-s3/src/main/java/com/amazonaws/services/s3/AmazonS3Client.java @@ -4075,4 +4075,16 @@ public class AmazonS3Client extends AmazonWebServiceClient implements AmazonS3 { return bucketRegion; } + + @Override + public boolean doesObjectExistInBucket(String bucketName, String objectName) throws AmazonServiceException, AmazonClientException { + try { + getObjectMetadata(bucketName, objectName); + } catch (AmazonS3Exception e) { + if (e.getStatusCode() == 404) return false; + throw e; + } + + return true; + } }
Implementation of `doesObjectExistInBucket`
diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php index <HASH>..<HASH> 100644 --- a/code/controllers/CMSMain.php +++ b/code/controllers/CMSMain.php @@ -159,7 +159,6 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr function SearchForm() { // get all page types in a dropdown-compatible format $pageTypes = SiteTree::page_type_classes(); - array_unshift($pageTypes, _t('CMSMain.PAGETYPEANYOPT','Any')); $pageTypes = array_combine($pageTypes, $pageTypes); asort($pageTypes);
BUGFIX SSF-<I> remove one of the duplicated 'Any' options which also cause that search on the second 'Any' broke.
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ with open(path.join(this_folder,'README.md'),encoding='utf-8') as inf: setup( name='pythologist', - version='1.1.1', + version='1.2.1', test_suite='nose2.collector.collector', description='inForm PerkinElmer Reader - Python interface to read outputs of the PerkinElmer inForm software', long_description=long_description,
tick version for modification to permutation command
diff --git a/flate/crc32_amd64.go b/flate/crc32_amd64.go index <HASH>..<HASH> 100644 --- a/flate/crc32_amd64.go +++ b/flate/crc32_amd64.go @@ -1,5 +1,6 @@ //+build !noasm //+build !appengine +//+build !gccgo // Copyright 2015, Klaus Post, see LICENSE for details. diff --git a/flate/crc32_amd64.s b/flate/crc32_amd64.s index <HASH>..<HASH> 100644 --- a/flate/crc32_amd64.s +++ b/flate/crc32_amd64.s @@ -1,5 +1,6 @@ //+build !noasm //+build !appengine +//+build !gccgo // Copyright 2015, Klaus Post, see LICENSE for details. diff --git a/flate/crc32_noasm.go b/flate/crc32_noasm.go index <HASH>..<HASH> 100644 --- a/flate/crc32_noasm.go +++ b/flate/crc32_noasm.go @@ -1,4 +1,4 @@ -//+build !amd64 noasm appengine +//+build !amd64 noasm appengine gccgo // Copyright 2015, Klaus Post, see LICENSE for details.
Don't use flate asm code when building for gccgo. Updates golang/go#<I>