diff
stringlengths
65
26.7k
message
stringlengths
7
9.92k
diff --git a/js/client/api.js b/js/client/api.js index <HASH>..<HASH> 100644 --- a/js/client/api.js +++ b/js/client/api.js @@ -153,12 +153,12 @@ fin = Singleton(function(){ })) } - this.appendToList = function(itemId, propName /*, val1, val2, ... */) { + this.append = function(itemId, propName /*, val1, val2, ... */) { var values = Array.prototype.slice.call(arguments, 2) this._listOp(itemId, propName, 'listAppend', values) } - this.prependToList = function(itemId, propName /*, val1, val2, ... */) { + this.prepend = function(itemId, propName /*, val1, val2, ... */) { var values = Array.prototype.slice.call(arguments, 2) this._listOp(itemId, propName, 'listPrepend', values) }
Rename appendToList and prependToList to append and prepend
diff --git a/common/src/main/java/tachyon/replay/ReplayCache.java b/common/src/main/java/tachyon/replay/ReplayCache.java index <HASH>..<HASH> 100644 --- a/common/src/main/java/tachyon/replay/ReplayCache.java +++ b/common/src/main/java/tachyon/replay/ReplayCache.java @@ -111,7 +111,7 @@ public final class ReplayCache<V> { /** * Same with {@link ReplayCallable} except that this handler method throws {@link IOException} and - * is to be executed in {@link #run(String, ReplayCallableThrowsIOException}. + * is to be executed in {@link #run(String, ReplayCallableThrowsIOException)}. * * @param <V> the return type of {@link #call()} */
[SMALLFIX] Added missing bracket in Javadoc in 'ReplayCache'
diff --git a/js/coincheck.js b/js/coincheck.js index <HASH>..<HASH> 100644 --- a/js/coincheck.js +++ b/js/coincheck.js @@ -4,6 +4,7 @@ const Exchange = require ('./base/Exchange'); const { BadSymbol, ExchangeError, AuthenticationError } = require ('./base/errors'); +const { TICK_SIZE } = require ('./base/functions/number'); // --------------------------------------------------------------------------- @@ -145,6 +146,7 @@ module.exports = class coincheck extends Exchange { 'taker': this.parseNumber ('0'), }, }, + 'precisionMode': TICK_SIZE, 'exceptions': { 'exact': { 'disabled API Key': AuthenticationError, // {"success":false,"error":"disabled API Key"}'
TICK_SIZE re-set
diff --git a/test/OIPIndex.test.js b/test/OIPIndex.test.js index <HASH>..<HASH> 100644 --- a/test/OIPIndex.test.js +++ b/test/OIPIndex.test.js @@ -61,5 +61,15 @@ describe('OIPIndex API', () => { expect(mp instanceof MPSingle).toBeTruthy() } }) + it('GET Multiparts via Reference w/ Limit', async () => { + let ref = '8c204c5f39' + let limit = 3 + let response = await index.getMultipartsByRef(ref, limit) + expect(response.success).toBeTruthy() + expect(response.multiparts.length).toEqual(response.limit) + for (let mp of response.multiparts) { + expect(mp instanceof MPSingle).toBeTruthy() + } + }) }) })
test: get mps via ref with limit
diff --git a/flask_exceptions/__init__.py b/flask_exceptions/__init__.py index <HASH>..<HASH> 100644 --- a/flask_exceptions/__init__.py +++ b/flask_exceptions/__init__.py @@ -2,5 +2,6 @@ Import items here that are necessary to make imports cleaner when using app. """ +# pylint: disable=wildcard-import from . import extension # noqa -from .extension import AddExceptions, APIException # noqa +from .extension import * # noqa
:house: Modified package imports To allow easy access to Exception classes.
diff --git a/plugins/CorePluginsAdmin/angularjs/field/field.directive.js b/plugins/CorePluginsAdmin/angularjs/field/field.directive.js index <HASH>..<HASH> 100644 --- a/plugins/CorePluginsAdmin/angularjs/field/field.directive.js +++ b/plugins/CorePluginsAdmin/angularjs/field/field.directive.js @@ -134,6 +134,14 @@ } }); + if ('undefined' !== typeof $scope.placeholder && $scope.placeholder !== null) { + $scope.$watch('placeholder', function (val, oldVal) { + if (val !== oldVal) { + $scope.field.uiControlAttributes.placeholder = val; + } + }); + } + $scope.$watch('disabled', function (val, oldVal) { if (val !== oldVal) { $scope.field.uiControlAttributes.disabled = val;
when placeholder is changed, show the updated text
diff --git a/src/Builder/BuilderAbstract.php b/src/Builder/BuilderAbstract.php index <HASH>..<HASH> 100644 --- a/src/Builder/BuilderAbstract.php +++ b/src/Builder/BuilderAbstract.php @@ -6,13 +6,18 @@ abstract class BuilderAbstract implements BuilderInterface { /** - * Description. + * Build the command string to be executed. * - * @return + * @return string */ abstract public function build($args); + /** + * Wraps a string in double quotes. + * + * @return string + */ public function quotify($text) { return '"' . $text . '"'; diff --git a/src/Builder/BuilderInterface.php b/src/Builder/BuilderInterface.php index <HASH>..<HASH> 100644 --- a/src/Builder/BuilderInterface.php +++ b/src/Builder/BuilderInterface.php @@ -5,9 +5,9 @@ namespace BryanCrowe\Growl\Builder; interface BuilderInterface { /** - * Description. + * Build the command string to be executed. * - * @return + * @return string */ public function build($args); }
Add docblocks to BuilderAbstract and BuilderInterface
diff --git a/src/Youtube.php b/src/Youtube.php index <HASH>..<HASH> 100644 --- a/src/Youtube.php +++ b/src/Youtube.php @@ -4,6 +4,7 @@ namespace Mrofi\VideoInfo; use DateInterval; use GuzzleHttp\Client; +use GuzzleHttp\Exception\TransferException; use Mrofi\VideoInfo\VideoInfoInterface as VideoContract; class Youtube extends AbstractInfo implements VideoContract @@ -30,7 +31,7 @@ class Youtube extends AbstractInfo implements VideoContract $this->attributes = $obj->items[0]->contentDetails; $this->attributes->id = $id; } - } catch (GuzzleHttp\Exception\TransferException $e) { + } catch (TransferException $e) { // } }
typo (again) :-(
diff --git a/tocncx.py b/tocncx.py index <HASH>..<HASH> 100644 --- a/tocncx.py +++ b/tocncx.py @@ -77,6 +77,6 @@ def generateTOC(fm): navlist = doc.createElement('navList') root.appendChild(navlist) - outdoc = open('{0}/toc.ncx'.format(utils.OUT_DIR),'w') + outdoc = open('{0}/OPS/toc.ncx'.format(utils.OUT_DIR),'w') outdoc.write(doc.toprettyxml(encoding = 'UTF-8')) outdoc.close() \ No newline at end of file
Quick fix to place toc.ncx in the right location
diff --git a/resources/lang/th-TH/forms.php b/resources/lang/th-TH/forms.php index <HASH>..<HASH> 100644 --- a/resources/lang/th-TH/forms.php +++ b/resources/lang/th-TH/forms.php @@ -153,15 +153,15 @@ return [ 'display-graphs' => 'แสดงกราฟในหน้าสถานะหรือไม่', 'about-this-page' => 'เกี่ยวกับหน้านี้', 'days-of-incidents' => 'แสดงวันที่มีเหตุการณ์เกิดขึ้นกี่วัน?', - 'time_before_refresh' => 'Status page refresh rate (in seconds).', + 'time_before_refresh' => 'Status page refresh rate (in seconds)', 'banner' => 'ภาพแบนเนอร์', - 'banner-help' => 'ขอแนะนำให้อัปโหลดไฟล์ที่ความกว้างไม่เกิน 930px', + 'banner-help' => "It's recommended that you upload files no bigger than 930px wide", 'subscribers' => 'เปิดให้ทุกคนสามารถลงทะเบียนรับอีเมลแจ้งเตือน?', 'suppress_notifications_in_maintenance' => 'Suppress notifications when incident occurs during maintenance period?', 'skip_subscriber_verification' => 'ข้ามการยืนยันตันตนผู้ใช้ (ระวัง! คุณอาจถูกสแปม)', 'automatic_localization' => 'เปลี่ยนภาษาของหน้าสถานะตามภาษาของผู้เข้าชมอัตโนมัติ', 'enable_external_dependencies' => 'เปิดใช้งาน Third Party (Google Fonts, Trackers, ฯลฯ...)', - 'show_timezone' => 'แสดงเขตเวลาที่หน้าสถานะกำลังใช้', + 'show_timezone' => 'Show the timezone the status page is running in', 'only_disrupted_days' => 'แสดงเฉพาะวันที่มีเหตุการณ์บนไทม์ไลน์?', ], 'analytics' => [
New translations forms.php (Thai)
diff --git a/src/Normalizer/Normalizer.php b/src/Normalizer/Normalizer.php index <HASH>..<HASH> 100644 --- a/src/Normalizer/Normalizer.php +++ b/src/Normalizer/Normalizer.php @@ -131,11 +131,11 @@ final class Normalizer implements NormalizerInterface ): array { $data = []; foreach ($normalizationFieldMappings as $normalizationFieldMapping) { - if (!$this->isCompliant($context, $normalizationFieldMapping, $object)) { + if (true !== $this->isCompliant($context, $normalizationFieldMapping, $object)) { continue; } - if (!$this->isWithinGroup($context, $normalizationFieldMapping)) { + if (true !== $this->isWithinGroup($context, $normalizationFieldMapping)) { continue; } @@ -169,11 +169,11 @@ final class Normalizer implements NormalizerInterface ): array { $links = []; foreach ($normalizationLinkMappings as $normalizationLinkMapping) { - if (!$this->isCompliant($context, $normalizationLinkMapping, $object)) { + if (true !== $this->isCompliant($context, $normalizationLinkMapping, $object)) { continue; } - if (!$this->isWithinGroup($context, $normalizationLinkMapping)) { + if (true !== $this->isWithinGroup($context, $normalizationLinkMapping)) { continue; }
chore: make some bool comparisons more explicit
diff --git a/course/tests/courselib_test.php b/course/tests/courselib_test.php index <HASH>..<HASH> 100644 --- a/course/tests/courselib_test.php +++ b/course/tests/courselib_test.php @@ -863,7 +863,7 @@ class core_course_courselib_testcase extends advanced_testcase { // Test move the marked section down.. move_section_to($course, 2, 4); - // Verify that the coruse marker has been moved along with the section.. + // Verify that the course marker has been moved along with the section.. $course = $DB->get_record('course', array('id' => $course->id)); $this->assertEquals(4, $course->marker);
MDL-<I> course: fix typo on courselib test
diff --git a/tests/unit/io/test_libevreactor.py b/tests/unit/io/test_libevreactor.py index <HASH>..<HASH> 100644 --- a/tests/unit/io/test_libevreactor.py +++ b/tests/unit/io/test_libevreactor.py @@ -20,7 +20,7 @@ except ImportError, exc: raise unittest.SkipTest('libev does not appear to be installed correctly: %s' % (exc,)) @patch('socket.socket') -@patch('cassandra.io.libevwrapper.Io') +@patch('cassandra.io.libevwrapper.IO') @patch('cassandra.io.libevreactor._start_loop') class LibevConnectionTest(unittest.TestCase):
Fix libevreactor unit test mock patching
diff --git a/pyam_analysis/core.py b/pyam_analysis/core.py index <HASH>..<HASH> 100644 --- a/pyam_analysis/core.py +++ b/pyam_analysis/core.py @@ -192,10 +192,6 @@ class IamDataFrame(object): df = df.append(self.check(var, check, filters, ret_true=False)) if len(df): - if exclude: - idx = return_index(df, ['model', 'scenario']) - self.cat.loc[idx, 'category'] = 'exclude' - n = str(len(df)) print(n + " scenarios do not satisfy the criteria") if display == 'heatmap':
excluding 'exclude' scenarios from validation is included by default in 'select()'
diff --git a/test/helpers/cilium.go b/test/helpers/cilium.go index <HASH>..<HASH> 100644 --- a/test/helpers/cilium.go +++ b/test/helpers/cilium.go @@ -800,13 +800,13 @@ func (s *SSHMeta) RestartCilium() error { // AddIPToLoopbackDevice adds the specified IP (assumed to be in form <ip>/<mask>) // to the loopback device on s. func (s *SSHMeta) AddIPToLoopbackDevice(ip string) *CmdRes { - return s.Exec(fmt.Sprintf("sudo ip addr add dev lo %s", ip)) + return s.ExecWithSudo(fmt.Sprintf("ip addr add dev lo %s", ip)) } // RemoveIPFromLoopbackDevice removes the specified IP (assumed to be in form <ip>/<mask>) // from the loopback device on s. func (s *SSHMeta) RemoveIPFromLoopbackDevice(ip string) *CmdRes { - return s.Exec(fmt.Sprintf("sudo ip addr del dev lo %s", ip)) + return s.ExecWithSudo(fmt.Sprintf("ip addr del dev lo %s", ip)) } // FlushGlobalConntrackTable flushes the global connection tracking table.
test/helpers: change `ip addr` commands to use `ExecWithSudo`
diff --git a/firefox/src/java/com/googlecode/webdriver/firefox/FirefoxProfile.java b/firefox/src/java/com/googlecode/webdriver/firefox/FirefoxProfile.java index <HASH>..<HASH> 100644 --- a/firefox/src/java/com/googlecode/webdriver/firefox/FirefoxProfile.java +++ b/firefox/src/java/com/googlecode/webdriver/firefox/FirefoxProfile.java @@ -130,6 +130,10 @@ public class FirefoxProfile { return extensionsDir; } + public void addAdditionalPreference(String key, String value) { + this.additionalPrefs.put(key, value); + } + public void addAdditionalPreferences(Map<String, String> additionalPrefs) { this.additionalPrefs.putAll(additionalPrefs); }
SimonStewart: It's now possible to add a single additional preference to the firefox driver r<I>
diff --git a/prepublish.js b/prepublish.js index <HASH>..<HASH> 100644 --- a/prepublish.js +++ b/prepublish.js @@ -44,7 +44,11 @@ ast.body.forEach(function (node) { } }); -fs.writeFileSync(__dirname + '/lib/dependencies.js', 'module.exports = ' + JSON.stringify(dependencies)); +Object.keys(dependencies).forEach(function (fn) { + dependencies[fn] = dependencies[fn].sort(); +}); + +fs.writeFileSync(__dirname + '/lib/dependencies.js', 'module.exports = ' + JSON.stringify(dependencies, null, 2) + '\n'); var pkg = JSON.parse(fs.readFileSync(__dirname + '/package.json', 'utf8')); pkg.files = files.sort(); -fs.writeFileSync(__dirname + '/package.json', JSON.stringify(pkg, null, ' ')); +fs.writeFileSync(__dirname + '/package.json', JSON.stringify(pkg, null, 2) + '\n');
prepublish: Pretty print generated JSON files
diff --git a/bolt/onboarding.go b/bolt/onboarding.go index <HASH>..<HASH> 100644 --- a/bolt/onboarding.go +++ b/bolt/onboarding.go @@ -117,11 +117,15 @@ func (c *Client) Generate(ctx context.Context, req *platform.OnboardingRequest) if err = c.CreateBucket(ctx, bucket); err != nil { return nil, err } + + perms := platform.OperPermissions() + perms = append(perms, platform.OrgAdminPermissions(o.ID)...) + auth := &platform.Authorization{ UserID: u.ID, Description: fmt.Sprintf("%s's Token", u.Name), OrgID: o.ID, - Permissions: platform.OperPermissions(), + Permissions: perms, } if err = c.CreateAuthorization(ctx, auth); err != nil { return nil, err
fix(bolt): grand first user org admin privileges during onboarding
diff --git a/src/main/java/org/jdbdt/QueryBuilder.java b/src/main/java/org/jdbdt/QueryBuilder.java index <HASH>..<HASH> 100644 --- a/src/main/java/org/jdbdt/QueryBuilder.java +++ b/src/main/java/org/jdbdt/QueryBuilder.java @@ -14,7 +14,7 @@ public final class QueryBuilder { /** * Clauses/parameters that may be set for a builder. */ - enum Param { + private enum Param { /** Columns (mandatory). */ COLUMNS { @Override
QueryBuilder: Param enum can be private
diff --git a/src/Illuminate/Console/Scheduling/Event.php b/src/Illuminate/Console/Scheduling/Event.php index <HASH>..<HASH> 100644 --- a/src/Illuminate/Console/Scheduling/Event.php +++ b/src/Illuminate/Console/Scheduling/Event.php @@ -354,8 +354,8 @@ class Event /** * Schedule the event to run twice daily. * - * @param string|null $first - * @param string|null $second + * @param string $first + * @param string $second * @return $this */ public function twiceDaily($first = '1:00', $second = '13:00')
Updated the PHPDoc block Updated the PHPDoc block
diff --git a/src/TwoFactorAuth/TwoFactorAuthHelper.php b/src/TwoFactorAuth/TwoFactorAuthHelper.php index <HASH>..<HASH> 100644 --- a/src/TwoFactorAuth/TwoFactorAuthHelper.php +++ b/src/TwoFactorAuth/TwoFactorAuthHelper.php @@ -408,11 +408,6 @@ class TwoFactorAuthHelper */ public function setCookie($response) { - if (!config('auth.auth_2fa_cookie_enable')) { - return false; - } - - if (!Cookie::has('successful_login')) { // what is the cookie's lifetime, in minutes
Tweak TwoFactorAuthHelper.php. #<I>
diff --git a/python_modules/dagster-graphql/dagster_graphql/implementation/execution.py b/python_modules/dagster-graphql/dagster_graphql/implementation/execution.py index <HASH>..<HASH> 100644 --- a/python_modules/dagster-graphql/dagster_graphql/implementation/execution.py +++ b/python_modules/dagster-graphql/dagster_graphql/implementation/execution.py @@ -265,11 +265,11 @@ def get_pipeline_run_observable(graphene_info, run_id, after=None): return Observable.create(_get_error_observable) # pylint: disable=E1101 - pipeline_def = get_pipeline_def_from_selector(graphene_info, run.selector) pipeline_ref = get_dauphin_pipeline_reference_from_selector(graphene_info, run.selector) execution_plan = None if isinstance(pipeline_ref, DauphinPipeline): + pipeline_def = get_pipeline_def_from_selector(graphene_info, run.selector) execution_plan = create_execution_plan( pipeline_def, run.environment_dict, RunConfig(mode=run.mode) )
fix viewing logs for a "live" UnknownPipeline Test Plan: load a run not in a terminal state for a pipeline not in scopea Reviewers: prha, nate, max Reviewed By: nate Differential Revision: <URL>
diff --git a/lib/core_tabs.js b/lib/core_tabs.js index <HASH>..<HASH> 100644 --- a/lib/core_tabs.js +++ b/lib/core_tabs.js @@ -688,6 +688,7 @@ var core_tabs = function(spec, my) { var tabs = []; Object.keys(my.tabs).forEach(function(id) { tabs.push({ + id: id, state: my.tabs[id].state, loading: my.tabs[id].loading });
Add tab ID to 'tabs_get' method response As discussed in issue #<I> this fix will add the tab ID to the response object when not specifying a tab.
diff --git a/book.js b/book.js index <HASH>..<HASH> 100644 --- a/book.js +++ b/book.js @@ -3,7 +3,7 @@ var pkg = require('./package.json') module.exports = { root: "./docs", title: "Botpress Official Documentation", - plugins: ["noembed", "sitemap", "expandable-chapters", "hints", "anchors"], + plugins: ["noembed", "sitemap", "expandable-chapters", "hints", "anchors", "robotstxt"], gitbook: ">= 3.0.0", variables: { version: pkg.version,
Added robots.txt
diff --git a/manage.py b/manage.py index <HASH>..<HASH> 100644 --- a/manage.py +++ b/manage.py @@ -197,7 +197,7 @@ def start_daemon(): # Get the waiting jobs (STATUS_WAITING) ordered by the age-in-minutes/priority DESC # Jobs with a priority of `1` will sort above equally-old jobs with a higher priority value # A job that is priority `2` will sort equal with a job half it's age - jobs_to_run = Job.query.filter(Job.status == STATUS_WAITING).order_by(Job.created_at.desc()) + jobs_to_run = Job.query.filter(Job.status == STATUS_WAITING).order_by(Job.created_at) for job in jobs_to_run[:MAX_RUNNING_JOBS]:
Queue running was in reverse order
diff --git a/lib/analytical.rb b/lib/analytical.rb index <HASH>..<HASH> 100644 --- a/lib/analytical.rb +++ b/lib/analytical.rb @@ -35,7 +35,8 @@ module Analytical def analytical @analytical ||= begin options = self.class.analytical_options.merge({ - :ssl => request.ssl? + :ssl => request.ssl?, + :controller => self, }) if options[:disable_if].call(self) options[:modules] = options[:development_modules]
Adding :controller to options, so modules can access the current controller if they need to
diff --git a/client/state/ui/editor/test/edit-save-flow.js b/client/state/ui/editor/test/edit-save-flow.js index <HASH>..<HASH> 100644 --- a/client/state/ui/editor/test/edit-save-flow.js +++ b/client/state/ui/editor/test/edit-save-flow.js @@ -15,6 +15,8 @@ import nock from 'nock'; */ import posts from 'state/posts/reducer'; import preferences from 'state/preferences/reducer'; +import sites from 'state/sites/reducer'; +import siteSettings from 'state/site-settings/reducer'; import { selectedSiteId } from 'state/ui/reducer'; import editor from 'state/ui/editor/reducer'; import { setSelectedSiteId } from 'state/ui/actions'; @@ -30,6 +32,8 @@ const GLOBAL_ID = '123-456'; const reducer = combineReducers( { posts, preferences, + sites, + siteSettings, ui: combineReducers( { selectedSiteId, editor,
Fix Post Editor unit tests (#<I>) Caused by changes introduced by #<I> (dependency on `getPodcastingCategoryId` selector). The tests in #<I> were authored before that PR was merged and it introduces new Redux dependencies: the test store needs also `sites` and `siteSettings` reducers now.
diff --git a/hydpy/core/parametertools.py b/hydpy/core/parametertools.py index <HASH>..<HASH> 100644 --- a/hydpy/core/parametertools.py +++ b/hydpy/core/parametertools.py @@ -360,15 +360,16 @@ class Parameter(objecttools.ValueMath): lines = [] if pub.options.reprcomments: if self.__doc__ is not None: - lines.append('# %s].' % self.__doc__.split(']')[0]) + comment = '%s].' % self.__doc__.split(']')[0] + lines.extend('# '+line.strip() for line in comment.split('\n')) else: lines.append('# Instance of parameter class `%s` defined in ' 'module `%s`.' % (objecttools.classname(self), self.__module__)) if self.TIME is not None: lines.append('# The actual value representation depends on ' - 'the actual parameter step size, which is `%s`.' - % self.parameterstep) + 'the actual parameter step size,') + lines.append('# which is `%s`.' % self.parameterstep) return lines def __str__(self):
Fix multi line comments of string representations of class "Parameter". Multiline class docstrings like class Test(Parameter): """line 1 and line2 [-]. """ resulted in class representations like # line 1 and line 2 [-]. test(?) which are not valid Python code. This has been corrected to # line 1 and # line 2 [-]. test(?)
diff --git a/semantic_release/__init__.py b/semantic_release/__init__.py index <HASH>..<HASH> 100644 --- a/semantic_release/__init__.py +++ b/semantic_release/__init__.py @@ -1,6 +1,6 @@ """Semantic Release """ -__version__ = "7.2.0" +__version__ = "7.2.1" from .errors import UnknownCommitMessageStyleError # noqa; noqa
<I> Automatically generated by python-semantic-release
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -166,7 +166,7 @@ def setupNupic(): "Topic :: Scientific/Engineering :: Artificial Intelligence" ], long_description = """\ -Numenta Platform for Intelligent Computing: a brain-inspired machine intelligence platform, and biologically accurate neural network based on cortical learning algorithms. +Numenta Platform for Intelligent Computing: a machine intelligence platform that implements the HTM learning algorithms. HTM is a detailed computational theory of the neocortex. At the core of HTM are time-based continuous learning algorithms that store and recall spatial and temporal patterns. NuPIC is suited to a variety of problems, particularly anomaly detection and prediction of streaming data sources. For more information, see http://numenta.org or the NuPIC wiki at https://github.com/numenta/nupic/wiki. """
Using text from numenta.com for description
diff --git a/pymatgen/symmetry/analyzer.py b/pymatgen/symmetry/analyzer.py index <HASH>..<HASH> 100644 --- a/pymatgen/symmetry/analyzer.py +++ b/pymatgen/symmetry/analyzer.py @@ -770,7 +770,6 @@ class SpacegroupAnalyzer: List of weights, in the SAME order as kpoints. """ kpts = np.array(kpoints) - print("KPOINTS ARE", kpts) shift = [] mesh = [] for i in range(3):
remove accidental print statement from symmetry.analyzer
diff --git a/libraries/ui-shared/index.js b/libraries/ui-shared/index.js index <HASH>..<HASH> 100644 --- a/libraries/ui-shared/index.js +++ b/libraries/ui-shared/index.js @@ -1,4 +1,4 @@ -export { default as Accordion } from './icons/Accordion'; +export { default as Accordion } from './Accordion'; export { default as ArrowIcon } from './icons/ArrowIcon'; export { default as BurgerIcon } from './icons/BurgerIcon'; export { default as CrossIcon } from './icons/CrossIcon';
PWA-<I> Corrected export path
diff --git a/lib/disney/disneylegacyapi.js b/lib/disney/disneylegacyapi.js index <HASH>..<HASH> 100644 --- a/lib/disney/disneylegacyapi.js +++ b/lib/disney/disneylegacyapi.js @@ -10,11 +10,6 @@ const Location = require('../location'); class DisneyLegacyPark extends DisneyAPIBase { constructor(options = {}) { - // stop the facility channel from being created - // the facility channel is the main bit missing from the non US Disney parks - // offline_facilities just stops the facility channel from starting up - options.offlineFacilities = options.offlineFacilities !== undefined ? options.offlineFacilities : true; - super(options); }
[!] Need the facility channel for the calendar data. Add back in!
diff --git a/spec/support/coverage_loader.rb b/spec/support/coverage_loader.rb index <HASH>..<HASH> 100644 --- a/spec/support/coverage_loader.rb +++ b/spec/support/coverage_loader.rb @@ -3,4 +3,4 @@ require 'simplecov-rcov' require 'coveralls' require 'coverage/kit' -Coverage::Kit.setup(minimum_coverage: 70.25) +Coverage::Kit.setup(minimum_coverage: 70.20)
TT-<I>: don't bump coverage as much
diff --git a/plaso/multi_processing/analysis_process.py b/plaso/multi_processing/analysis_process.py index <HASH>..<HASH> 100644 --- a/plaso/multi_processing/analysis_process.py +++ b/plaso/multi_processing/analysis_process.py @@ -79,6 +79,10 @@ class AnalysisProcess(base_process.MultiProcessBaseProcess): if self._memory_profiler: self._memory_profiler.Sample('main', used_memory) + # XML RPC does not support integer values > 2 GiB so we format them + # as a string. + used_memory = '{0:d}'.format(used_memory) + status = { 'display_name': '', 'identifier': self._name,
Changes to analysis process RPC support #<I> (#<I>)
diff --git a/openid/consumer/parse.py b/openid/consumer/parse.py index <HASH>..<HASH> 100644 --- a/openid/consumer/parse.py +++ b/openid/consumer/parse.py @@ -247,3 +247,26 @@ def findFirstHref(link_attrs_list, target_rel): return None first = matches[0] return first.get('href') + +class ParseError(ValueError): + """Exception for errors in parsing the HTML text for OpenID + settings""" + +def openIDDiscover(canonical_url, html_text): + """Parse OpenID settings out of the gived HTML text + + @raises: ParseError + # XXX: document interface + # XXX: TESTME + """ + link_attrs = parseLinkAttrs(html_text) + + server_url = findFirstHref(link_attrs, 'openid.server') + if server_url is None: + raise ParseError('No openid.server found') + + delegate_url = findFirstHref(link_attrs, 'openid.delegate') + if delegate_url is None: + delegate_url = canonical_url + + return canonical_url, delegate_url, server_url
[project @ Add implementation of OpenID settings parsing as an independent function]
diff --git a/script/upload.py b/script/upload.py index <HASH>..<HASH> 100755 --- a/script/upload.py +++ b/script/upload.py @@ -14,7 +14,7 @@ from lib.util import atom_gyp, execute, get_atom_shell_version, parse_version, \ from lib.github import GitHub -ATOM_SHELL_REPO = 'atom/electron' +ATOM_SHELL_REPO = 'electron/electron' ATOM_SHELL_VERSION = get_atom_shell_version() PROJECT_NAME = atom_gyp()['project_name%']
atom => electron in upload script
diff --git a/tests/transliterator.php b/tests/transliterator.php index <HASH>..<HASH> 100644 --- a/tests/transliterator.php +++ b/tests/transliterator.php @@ -222,6 +222,19 @@ $data = array( ), ), ), + array( + 'description' => 'hotfix #14', + 'cases' => array( + array( + 'input' => array('some words here'), + 'expected' => 'some words here', + ), + array( + 'input' => array('yahoo'), + 'expected' => 'yahoo', + ), + ), + ), ), 'toKana' => array( array(
Add unit test for issue #<I>
diff --git a/src/Medoo.php b/src/Medoo.php index <HASH>..<HASH> 100644 --- a/src/Medoo.php +++ b/src/Medoo.php @@ -1482,7 +1482,7 @@ class Medoo } } - public function aggregate($type, $table, $join = null, $column = null, $where = null) + private function aggregate($type, $table, $join = null, $column = null, $where = null) { $map = [];
[update] Make aggregate as private
diff --git a/SwatDB/SwatDB.php b/SwatDB/SwatDB.php index <HASH>..<HASH> 100644 --- a/SwatDB/SwatDB.php +++ b/SwatDB/SwatDB.php @@ -1044,11 +1044,18 @@ class SwatDB // }}} // {{{ private static function initFields() + /** + * Transforms an array of text field identifiers ('type:name') into + * an array of SwatDBField objects. + * + * The array is passed by reference and modified in-place. Nothing is + * returned by this method. + * + * @param array $fields a reference to the array of field identifiers to + * transform. + */ private function initFields(&$fields) { - /* Transforms an array of text field identifiers ('text:title') into - * an array of SwatDBField objects. - */ if (count($fields) == 0) // TODO: throw exception instead of returning return;
Update documentation. svn commit r<I>
diff --git a/src/main/java/org/asciidoctor/Asciidoctor.java b/src/main/java/org/asciidoctor/Asciidoctor.java index <HASH>..<HASH> 100644 --- a/src/main/java/org/asciidoctor/Asciidoctor.java +++ b/src/main/java/org/asciidoctor/Asciidoctor.java @@ -5,6 +5,7 @@ import java.io.IOException; import java.io.Reader; import java.io.Writer; import java.util.Collection; +import java.util.List; import java.util.Map; import org.asciidoctor.extension.JavaExtensionRegistry; @@ -399,6 +400,21 @@ public interface Asciidoctor { public static Asciidoctor create(String gemPath) { return JRubyAsciidoctor.create(gemPath); } + + /** + * Creates a new instance of Asciidoctor and sets loadPath to provided paths. This method is mostly used in OSGi + * environments. + * + * @param gemPath + * where gems are located. + * + * @return Asciidoctor instance which uses JRuby to wraps Asciidoctor + * Ruby calls. + */ + public static Asciidoctor create(List<String> loadPaths) { + return JRubyAsciidoctor.create(loadPaths); + } + }
Asciidoctor Factory can be used to create an instance of Asciidoctor setting gem path or load path
diff --git a/lib/overcommit/hook/base.rb b/lib/overcommit/hook/base.rb index <HASH>..<HASH> 100644 --- a/lib/overcommit/hook/base.rb +++ b/lib/overcommit/hook/base.rb @@ -111,6 +111,10 @@ module Overcommit::Hook Overcommit::Utils.execute(cmd) end + def execute_in_background(cmd) + Overcommit::Utils.execute_in_background(cmd) + end + def required_executable @config['required_executable'] end
Expose execute_in_background in hooks This was forgotten in f2c<I>ef. Add it. Change-Id: Iff<I>f1a6b<I>e<I>daba<I>ac6b1d3a Reviewed-on: <URL>
diff --git a/src/js/pannellum.js b/src/js/pannellum.js index <HASH>..<HASH> 100644 --- a/src/js/pannellum.js +++ b/src/js/pannellum.js @@ -1988,6 +1988,7 @@ function load() { */ function loadScene(sceneId, targetPitch, targetYaw, targetHfov, fadeDone) { loaded = false; + animatedMove = {}; // Set up fade if specified var fadeImg, workingPitch, workingYaw, workingHfov;
Clear move animation when changing scenes (fixes #<I>).
diff --git a/code/jobs/ScheduledExecutionJob.php b/code/jobs/ScheduledExecutionJob.php index <HASH>..<HASH> 100644 --- a/code/jobs/ScheduledExecutionJob.php +++ b/code/jobs/ScheduledExecutionJob.php @@ -11,7 +11,7 @@ class ScheduledExecutionJob extends AbstractQueuedJob { /** * @param DataObject $dataObject - * @param integer $timesExecuted + * @param int $timesExecuted */ public function __construct($dataObject = null, $timesExecuted = 0) { if ($dataObject) {
minor codestyle: Fixing integer to int in phpdoc block
diff --git a/action/find.go b/action/find.go index <HASH>..<HASH> 100644 --- a/action/find.go +++ b/action/find.go @@ -17,8 +17,9 @@ func (s *Action) Find(c *cli.Context) error { if err != nil { return err } + needle := strings.ToLower(c.Args().First()) for _, value := range l { - if strings.Contains(value, c.Args().First()) { + if strings.Contains(strings.ToLower(value), needle) { fmt.Println(value) } } diff --git a/tests/find_test.go b/tests/find_test.go index <HASH>..<HASH> 100644 --- a/tests/find_test.go +++ b/tests/find_test.go @@ -26,6 +26,10 @@ func TestFind(t *testing.T) { assert.NoError(t, err) assert.Equal(t, "foo/bar", out) + out, err = ts.run("find Bar") + assert.NoError(t, err) + assert.Equal(t, "foo/bar", out) + out, err = ts.run("find b") assert.NoError(t, err) assert.Equal(t, "baz\nfoo/bar", out)
Make find compare entries case insensitive Fixes #<I>
diff --git a/admin_site_config.php b/admin_site_config.php index <HASH>..<HASH> 100644 --- a/admin_site_config.php +++ b/admin_site_config.php @@ -44,7 +44,7 @@ case 'site': Site::setPreference('TIMEZONE', Filter::post('TIMEZONE')); FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success'); } - header('Location: ' + route('admin-control-panel')); + header('Location: ' . route('admin-control-panel')); return;
Should fix: #<I> - wrong addition operator
diff --git a/src/toil/lib/docker.py b/src/toil/lib/docker.py index <HASH>..<HASH> 100644 --- a/src/toil/lib/docker.py +++ b/src/toil/lib/docker.py @@ -160,7 +160,7 @@ def subprocessDockerCall(job, 'set -eo pipefail && {}'.format(' | '.join(chain_params))] else: call = baseDockerCall + [tool] + parameters - _logger.info("Calling docker with " + repr(call)) + logger.info("Calling docker with " + repr(call)) params = {} if outfile:
_logger -> logger.
diff --git a/guppi.py b/guppi.py index <HASH>..<HASH> 100644 --- a/guppi.py +++ b/guppi.py @@ -60,6 +60,7 @@ class GuppiRaw(object): def __init__(self, filename, n_blocks=None): self.filename = filename self.file_obj = open(filename, 'r') + self.filesize = os.path.getsize(filename) if not n_blocks: self.n_blocks = self.find_n_data_blocks() @@ -88,13 +89,20 @@ class GuppiRaw(object): start_idx = self.file_obj.tell() key, val = '', '' + header_dict = {} + keep_reading = True + + first_line = self.file_obj + + try: - header_dict = {} - keep_reading = True while keep_reading: + if start_idx + 80 > self.filesize: + keep_reading = False + raise EndOfFileError line = self.file_obj.read(80) #print line - if 'END ' in line: + if line.startswith('END'): keep_reading = False break else: @@ -113,7 +121,8 @@ class GuppiRaw(object): header_dict[key] = val except ValueError: - raise EndOfFileError + print line, start_idx, self.filesize + raise data_idx = self.file_obj.tell()
Updated file read logic for better compatibility
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/WellKnownMutability.java b/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/WellKnownMutability.java index <HASH>..<HASH> 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/WellKnownMutability.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/WellKnownMutability.java @@ -160,6 +160,7 @@ public final class WellKnownMutability implements ThreadSafety.KnownTypes { .add(com.google.common.graph.ImmutableGraph.class, "N") .add(com.google.common.graph.ImmutableNetwork.class, "N", "E") .add(com.google.common.graph.ImmutableValueGraph.class, "N", "V") + .add("com.google.common.hash.AbstractHashFunction") // package-private .add(com.google.common.hash.HashCode.class) .add(com.google.common.io.BaseEncoding.class) .add(com.google.common.net.MediaType.class)
Mark AbstractHashFunction as a well-known Immutable type. RELNOTES: N/A ------------- Created by MOE: <URL>
diff --git a/lib/gds_api/json_client.rb b/lib/gds_api/json_client.rb index <HASH>..<HASH> 100644 --- a/lib/gds_api/json_client.rb +++ b/lib/gds_api/json_client.rb @@ -88,7 +88,7 @@ module GdsApi end def delete_json!(url, params = nil, additional_headers = {}) - do_request(:delete, url, params, additional_headers) + do_json_request(:delete, url, params, additional_headers) end def post_multipart(url, params)
Fix delete_json to actually call do_json_request. This makes it consistent with put_json, post_json, and is the expected behaviour given the method name.
diff --git a/lib/tessel/deploy.js b/lib/tessel/deploy.js index <HASH>..<HASH> 100644 --- a/lib/tessel/deploy.js +++ b/lib/tessel/deploy.js @@ -69,10 +69,13 @@ Tessel.prototype.deployScript = function(opts, push) { self.connection.end(); }); streams.stdin.on('data', function(data) { - console.log(data.toString()); + process.stdout.write(data); }); streams.stderr.on('data', function(data) { - console.log("Err: ", data.toString()); + process.stderr.write(data); + }); + + process.on('SIGINT', function () { streams.stdout.signal('KILL'); self.connection.end(); });
Supports full stdout/stderr. Kills conn on CTRL+C.
diff --git a/cmd/gateway-main.go b/cmd/gateway-main.go index <HASH>..<HASH> 100644 --- a/cmd/gateway-main.go +++ b/cmd/gateway-main.go @@ -38,6 +38,7 @@ FLAGS: {{end}}{{end}} BACKEND: azure: Microsoft Azure Blob Storage. Default ENDPOINT is https://core.windows.net + s3: Amazon Simple Storage Service (S3). ENVIRONMENT VARIABLES: ACCESS: @@ -49,6 +50,16 @@ EXAMPLES: $ export MINIO_ACCESS_KEY=azureaccountname $ export MINIO_SECRET_KEY=azureaccountkey $ {{.HelpName}} azure + + 2. Start minio gateway server for S3 backend. + $ export MINIO_ACCESS_KEY=accesskey + $ export MINIO_SECRET_KEY=secretkey + $ {{.HelpName}} s3 + + 3. Start minio gateway server for S3 backend on custom endpoint. + $ export MINIO_ACCESS_KEY=Q3AM3UQ867SPQQA43P2F + $ export MINIO_SECRET_KEY=zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG + $ {{.HelpName}} s3 https://play.minio.io:9000 ` var gatewayCmd = cli.Command{
Add s3 backend to help, fixes #<I> (#<I>) * Add s3 backend to help, fixes #<I> * Add samples for Gateway usage with S3
diff --git a/src/bosh-director/spec/unit/worker_spec.rb b/src/bosh-director/spec/unit/worker_spec.rb index <HASH>..<HASH> 100644 --- a/src/bosh-director/spec/unit/worker_spec.rb +++ b/src/bosh-director/spec/unit/worker_spec.rb @@ -86,7 +86,11 @@ module Bosh::Director it 'raises error if migrations are never current' do allow(migrator).to receive(:current?).exactly(Worker::MAX_MIGRATION_ATTEMPTS).times.and_return(false) + logger = double(Logging::Logger) + allow(config).to receive(:worker_logger).and_return(logger.tap { |l| allow(l).to receive(:error) }) allow(djworker).to receive(:start) + + expect(logger).to receive(:error).with(/Migrations not current during worker start after #{Worker::MAX_MIGRATION_ATTEMPTS} attempts./) expect { worker.prep }.to raise_error(/Migrations not current after #{Worker::MAX_MIGRATION_ATTEMPTS} retries/) expect(djworker).not_to have_received(:start) end
Capture error log in test vs printing to console for worker [#<I>](<URL>)
diff --git a/switch/core.js b/switch/core.js index <HASH>..<HASH> 100644 --- a/switch/core.js +++ b/switch/core.js @@ -116,24 +116,24 @@ Switch = new Class({ bind('init', self); // initialization queue for dynamicly loading plugins - self._initializer = new ASQueue.Converter(self, [{ - name: 'plugin', + self._initializer = new ASQueue.Converter([{ + method: 'plugin', auto: false, // after initialization, registering new plugin is forbidden before: 'init' }, { - name: 'init', + method: 'init', // method init should be executed only once - once: true + once: true }, 'switchTo', 'prev', 'next' - ]).on(); + ], self).on(); // processing queue for switch life cycle - self._lifeCycle = new ASQueue.Runner(self, self._lifeCycle); + self._lifeCycle = new ASQueue.Runner(self._lifeCycle, self); }, // @private
change switch/core according to the API alternation of ASQueue
diff --git a/chevron/renderer.py b/chevron/renderer.py index <HASH>..<HASH> 100644 --- a/chevron/renderer.py +++ b/chevron/renderer.py @@ -1,4 +1,3 @@ -#!/usr/bin/python # -*- coding: utf-8 -*- try: diff --git a/chevron/tokenizer.py b/chevron/tokenizer.py index <HASH>..<HASH> 100644 --- a/chevron/tokenizer.py +++ b/chevron/tokenizer.py @@ -1,5 +1,3 @@ -#!/usr/bin/python - # Globals _CURRENT_LINE = 1 _LAST_TAG_LINE = None
Remove shebang from renderer and tokenizer These files are not intended to be run by themselves anyways
diff --git a/core-bundle/src/Resources/contao/modules/Module.php b/core-bundle/src/Resources/contao/modules/Module.php index <HASH>..<HASH> 100644 --- a/core-bundle/src/Resources/contao/modules/Module.php +++ b/core-bundle/src/Resources/contao/modules/Module.php @@ -203,6 +203,7 @@ abstract class Module extends \Frontend $objTemplate = new \FrontendTemplate($this->navigationTpl); $objTemplate->type = get_class($this); + $objTemplate->cssID = $this->cssID; // see #4897 $objTemplate->level = 'level_' . $level++; // Get page object
[Core] Pass the CSS ID of the navigation module to the partial (see #<I>)
diff --git a/vcstool/clients/svn.py b/vcstool/clients/svn.py index <HASH>..<HASH> 100644 --- a/vcstool/clients/svn.py +++ b/vcstool/clients/svn.py @@ -125,7 +125,7 @@ class SvnClient(VcsClientBase): url = command.url if command.version: - url += '@%d' % command.version + url += '@%s' % command.version cmd_checkout = [ SvnClient._executable, '--non-interactive', 'checkout', url, '.']
fix usage of version with svn import (#<I>)
diff --git a/test/test.js b/test/test.js index <HASH>..<HASH> 100644 --- a/test/test.js +++ b/test/test.js @@ -1120,27 +1120,27 @@ describe('TeslaJS', function () { }); }); - describe('#startStreaming()', function () { - it('should succeed', function (done) { - tjs.startStreaming(options, - function (err, response, body) { - if (response) { - done(); - } else { - done(err); - } - }, - function(data) { - // do nothing! - } - ); - }); - - it('should succeed with no callback', function (done) { - tjs.startStreaming(options); - done(); - }); - }); + // describe('#startStreaming()', function () { + // it('should succeed', function (done) { + // tjs.startStreaming(options, + // function (err, response, body) { + // if (response) { + // done(); + // } else { + // done(err); + // } + // }, + // function(data) { + // // do nothing! + // } + // ); + // }); + + // it('should succeed with no callback', function (done) { + // tjs.startStreaming(options); + // done(); + // }); + // }); describe('#scheduleSoftwareUpdate()', function () { it('should succeed', function (done) {
removed streaming tests for now #<I>
diff --git a/plugins/rest/rest.go b/plugins/rest/rest.go index <HASH>..<HASH> 100644 --- a/plugins/rest/rest.go +++ b/plugins/rest/rest.go @@ -151,5 +151,17 @@ func (c Client) Do(ctx context.Context, method, path string) (*http.Response, er "headers": req.Header, }).Debug("Sending request.") - return c.Client.Do(req) + resp, err := c.Client.Do(req) + if resp != nil { + // Only log for debug purposes. If an error occurred, the caller should handle + // that. In the non-error case, the caller may not do anything. + logrus.WithFields(logrus.Fields{ + "method": method, + "url": url, + "status": resp.Status, + "headers": resp.Header, + }).Debug("Received response.") + } + + return resp, err }
Add response debug logging to REST client
diff --git a/lib/gcli/commands/help.js b/lib/gcli/commands/help.js index <HASH>..<HASH> 100644 --- a/lib/gcli/commands/help.js +++ b/lib/gcli/commands/help.js @@ -51,16 +51,16 @@ function getHelpManData(commandData, context) { }.bind(this)); }, getSynopsis: function(param) { - var short = param.short ? '|-' + param.short : ''; - if (param.isPositionalAllowed) { + var name = param.name + (param.short ? '|-' + param.short : ''); + if (param.option == null) { return param.defaultValue !== undefined ? - '[' + param.name + short + ']' : - '<' + param.name + short + '>'; + '[' + name + ']' : + '<' + name + '>'; } else { - return param.type.name === 'boolean' ? - '[--' + param.name + short + ']' : - '[--' + param.name + short + ' ...]'; + return param.type === 'boolean' || param.type.name === 'boolean' ? + '[--' + name + ']' : + '[--' + name + ' ...]'; } }, command: commandData.command,
refactor-<I>: Simplify how we create param name in help A small simplification to create the name at the top rather than in 2 parts which we concatenate later.
diff --git a/azurerm/internal/services/frontdoor/tests/front_door_resource_test.go b/azurerm/internal/services/frontdoor/tests/front_door_resource_test.go index <HASH>..<HASH> 100644 --- a/azurerm/internal/services/frontdoor/tests/front_door_resource_test.go +++ b/azurerm/internal/services/frontdoor/tests/front_door_resource_test.go @@ -267,7 +267,7 @@ func testCheckAzureRMFrontDoorDestroy(s *terraform.State) error { ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext for _, rs := range s.RootModule().Resources { - if rs.Type != "azurerm_front_door" { + if rs.Type != "azurerm_frontdoor" { continue }
r/frontdoor: fixing an issue where the checkdestroy function was checking the wrong resource name
diff --git a/exchange/bitswap/bitswap.go b/exchange/bitswap/bitswap.go index <HASH>..<HASH> 100644 --- a/exchange/bitswap/bitswap.go +++ b/exchange/bitswap/bitswap.go @@ -24,13 +24,17 @@ import ( var log = eventlog.Logger("bitswap") -// Number of providers to request for sending a wantlist to -// TODO: if a 'non-nice' strategy is implemented, consider increasing this value -const maxProvidersPerRequest = 3 +const ( + // Number of providers to request for sending a wantlist to + // TODO: if a 'non-nice' strategy is implemented, consider increasing this value + maxProvidersPerRequest = 3 + providerRequestTimeout = time.Second * 10 + hasBlockTimeout = time.Second * 15 +) -var providerRequestTimeout = time.Second * 10 -var hasBlockTimeout = time.Second * 15 -var rebroadcastDelay = time.Second * 10 +var ( + rebroadcastDelay = time.Second * 10 +) // New initializes a BitSwap instance that communicates over the provided // BitSwapNetwork. This function registers the returned instance as the network
style constify variables good to const until it's required for them to be variable. TODO pass them in as configuration options
diff --git a/cicoclient/wrapper.py b/cicoclient/wrapper.py index <HASH>..<HASH> 100644 --- a/cicoclient/wrapper.py +++ b/cicoclient/wrapper.py @@ -97,7 +97,7 @@ class CicoWrapper(client.CicoClient): real_self_inventory = dict() for host in self_inventory: - real_self_inventory[host[0]] = self.full_inventory[host[0]] + real_self_inventory[host[1]] = self.full_inventory[host[1]] self._self_inventory = real_self_inventory
fix bug in self_inventory
diff --git a/tests/test_fixtures.py b/tests/test_fixtures.py index <HASH>..<HASH> 100644 --- a/tests/test_fixtures.py +++ b/tests/test_fixtures.py @@ -21,9 +21,28 @@ class TestFoo(unittest.TestCase, FixturesMixin): # Your tests go here + def setUp(self): + # Make sure that the user defined setUp method runs after the fixtures + # setup function (i.e., the database should be setup already) + assert Author.query.count() == 1 + assert Book.query.count() == 3 + + # Add another author on the fly + author = Author() + author.first_name = 'George' + author.last_name = 'Orwell' + self.db.session.add(author) + self.db.session.commit() + + def tearDown(self): + # This should run before the fixtures tear down function, so the + # database should still contain all the fixtures data + assert Author.query.count() == 2 + assert Book.query.count() == 3 + def test_authors(self): authors = Author.query.all() - assert len(authors) == Author.query.count() == 1 + assert len(authors) == Author.query.count() == 2 assert len(authors[0].books) == 3 def test_books(self):
Modified the tests to make sure that setup and tear down functions work properly
diff --git a/app/form_builders/monologue_admin_form_builder.rb b/app/form_builders/monologue_admin_form_builder.rb index <HASH>..<HASH> 100644 --- a/app/form_builders/monologue_admin_form_builder.rb +++ b/app/form_builders/monologue_admin_form_builder.rb @@ -29,7 +29,7 @@ class MonologueAdminFormBuilder < ActionView::Helpers::FormBuilder end def submit(*args) - content_tag :div, class: "actions" do + content_tag :div, class: "form-actions" do super end end
Making the layout consistent throughout -- using the twitter-bootstrap class.
diff --git a/src/pixi/renderers/canvas/CanvasRenderer.js b/src/pixi/renderers/canvas/CanvasRenderer.js index <HASH>..<HASH> 100644 --- a/src/pixi/renderers/canvas/CanvasRenderer.js +++ b/src/pixi/renderers/canvas/CanvasRenderer.js @@ -23,7 +23,7 @@ PIXI.CanvasRenderer = function(width, height, options) { for (var i in PIXI.defaultRenderOptions) { - options[i] = options[i] || PIXI.defaultRenderOptions[i]; + if (!(i in options)) options[i] = PIXI.defaultRenderOptions[i]; } } else
Fix for overwriting falsy values.. or even (possibly) undefined ones.
diff --git a/ruby_event_store/lib/ruby_event_store/client.rb b/ruby_event_store/lib/ruby_event_store/client.rb index <HASH>..<HASH> 100644 --- a/ruby_event_store/lib/ruby_event_store/client.rb +++ b/ruby_event_store/lib/ruby_event_store/client.rb @@ -17,6 +17,12 @@ module RubyEventStore end + # Persists events and notifies subscribed handlers about them + # + # @param events [Array<Event, Proto>, Event, Proto] event(s) + # @param stream_name [String] name of the stream for persisting events. + # @param expected_version [:any, :auto, :none, Integer] controls optimistic locking strategy. {http://railseventstore.org/docs/expected_version/ Read more} + # @return [:ok] def publish(events, stream_name: GLOBAL_STREAM, expected_version: :any) enriched_events = enrich_events_metadata(events) serialized_events = serialize_events(enriched_events)
Document #publish Issue: #<I> [ci skip]
diff --git a/lib/sof/writer.rb b/lib/sof/writer.rb index <HASH>..<HASH> 100644 --- a/lib/sof/writer.rb +++ b/lib/sof/writer.rb @@ -42,6 +42,7 @@ module Sof end immediate , extended = atts.partition {|a,val| val.is_a?(SimpleNode) } head += immediate.collect {|a,val| "#{a.to_sof()} => #{val.data}"}.join(", ") + ")" + return SimpleNode.new(head) if( ref.nil? and extended.empty? and head.length < 30 ) node = ObjectNode.new(head , ref) extended.each do |a , val| node.add( to_sof_node(a,level + 1) , val )
made a simple node for small objects. bad news is that tests pass unchanged
diff --git a/Auth/OpenID/DiffieHellman.php b/Auth/OpenID/DiffieHellman.php index <HASH>..<HASH> 100644 --- a/Auth/OpenID/DiffieHellman.php +++ b/Auth/OpenID/DiffieHellman.php @@ -61,15 +61,6 @@ class Auth_OpenID_DiffieHellman { $this->lib =& Auth_OpenID_getMathLib(); - if (!$this->lib) { - // This should NEVER occur because even if no math - // extensions can be found, we should get an instance of - // Auth_OpenID_MathWrapper, but if there's a bug in - // Auth_OpenID_getMathLib, it might. - trigger_error("Big integer fallback implementation unavailable.", - E_USER_ERROR); - } - if ($mod === null) { $this->mod = $this->lib->init($_Auth_OpenID_DEFAULT_MOD); } else { @@ -82,10 +73,12 @@ class Auth_OpenID_DiffieHellman { $this->gen = $gen; } - $this->private = - ($private === null) ? - Auth_OpenID_CryptUtil::randrange(1, $this->mod) : - $private; + if ($private === null) { + $r = Auth_OpenID_CryptUtil::randrange($this->mod); + $this->private = $this->lib->add($r, 1); + } else { + $this->private = $private; + } $this->public = $this->lib->powmod($this->gen, $this->private, $this->mod);
[project @ Remove unnecessary code from DiffieHellman.php]
diff --git a/lib/ohai/plugins/chef.rb b/lib/ohai/plugins/chef.rb index <HASH>..<HASH> 100644 --- a/lib/ohai/plugins/chef.rb +++ b/lib/ohai/plugins/chef.rb @@ -33,7 +33,7 @@ Ohai.plugin(:Chef) do begin require "chef/version" require "chef-config/config" unless defined?(ChefConfig::Config) - rescue Gem::LoadError + rescue LoadError logger.trace("Plugin Chef: Unable to load the chef gem to determine the version") # this catches when you've done a major version bump of ohai, but # your chef gem is incompatible, so we can't load it in the same VM
Fix the exception handling in the chef plugin This wasn't actually rescuing.
diff --git a/py/nupic/research/flat_spatial_pooler.py b/py/nupic/research/flat_spatial_pooler.py index <HASH>..<HASH> 100644 --- a/py/nupic/research/flat_spatial_pooler.py +++ b/py/nupic/research/flat_spatial_pooler.py @@ -109,7 +109,9 @@ class FlatSpatialPooler(SpatialPooler): # set of columns to be 'hungry' for learning self._boostFactors *= maxFiringBoost - + # This constructor is a minimal, stripped down version of the + # constructure above. The constructor above is only used to + # provid backwards compatibility to the old spatial pooler. # def __init__(self, # numInputs, # numColumns,
added comments to flat spatial pooler constructor
diff --git a/src/Leaves/CrudLeaf.php b/src/Leaves/CrudLeaf.php index <HASH>..<HASH> 100644 --- a/src/Leaves/CrudLeaf.php +++ b/src/Leaves/CrudLeaf.php @@ -25,7 +25,7 @@ abstract class CrudLeaf extends ModelBoundLeaf protected function saveRestModel() { $this->model->restModel->save(); - + return $this->model->restModel; } @@ -48,24 +48,30 @@ abstract class CrudLeaf extends ModelBoundLeaf protected function createModel() { - $model = new CrudModel(); - $model->savePressedEvent->attachHandler( + return new CrudModel(); + + } + + protected function onModelCreated() + { + parent::onModelCreated(); + + $this->model->savePressedEvent->attachHandler( function () { $this->save(); } ); - $model->cancelPressedEvent->attachHandler( + $this->model->cancelPressedEvent->attachHandler( function () { $this->cancel(); } ); - $model->deletePressedEvent->attachHandler( + $this->model->deletePressedEvent->attachHandler( function () { $this->delete(); } ); - return $model; } } \ No newline at end of file
small refactor of crudleaf as agreed with AC
diff --git a/xwiki-rendering-syntaxes/xwiki-rendering-syntax-event/src/main/java/org/xwiki/rendering/internal/renderer/event/EventsChainingRenderer.java b/xwiki-rendering-syntaxes/xwiki-rendering-syntax-event/src/main/java/org/xwiki/rendering/internal/renderer/event/EventsChainingRenderer.java index <HASH>..<HASH> 100644 --- a/xwiki-rendering-syntaxes/xwiki-rendering-syntax-event/src/main/java/org/xwiki/rendering/internal/renderer/event/EventsChainingRenderer.java +++ b/xwiki-rendering-syntaxes/xwiki-rendering-syntax-event/src/main/java/org/xwiki/rendering/internal/renderer/event/EventsChainingRenderer.java @@ -194,7 +194,7 @@ public class EventsChainingRenderer extends AbstractChainingPrintRenderer @Override public void onSpecialSymbol(char symbol) { - getPrinter().println("onSpecialSymbol [" + symbol + "]"); + getPrinter().println("onSpecialSymbol [" + getEscaped(Character.toString(symbol)) + "]"); } @Override
[Misc] Also escape chars in special symbol event
diff --git a/tests/runtests.py b/tests/runtests.py index <HASH>..<HASH> 100755 --- a/tests/runtests.py +++ b/tests/runtests.py @@ -160,7 +160,7 @@ TEST_SUITES = { 'path': 'integration/netapi'}, 'cloud_provider': {'display_name': 'Cloud Provider', - 'path': 'integration/cloud/providers'}, + 'path': 'integration/cloud/clouds'}, 'minion': {'display_name': 'Minion', 'path': 'integration/minion'},
Rename "providers" dir to "clouds" to respect naming convention
diff --git a/src/fkooman/Rest/Plugin/IndieAuth/IndieAuthAuthentication.php b/src/fkooman/Rest/Plugin/IndieAuth/IndieAuthAuthentication.php index <HASH>..<HASH> 100644 --- a/src/fkooman/Rest/Plugin/IndieAuth/IndieAuthAuthentication.php +++ b/src/fkooman/Rest/Plugin/IndieAuth/IndieAuthAuthentication.php @@ -179,6 +179,7 @@ class IndieAuthAuthentication implements AuthenticationPluginInterface }, array( __CLASS__ => array('enabled' => false), + 'fkooman\Rest\Plugin\Authentication\AuthenticationPlugin' => array('enabled' => false), 'fkooman\Rest\Plugin\ReferrerCheckPlugin' => array('enabled' => true), ) ); @@ -241,6 +242,7 @@ class IndieAuthAuthentication implements AuthenticationPluginInterface }, array( __CLASS__ => array('enabled' => false), + 'fkooman\Rest\Plugin\Authentication\AuthenticationPlugin' => array('enabled' => false), ) ); @@ -254,6 +256,7 @@ class IndieAuthAuthentication implements AuthenticationPluginInterface }, array( __CLASS__ => array('enabled' => false), + 'fkooman\Rest\Plugin\Authentication\AuthenticationPlugin' => array('enabled' => false), 'fkooman\Rest\Plugin\ReferrerCheckPlugin' => array('enabled' => true), ) );
also disable authentication plugin on registered URLs
diff --git a/core/src/main/java/com/google/common/truth/TruthJUnit.java b/core/src/main/java/com/google/common/truth/TruthJUnit.java index <HASH>..<HASH> 100644 --- a/core/src/main/java/com/google/common/truth/TruthJUnit.java +++ b/core/src/main/java/com/google/common/truth/TruthJUnit.java @@ -58,18 +58,6 @@ public final class TruthJUnit { } }; - /** - * @deprecated If you are passing this to a {@link Subject} constructor, instead call {@link - * #assume()}{@code .about(...).that(...)}, passing its associated {@link SubjectFactory} - * (which you might need to create). If you are calling {@code fail} on this object directly, - * instead use {@link #assume()}{@code .fail()}, or {@code throw new - * AssumptionViolatedException()} directly. - */ - @Deprecated - public static final FailureStrategy throwAssumptionError() { - return THROW_ASSUMPTION_ERROR; - } - private static final StandardSubjectBuilder ASSUME = StandardSubjectBuilder.forCustomFailureStrategy(THROW_ASSUMPTION_ERROR);
Remove throwAssumptionError, which was deprecated in Truth <I>. ------------- Created by MOE: <URL>
diff --git a/library/src/com/sothree/slidinguppanel/SlidingUpPanelLayout.java b/library/src/com/sothree/slidinguppanel/SlidingUpPanelLayout.java index <HASH>..<HASH> 100644 --- a/library/src/com/sothree/slidinguppanel/SlidingUpPanelLayout.java +++ b/library/src/com/sothree/slidinguppanel/SlidingUpPanelLayout.java @@ -1102,6 +1102,13 @@ public class SlidingUpPanelLayout extends ViewGroup { int anchoredTop = (int)(mAnchorPoint*mSlideRange); if (mDragHelper.getViewDragState() == ViewDragHelper.STATE_IDLE) { + final int newTop = mSlideableView.getTop(); + final int topBound = getSlidingTop(); + Log.d(TAG, "onViewDragStateChange newTop " + newTop + " topBound " + topBound); + mSlideOffset = mIsSlidingUp + ? (float) (newTop - topBound) / mSlideRange + : (float) (topBound - newTop) / mSlideRange; + if (mSlideOffset == 0) { if (mSlideState != SlideState.EXPANDED) { updateObscuredViewVisibility();
Recompute slide offset from sliding view top when drag state becomes idle. Some slower devices were missing the final onPanelDragged events so the onPanelExpanded, onPanelAnchored & onPanelCollapsed events were not being fired.
diff --git a/dvc/version.py b/dvc/version.py index <HASH>..<HASH> 100644 --- a/dvc/version.py +++ b/dvc/version.py @@ -6,7 +6,7 @@ import os import subprocess -_BASE_VERSION = "2.7.2" +_BASE_VERSION = "2.7.3" def _generate_version(base_version):
dvc: bump to <I>
diff --git a/sikuli.py b/sikuli.py index <HASH>..<HASH> 100644 --- a/sikuli.py +++ b/sikuli.py @@ -23,5 +23,5 @@ mouseMove = global_screen.mouseMove wheel = global_screen.wheel keyDown = global_screen.keyDown keyUp = global_screen.keyUp -debug_preview = global_screen.debugPreview +debugPreview = global_screen.debugPreview sleep = time.sleep \ No newline at end of file
Fixed refactoring (again)
diff --git a/opal/clearwater/application.rb b/opal/clearwater/application.rb index <HASH>..<HASH> 100644 --- a/opal/clearwater/application.rb +++ b/opal/clearwater/application.rb @@ -20,6 +20,7 @@ module Clearwater router.set_outlets controller.call trap_clicks + watch_url end def trap_clicks @@ -37,6 +38,19 @@ module Clearwater router.navigate_to href end end + + def watch_url + @path = router.current_path + check_rerender = proc do + if @path != router.current_path + router.set_outlets + controller && controller.call + @path = router.current_path + end + end + set_interval = Native(`window.setInterval`) + set_interval.call check_rerender, 100 + end end end end
Watch URL for changes This helps keep us from breaking the back button. I'd like to come up with a better way to do this, though, since executing a callback function every <I>ms can wake up the process unnecessarily, leading to battery drain.
diff --git a/lib/support/cli.js b/lib/support/cli.js index <HASH>..<HASH> 100644 --- a/lib/support/cli.js +++ b/lib/support/cli.js @@ -204,7 +204,7 @@ module.exports.parseCommandLine = function parseCommandLine() { }) .option('chrome.traceCategory', { describe: - 'Add a trace category to the default ones. Use --chrome.traceCategory multiple times if you want to add multiple categories', + 'Add a trace category to the default ones. Use --chrome.traceCategory multiple times if you want to add multiple categories. Example: --chrome.traceCategory disabled-by-default-v8.cpu_profiler', type: 'string', group: 'chrome' })
Add example how to add your own trace category
diff --git a/lib/dev_mode_app.js b/lib/dev_mode_app.js index <HASH>..<HASH> 100644 --- a/lib/dev_mode_app.js +++ b/lib/dev_mode_app.js @@ -178,9 +178,12 @@ App.prototype = { } , onInputChar: function(chr, i) { var self = this - if (chr === 'q') + if (chr === 'q') { + log.info('Got keyboard Quit command') this.quit() + } else if (i === 13){ // ENTER + log.info('Got keyboard Start Tests command') this.startTests() } } @@ -195,6 +198,7 @@ App.prototype = { var errMsgs = StyledString('\n' + stdout).foreground('yellow') .concat(StyledString('\n' + stderr).foreground('red')) view.setErrorPopupMessage(title.concat(errMsgs)) + log.log('error', titleText, { stdout: stdout, stderr: stderr }) return }else{ view.clearErrorPopupMessage()
Make keyboard commands and compile errors show up in the debug log
diff --git a/clc-java-sdk/sdk/src/test/java/com/centurylink/cloud/sdk/tests/mocks/BindMocksModule.java b/clc-java-sdk/sdk/src/test/java/com/centurylink/cloud/sdk/tests/mocks/BindMocksModule.java index <HASH>..<HASH> 100644 --- a/clc-java-sdk/sdk/src/test/java/com/centurylink/cloud/sdk/tests/mocks/BindMocksModule.java +++ b/clc-java-sdk/sdk/src/test/java/com/centurylink/cloud/sdk/tests/mocks/BindMocksModule.java @@ -23,6 +23,7 @@ public class BindMocksModule extends TestModule { overrideInjectedMocksBinding(); } + @SuppressWarnings("unchecked") private void overrideInjectedMocksBinding() { Stream .of(declaredFields())
<I> design and implement integration tests framework
diff --git a/tests/e2e/PestTestFramework/tests/ForPestWithDataProviderTest.php b/tests/e2e/PestTestFramework/tests/ForPestWithDataProviderTest.php index <HASH>..<HASH> 100644 --- a/tests/e2e/PestTestFramework/tests/ForPestWithDataProviderTest.php +++ b/tests/e2e/PestTestFramework/tests/ForPestWithDataProviderTest.php @@ -10,7 +10,7 @@ test('tests division with inline dataset', function (float $a, float $b, float $ [2.0, 4.0, 0.5] ]); -test('tests division with shared dataset', function (float $a, float $b, float $expectedResult) { +test('tests division with shared dataset, with special | char', function (float $a, float $b, float $expectedResult) { $sourceClass = new ForPestWithDataProvider(); expect($sourceClass->div($a, $b))->toBe($expectedResult);
Add special char for Pest e2e test to make sure it works as expected
diff --git a/lib/text_helpers/translation.rb b/lib/text_helpers/translation.rb index <HASH>..<HASH> 100644 --- a/lib/text_helpers/translation.rb +++ b/lib/text_helpers/translation.rb @@ -35,7 +35,7 @@ module TextHelpers def html(key, options = {}) rendered = GitHub::Markdown.render(text(key, options)) if options[:inline] - rendered.match(/\A<p>(.*)<\/p>\Z/)[1].html_safe + rendered.gsub(/<\/?p>/, '').html_safe else rendered.html_safe end
Handle `p` tag stripping in a more robust manner
diff --git a/features/edb/core/src/test/java/org/openengsb/edb/core/test/unit/repository/GitRepositoryTest.java b/features/edb/core/src/test/java/org/openengsb/edb/core/test/unit/repository/GitRepositoryTest.java index <HASH>..<HASH> 100644 --- a/features/edb/core/src/test/java/org/openengsb/edb/core/test/unit/repository/GitRepositoryTest.java +++ b/features/edb/core/src/test/java/org/openengsb/edb/core/test/unit/repository/GitRepositoryTest.java @@ -19,6 +19,7 @@ package org.openengsb.edb.core.test.unit.repository; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import java.io.File; @@ -76,7 +77,7 @@ public class GitRepositoryTest { Repository repo = factory.loadRepository("target/testDeleteRepo"); assertEquals(true, new File("target/testDeleteRepo").exists()); repo.removeRepository(); - assertEquals(false, new File("target/testDeleteRepo").exists()); + assertFalse(new File("target/testDeleteRepo").exists()); } }
replaced assertEquals with assertFalse
diff --git a/test/unit/test_service_models.py b/test/unit/test_service_models.py index <HASH>..<HASH> 100644 --- a/test/unit/test_service_models.py +++ b/test/unit/test_service_models.py @@ -41,7 +41,7 @@ class UrlTesterTestMixin(UrlTesterTestBase): ('filter_matching') ]) @patch('spam_lists.validation.is_valid_url') - def test_invalid_url_error_is_raised_by(self, function_name, is_valid_url_mock): + def test_query_for_invalid_url_with(self, function_name, is_valid_url_mock): invalid_url = 'http://invalid.url.com' is_valid_url_mock.side_effect = lambda u: u != invalid_url
Rename test_invalid_url_error_is_raised_by The method is being renamed to test_query_for_invalid_url_with
diff --git a/kong/management/commands/assume.py b/kong/management/commands/assume.py index <HASH>..<HASH> 100644 --- a/kong/management/commands/assume.py +++ b/kong/management/commands/assume.py @@ -26,6 +26,9 @@ class Command(BaseCommand): help="Print all options"), ) + def complete(self): + return [(h.slug, 0) for h in HostedSite.objects.all()] + def handle(self, *args, **options): LIST = options.get('list') if LIST:
Add bash completion (with a patched django). Otherwise this should just be ignored.
diff --git a/lib/driver/mysql.js b/lib/driver/mysql.js index <HASH>..<HASH> 100644 --- a/lib/driver/mysql.js +++ b/lib/driver/mysql.js @@ -403,8 +403,8 @@ var MysqlDriver = Base.extend({ var columns = Object.keys(fieldMapping); var referencedColumns = columns.map(function (key) { return fieldMapping[key]; }); var sql = util.format('ALTER TABLE `%s` ADD CONSTRAINT `%s` FOREIGN KEY (%s) REFERENCES `%s` (%s) ON DELETE %s ON UPDATE %s', - tableName, keyName, this.quoteArr( columns ), referencedTableName, - this.quoteArr( referencedColumns ), rules.onDelete || 'NO ACTION', rules.onUpdate || 'NO ACTION'); + tableName, keyName, this.quoteDDLArr( columns ), referencedTableName, + this.quoteDDLArr( referencedColumns ), rules.onDelete || 'NO ACTION', rules.onUpdate || 'NO ACTION'); return this.runSql(sql).nodeify(callback); },
fix wrong quoting resulted from wrong quotationFunction
diff --git a/enhydrator/src/main/java/com/airhacks/enhydrator/transform/ColumnTransformer.java b/enhydrator/src/main/java/com/airhacks/enhydrator/transform/ColumnTransformer.java index <HASH>..<HASH> 100644 --- a/enhydrator/src/main/java/com/airhacks/enhydrator/transform/ColumnTransformer.java +++ b/enhydrator/src/main/java/com/airhacks/enhydrator/transform/ColumnTransformer.java @@ -1,5 +1,7 @@ package com.airhacks.enhydrator.transform; +import java.util.Map; + /* * #%L * enhydrator @@ -26,6 +28,9 @@ package com.airhacks.enhydrator.transform; @FunctionalInterface public interface ColumnTransformer { + default void init(Map<String, Object> scriptEngineBindings) { + } + Object execute(Object entry); }
ColumnTransformer got initialization with bindings for consistency sake
diff --git a/src/Controller.js b/src/Controller.js index <HASH>..<HASH> 100644 --- a/src/Controller.js +++ b/src/Controller.js @@ -296,8 +296,7 @@ meta.ctrl = loadCtrls: function() { var ctrl; - var numCtrl = this._ctrlsLoad.length; - for(var i = 0; i < numCtrl; i++) { + for(var i = 0; i < this._ctrlsLoad.length; i++) { this._ctrlsLoad[i]._load(); } },
Controllers loaded in another controllers load should now work properly.
diff --git a/inc/roots-cleanup.php b/inc/roots-cleanup.php index <HASH>..<HASH> 100644 --- a/inc/roots-cleanup.php +++ b/inc/roots-cleanup.php @@ -176,7 +176,7 @@ function roots_remove_recent_comments_style() { // remove CSS from gallery function roots_gallery_style($css) { - return preg_replace("/<style type='text/css'>(.*?)</style>/s", '', $css); + return preg_replace("/<style type='text\/css'>(.*?)<\/style>/s", '', $css); } function roots_head_cleanup() {
escaped slashes in preg_replace pattern
diff --git a/tinybus/src/com/halfbit/tinybus/TinyBus.java b/tinybus/src/com/halfbit/tinybus/TinyBus.java index <HASH>..<HASH> 100644 --- a/tinybus/src/com/halfbit/tinybus/TinyBus.java +++ b/tinybus/src/com/halfbit/tinybus/TinyBus.java @@ -150,10 +150,9 @@ public class TinyBus implements Bus { private void processQueue() { mProcessing = true; - Object obj; + Task task; - while((obj = poll()) != null) { - Task task = (Task) obj; + while((task = poll()) != null) { switch (task.code) { case Task.CODE_REGISTER: registerInternal(task.obj); break; case Task.CODE_UNREGISTER: unregisterInternal(task.obj); break;
removing unnesseary object cast
diff --git a/app/src/Bolt/Config.php b/app/src/Bolt/Config.php index <HASH>..<HASH> 100644 --- a/app/src/Bolt/Config.php +++ b/app/src/Bolt/Config.php @@ -612,7 +612,7 @@ class Config $this->paths['app'] . 'view/css/ckeditor.css' )); $this->set('general/wysiwyg/filebrowser/browseUrl', $this->paths['async'] . 'filebrowser/'); - $this->set('general/wysiwyg/filebrowser/imageBrowseUrl', $this->paths['bolt'] . 'files/files'); + $this->set('general/wysiwyg/filebrowser/imageBrowseUrl', $this->paths['files']); } private function loadCache()
in setCkPath use the request to files url instead of constructing it here
diff --git a/components/Kladr/util.js b/components/Kladr/util.js index <HASH>..<HASH> 100644 --- a/components/Kladr/util.js +++ b/components/Kladr/util.js @@ -34,6 +34,21 @@ export function placeName(region: PlaceDescription, _for: ?Place = null) { case 'ул': return (_for !== 'street' ? 'улица ' : '') + region.name; + case 'пл': + return 'площадь ' + region.name; + + case 'пр-кт': + return 'проспект ' + region.name; + + case 'проезд': + return 'проезд ' + region.name; + + case 'тер': + return 'тер ' + region.name; + + case 'кв-л': + return region.name + ' квартал'; + case 'пер': return region.name + ' переулок'; }
[Kladr] More abbreviations.
diff --git a/core/Version.php b/core/Version.php index <HASH>..<HASH> 100644 --- a/core/Version.php +++ b/core/Version.php @@ -20,7 +20,7 @@ final class Version * The current Piwik version. * @var string */ - const VERSION = '3.0.0-rc5'; + const VERSION = '3.0.0-rc4'; public function isStableVersion($version) {
<I>-rc4 was never released
diff --git a/fireplace/cards/classic/rogue.py b/fireplace/cards/classic/rogue.py index <HASH>..<HASH> 100644 --- a/fireplace/cards/classic/rogue.py +++ b/fireplace/cards/classic/rogue.py @@ -34,7 +34,7 @@ class NEW1_005: # Master of Disguise class NEW1_014: - play = SetTag(TARGET, {GameTag.STEALTH: False}) + play = SetTag(TARGET, {GameTag.STEALTH: True}) ## diff --git a/tests/test_main.py b/tests/test_main.py index <HASH>..<HASH> 100755 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -1767,6 +1767,17 @@ def test_mana_wyrm(): assert wyrm.atk == 3 +def test_master_of_disguise(): + game = prepare_game() + wisp = game.player1.give(WISP) + wisp.play() + masterofdisguise = game.player1.give("NEW1_014") + masterofdisguise.play(target=wisp) + assert wisp.stealthed + game.end_turn(); game.end_turn() + assert wisp.stealthed + + def test_old_murkeye(): game = prepare_game() murkeye = game.player1.give("EX1_062")
Fix Master of Disguise and add test
diff --git a/example.py b/example.py index <HASH>..<HASH> 100644 --- a/example.py +++ b/example.py @@ -12,11 +12,10 @@ bot = SirBot(token) # Example quote of the day plugin async def get_quote_of_the_day(): url = 'http://api.theysaidso.com/qod.json' - async with aiohttp.ClientSession() as session: - async with session.get(url) as response: - if response.status != 200: - raise Exception('Error talking to quote api') - quote_r = await response.json() + async with aiohttp.get(url) as response: + if response.status != 200: + raise Exception('Error talking to quote api') + quote_r = await response.json() quote = quote_r['contents']['quotes'][0]['quote'] author = quote_r['contents']['quotes'][0]['author']
Remove client session from example bot, we only need a single request
diff --git a/lib/rubylog/context_modules/predicates.rb b/lib/rubylog/context_modules/predicates.rb index <HASH>..<HASH> 100644 --- a/lib/rubylog/context_modules/predicates.rb +++ b/lib/rubylog/context_modules/predicates.rb @@ -11,12 +11,6 @@ module Rubylog super end - - - - - # directives - # def predicate *indicators each_indicator(indicators) do |indicator| create_procedure(indicator).functor_for [@default_subject, Variable] @@ -31,23 +25,13 @@ module Rubylog attr_accessor :default_subject - # predicates + protected def create_procedure indicator Rubylog::SimpleProcedure.new indicator[0], indicator[1] end - - protected - - - def check_modules modules - modules.each do |m| - raise ArgumentError, "#{m.inspect} is not a class or module", caller[1..-1] unless m.is_a? Module - end - end - def each_indicator indicators # TODO check if not empty #
removed check_modules, made create_procedure protected
diff --git a/course/index.php b/course/index.php index <HASH>..<HASH> 100644 --- a/course/index.php +++ b/course/index.php @@ -116,7 +116,7 @@ print_category_edit_header(); print_heading($heading); - if ($datadelete) { + if ($data->fulldelete) { category_delete_full($deletecat, true); } else { category_delete_move($deletecat, $data->newparent, true);
course categories: fix typo introduced when fixing MDL-<I>