wipo-gbd-transformation 1.1.84__py3-none-any.whl → 1.1.86__py3-none-any.whl

gbdtransformation/brands/detm/filters.py

@@ -14,8 +14,7 @@ def translate_status(trademark):
 
     if trademark.STATUSAPPLICATION == 'true': return ('Pending', 'Application filed')
 
-    return 'Unknown'
-    #raise Exception('Could not deduce status')
+    raise Exception('Could not deduce status')
 
 def translate_kind(kind):
     if not kind: return ['Individual']
@@ -24,8 +23,7 @@ def translate_kind(kind):
     if kind == 'kollektiv': return ['Collective']
     if kind == 'gewaehrleistung': return ['Certificate']
 
-    return 'Other'
-    #raise Exception('kind "%s" is not mapped' % kind)
+    raise Exception('kind "%s" is not mapped' % kind)
 
 def translate_feature(feature):
     if not feature: return 'Undefined'
@@ -44,30 +42,15 @@ def translate_feature(feature):
     if feature.WORD: return 'Word'
     if feature.WORDIMAGE: return 'Figurative'
 
-    return 'Unknown'
-    #raise Exception('Feature could not be deduced')
+
+    raise Exception('Feature could not be deduced')
+
 
 # if Registered or Expired =>
 # if RENEWALDATE: 10y after RENEWALDATE and endofmonth of FILDATE
 # else: 10y and endofmonth of FILDATE
-
-# PL: Missing cancelation 
-
 def get_expiry_date(trademark, gbd_status):
     if gbd_status in ['Registered', 'Expired']:
-
-        if trademark.STATUSCANCELLED == "true":
-            # expiry date is cancelation date, which in this case is the same as the PROCDATE
-            pdate = trademark.PROCDATE
-            if pdate:
-                try:
-                    pdate = datetime.strptime(pdate.strip(), '%Y-%m-%dT%H:%M:%S')
-                    pdate = pdate.date()
-                except:
-                    pdate = None
-                if pdate:
-                    return pdate
-
         rdate = trademark.RENEWALDATE
         fdate = trademark.FILDATE
         edate = datetime.strptime(rdate if rdate else fdate, '%Y-%m-%d')

gbdtransformation/brands/emtm/filters.py

@@ -8,21 +8,6 @@ ignore_namespace = [
     'http://www.euipo.europa.eu/EUTM/EUTM_Download'
 ]
 
-def filter_language(value, app_language):
-    if not value: return []
-
-    languages = set(['en', 'fr', 'es'])
-    languages.add(app_language.lower())
-    new_matches = []
-    for match in value:
-        if not match: continue
-        if not isinstance(match, dict):
-            new_matches.append(match)
-        elif not match.get('_languageCode', None):
-            new_matches.append(match)
-        elif match['_languageCode'].lower() in languages:
-            new_matches.append(match)
-    return new_matches
 
 def get_termination(value, gbd_status):
     if gbd_status == 'Ended':

gbdtransformation/brands/emtm/template.yml

@@ -1,9 +1,4 @@
 {% from 'navigation.tmpl' import match %}
-{% macro match_with_language(path, scope, app_language) -%}
-    {% for elem in scope | matchpath(path) | filter_language(app_language) %}
-        {{ caller(elem) }}
-    {% endfor %}
-{%- endmacro %}
 
 {% set _space = " " %}
 {% set status = TradeMark | translate_status %}
@@ -30,18 +25,18 @@ officeStatus: {{ TradeMark.MarkCurrentStatusCode }}
 terminationDate: {{ TradeMark.MarkCurrentStatusDate | get_termination(status) }}
 statusDate: {{ TradeMark.MarkCurrentStatusDate | convertdate('%Y-%m-%d') }}
 markDisclaimerDetails:
-  {% call(desc) match_with_language('MarkDisclaimerDetails.MarkDisclaimer', TradeMark, TradeMark.ApplicationLanguageCode) %}
+  {% call(desc) match('MarkDisclaimerDetails.MarkDisclaimer', TradeMark) %}
   - text: {{ desc }}
     languageCode: {{ desc | guess_language(desc._languageCode, TradeMark.ApplicationLanguageCode) }}
   {% endcall %}
 markDescriptionDetails:
-  {% call(desc) match_with_language('MarkDescriptionDetails.MarkDescription', TradeMark, TradeMark.ApplicationLanguageCode) %}
+  {% call(desc) match('MarkDescriptionDetails.MarkDescription', TradeMark) %}
   - text: {{ desc }}
     languageCode: {{ desc | guess_language(desc._languageCode, TradeMark.ApplicationLanguageCode) }}
   {% endcall %}
 wordMarkSpecification:
   markVerbalElement:
-    {% call(desc) match_with_language('WordMarkSpecification.MarkVerbalElementText', TradeMark, TradeMark.ApplicationLanguageCode) %}
+    {% call(desc) match('WordMarkSpecification.MarkVerbalElementText', TradeMark) %}
     - text: {{ desc | remove_cr }}
       languageCode: {{ desc | guess_language(desc._languageCode, TradeMark.ApplicationLanguageCode) }}
     {% endcall %}
@@ -50,7 +45,7 @@ markImageDetails:
   - name: {{ img.MarkImageFilename }}
     colourIndicator: {{ img.MarkImageColourClaimedText | get_true_or_false }}
     colourClaimed:
-      {% call(desc) match_with_language('MarkImageColourClaimedText', img, TradeMark.ApplicationLanguageCode) %}
+      {% call(desc) match('MarkImageColourClaimedText', img) %}
       - text: {{ desc }}
         languageCode: {{ desc | guess_language(desc._languageCode, TradeMark.ApplicationLanguageCode) }}
       {% endcall %}
@@ -81,7 +76,7 @@ goodsServicesClassification:
     {% call(nice) match('ClassDescriptionDetails.ClassDescription', nc_gs) %}
     - code: {{ nice.ClassNumber | int }}
       terms:
-      {% call(desc) match_with_language('GoodsServicesDescription', nice, TradeMark.ApplicationLanguageCode) %}
+      {% call(desc) match('GoodsServicesDescription', nice) %}
         {{ desc | guess_language(desc._languageCode, TradeMark.ApplicationLanguageCode) | field_name }}:
         {% for gsline in desc.__value | remove_trailing('.') | split_terms %}
           - {{ gsline }}

gbdtransformation/brands/petm/__init__.py

@@ -0,0 +1,3 @@
+# instruction to render the output to JSON format
+render = 'JSON'
+source = 'national'

gbdtransformation/brands/petm/filters.py

@@ -0,0 +1,90 @@
+# namespaces defined in XML and to be ignored in procecssing
+ignore_namespace = [
+    'http://www.oami.europa.eu/TM-Search',
+    'http://pe.oami.europa.eu/TM-Search'
+]
+
+def translate_kind(kind, ipr_kind):
+    if kind == None and ipr_kind != None:
+        return [ ipr_kind ]
+    if not kind: return 'Undefined'
+
+    if kind == 'Individual': return ['Individual']
+    if kind == 'Collective': return ['Collective']
+    if kind == 'State property': return ['Collective']
+    if kind == 'Certificate': return ['Certificate']
+
+    return ['Other']
+    #raise Exception('kind "%s" is not mapped.' % kind)
+
+def translate_status(status):
+    if not status: return 'Unknown'
+    if status == 'Registration cancelled': return 'Expired'
+    if status == 'Expired': return 'Expired'
+    if status == 'Registration surrendered': return 'Expired'
+
+    if status in [ 'Registered trademark',
+                   'Registered',
+                   'Registration renewed']:
+        return 'Registered'
+
+    if status in [ 'Application withdrawn',
+                   'Ended',
+                   'Application refused' ]:
+        return 'Ended'
+
+    if status in [ 'Application published',
+                   'Application Filed',
+                   'Application filed',
+                   'Examination of opposition',
+                   'Opposition pending',
+                   'Appeal pending',
+                   'Application opposed',
+                   'Registration cancellation pending' ]:
+        return 'Pending'
+
+    return 'Unknown'
+    #raise Exception('Status "%s" unmapped' % status)
+
+def translate_feature(feature):
+    if not feature: return 'Undefined'
+
+    if feature == 'Word': return 'Word'
+    if feature == 'Figurative': return 'Figurative'
+    if feature == 'Combined': return 'Combined'
+    if feature == '3-D': return 'Three dimensional'
+    if feature == 'Sound': return 'Sound'
+    if feature == 'Motion': return 'Motion'
+    if feature == 'Other': return 'Other'
+    if feature == 'Colour' or feature == 'Color': return 'Colour'
+    if feature == 'Hologram': return 'Hologram'
+
+    return 'Unknown'
+    #raise Exception('Feature "%s" unmapped' % feature)
+
+def  get_entity_addr(addr):
+    els = ['AddressStreet', 'AddressCity', 'AddressPostcode', 'AddressCounty']
+    res = []
+    if not addr: return None
+    for el in els:
+        if addr.get(el, None):
+            res.append(addr[el])
+    return ', '.join(res)
+
+def  get_entity_name(name):
+    if not name: return
+    if name.OrganizationName: return name.OrganizationName
+    els = ['FirstName', 'LastName']
+    res = []
+    for el in els:
+        if name.get(el, None):
+            res.append(name[el])
+    return ' '.join(res)
+
+def  get_entity_kind(name):
+    if name == 'Legal': 
+        return 'Legal Entity'
+    elif name == 'Physical person':
+        return 'Natural Person'
+    else:
+        return None

gbdtransformation/brands/petm/schema

@@ -0,0 +1,114 @@
+/Transaction
+__/TradeMarkTransactionBody
+____/TransactionContentDetails
+______/TransactionCode
+______/TransactionData
+________/TradeMarkDetails
+__________/TradeMark
+____________/AppealDetails
+______________/Appeal
+________________/AppealDate
+________________/AppealDecisionDate
+____________/ApplicantDetails
+______________/Applicant
+________________/ApplicantAddressBook
+__________________/FormattedNameAddress
+____________________/Name
+______________________/FormattedName
+________________________/FirstName
+________________________/LastName
+________________________/OrganizationName
+________________/ApplicantLegalEntity
+________________/ApplicantNationalityCode
+____________/ApplicationDate
+____________/ApplicationLanguageCode
+____________/ApplicationNumber
+____________/Comment
+____________/ExpiryDate
+____________/FilingPlace
+____________/GoodsServicesDetails
+______________/GoodsServices
+________________/ClassDescriptionDetails
+__________________/ClassDescription
+____________________/ClassNumber
+____________________/GoodsServicesDescription
+________________/ClassificationKindCode
+____________/IPRKind
+____________/KindMark
+____________/MarkCurrentStatusCode
+____________/MarkCurrentStatusDate
+____________/MarkDescriptionDetails
+______________/MarkDescription
+____________/MarkDisclaimerDetails
+______________/MarkDisclaimer
+____________/MarkFeature
+____________/MarkImageDetails
+______________/MarkImage
+________________/MarkImageCategory
+__________________/CategoryCodeDetails
+____________________/CategoryCode
+__________________/CategoryKind
+________________/MarkImageColourIndicator
+________________/MarkImageFilename
+____________/MarkRecordDetails
+______________/MarkRecord
+________________/BasicRecord
+__________________/BasicRecordKind
+__________________/BeneficiaryDetails
+____________________/Applicant
+______________________/ApplicantAddressBook
+________________________/FormattedNameAddress
+__________________________/Name
+____________________________/FormattedName
+______________________________/FirstName
+______________________________/LastName
+______________________________/OrganizationName
+______________________/ApplicantLegalEntity
+______________________/ApplicantNationalityCode
+__________________/OriginalProprietorDetails
+____________________/Applicant
+______________________/ApplicantAddressBook
+________________________/FormattedNameAddress
+__________________________/Name
+____________________________/FormattedName
+______________________________/FirstName
+______________________________/LastName
+______________________________/OrganizationName
+______________________/ApplicantLegalEntity
+______________________/ApplicantNationalityCode
+__________________/RecordCurrentStatusCode
+__________________/RecordCurrentStatusDate
+__________________/RecordEffectiveDate
+__________________/RecordFilingDate
+__________________/RecordIdentifier
+____________/OppositionDetails
+______________/Opposition
+________________/OpponentDetails
+__________________/Opponent
+____________________/OpponentAddressBook
+______________________/FormattedNameAddress
+________________________/Name
+__________________________/FormattedName
+____________________________/FirstName
+________________/OppositionDate
+____________/OppositionPeriodEndDate
+____________/OppositionPeriodStartDate
+____________/PriorityDetails
+______________/Priority
+________________/PriorityCountryCode
+________________/PriorityDate
+________________/PriorityNumber
+____________/PublicationDetails
+______________/Publication
+________________/PublicationDate
+________________/PublicationIdentifier
+________________/PublicationSection
+____________/RegistrationDate
+____________/RegistrationNumber
+____________/RegistrationOfficeCode
+____________/WordMarkSpecification
+______________/MarkVerbalElementText
+______/TransactionIdentifier
+__/TransactionHeader
+____/SenderDetails
+______/RequestProducerDateTime

gbdtransformation/brands/petm/template.yml

@@ -0,0 +1,143 @@
+{% from 'navigation.tmpl' import match %}
+{% set trademark = Transaction.TradeMarkTransactionBody.TransactionContentDetails.TransactionData.TradeMarkDetails.TradeMark %}
+
+{% set status = trademark.MarkCurrentStatusCode | translate_status %}
+type: TRADEMARK
+kind: {{ trademark.KindMark | translate_kind(trademark.IPRKind) }}
+st13: {{ trademark.ApplicationNumber | st13('PE', appdate=trademark.ApplicationDate) }}
+gbdStatus: {{ status }}
+markFeature: {{ trademark.MarkFeature | translate_feature }}
+registrationOfficeCode: PE
+designatedCountries:
+  - PE
+applicationNumber: {{ trademark.ApplicationNumber }}
+applicationDate: {{ trademark.ApplicationDate | convertdate('%Y-%m-%d') }}
+registrationNumber: {{ trademark.RegistrationNumber}}
+registrationDate: {{ trademark.RegistrationDate }}
+applicationLanguageCode: 'es'
+officeStatus: {{ trademark.MarkCurrentStatusCode }}
+statusDate: {{ trademark.MarkCurrentStatusDate | convertdate('%Y-%m-%d') }}
+expiryDate: {{ trademark.ExpiryDate }}
+
+{% if status == 'Ended' %}
+terminationDate: {{ trademark.MarkCurrentStatusDate }}
+{% endif %}
+
+markDisclaimerDetails:
+  {% call(desc) match('MarkDisclaimerDetails.MarkDisclaimer', trademark) %}
+  - text: {{ desc }}
+    languageCode: {{ desc | guess_language('es') }}
+  {% endcall %}
+
+wordMarkSpecification:
+  markVerbalElement:
+    {% call(desc) match('WordMarkSpecification.MarkVerbalElementText', trademark) %}
+    - text: {{ desc }}
+      languageCode: {{ desc | guess_language('es') }}
+    {% endcall %}
+
+markDescriptionDetails: 
+  {% call(desc) match('MarkDescriptionDetails.MarkDescription', trademark) %}
+  - languageCode: {{ desc | guess_language('es') }}
+    text: {{ desc }}
+  {% endcall %}  
+
+markImageDetails:
+  {% call(img) match('MarkImageDetails.MarkImage', trademark) %}
+  - name: {{ img.MarkImageFilename }}
+    colourIndicator: {{ img.MarkImageColourIndicator | get_true_or_false }}
+    colourClaimed:
+      {% call(desc) match('MarkImageColourClaimedText', img) %}
+      - text: {{ desc }}
+        languageCode: {{ desc | guess_language(desc._languageCode, 'es') }}
+      {% endcall %}
+    classification:
+      kind: Vienna
+      version: {{ ASK_THE_OFFICE }}
+      code:
+      {% call(code) match('MarkImageCategory.CategoryCodeDetails.CategoryCode', img) %}
+      - {{ code }}
+      {% endcall %}
+  {% endcall %}
+
+{% call(nc_gs) match('GoodsServicesDetails.GoodsServices', trademark) %}
+goodsServicesClassification:
+  kind: Nice
+  version: {{ ASK_THE_OFFICE }}
+  class:
+    {% call(nice) match('ClassDescriptionDetails.ClassDescription', nc_gs) %}
+    - code: {{ nice.ClassNumber | int }}
+      terms:
+      {% if nice.GoodsServicesDescription | has_value %}
+      {% call(desc) match('GoodsServicesDescription', nice) %}
+        {{ desc | guess_language(desc._languageCode, 'es') | field_name }}:
+        {% for gsline in desc | remove_trailing('.') | split_terms %}
+          - {{ gsline | lower }}
+        {% endfor %}
+      {% endcall %}
+      {% endif %}
+    {% endcall %}
+{% endcall %}
+
+priorities:
+  {% call(priority) match('PriorityDetails.Priority', trademark) %}
+  - countryCode: {{ priority.PriorityCountryCode }}
+    number: {{ priority.PriorityNumber }}
+    date: {{ priority.PriorityDate }}
+  {% endcall %}
+
+publications:
+  {% call(publication) match('PublicationDetails.Publication', trademark) %}
+  - identifier: {{ publication.PublicationIdentifier }}
+    section: {{ publication.PublicationSection }}
+  {% endcall %}
+
+applicants:
+  {% call(Applicant) match('ApplicantDetails.Applicant', trademark) %}
+  - identifier: {{ Applicant.ApplicantIdentifier }}
+    kind: {{ Applicant.ApplicantLegalEntity | get_entity_kind}}
+    {% call(nameline) match('FormattedNameAddress.Name.FormattedName', Applicant.ApplicantAddressBook) %}
+    fullName:
+      - text: {{ nameline | get_entity_name }}
+        languageCode: {{ nameline | guess_language('es') }}
+      {% endcall %}
+    fullAddress:
+      {% call(adrline) match('FormattedNameAddress.Address.FormattedAddress', Applicant.ApplicantAddressBook) %}
+      - text: {{ adrline | get_entity_addr}}
+        languageCode: {{ adrline | get_entity_addr | guess_language('es') }}
+      {% endcall %}
+    {% call(adrline) match('FormattedNameAddress.Address', Applicant.ApplicantAddressBook) %}
+    countryCode: {{ adrline.AddressCountryCode }}
+    {% endcall %}
+    countryCode: {{ Applicant.ApplicantNationalityCode }}
+  {% endcall %}
+
+representatives:
+  {% call(Representative) match('RepresentativeDetails.Representative', trademark) %}
+  - identifier: {{ Representative.RepresentativeIdentifier }}
+    kind: {{ Representative.ApplicantLegalEntity | get_entity_kind}}
+    {% call(nameline) match('FormattedNameAddress.Name.FormattedName', Representative.RepresentativeAddressBook) %}
+    fullName:
+      - text: {{ nameline | get_entity_name}}
+        languageCode: {{ nameline | get_entity_name | guess_language('section') }}
+      {% endcall %}
+    fullAddress:
+      {% call(adrline) match('FormattedNameAddress.Address.FormattedAddress', Representative.RepresentativeAddressBook) %}
+      - text: {{ adrline | get_entity_addr}}
+        languageCode: {{ adrline | get_entity_addr | guess_language('es') }}
+      {% endcall %}
+    {% call(adrline) match('FormattedNameAddress.Address', Representative.RepresentativeAddressBook) %}
+    countryCode: {{ adrline.AddressCountryCode }}
+    {% endcall %}
+    countryCode: {{ Representative.RepresentativeNationalityCode }}
+  {% endcall %}
+
+appeals:
+  {% call(appeal) match('AppealDetails.Appeal', trademark) %}
+  - date: {{ appeal.AppealDate | convertdate('%Y-%m-%d') }}
+    decisionDate: {{ appeal.AppealDecisionDate | convertdate('%Y-%m-%d') }}
+  {% endcall %}  
+
+extra:
+  oppositionPeriodStartDate: {{ trademark.OppositionPeriodStartDate | convertdate('%Y-%m-%d') }}
+  oppositionPeriodEndDate: {{ trademark.OppositionPeriodEndDate | convertdate('%Y-%m-%d') }}

gbdtransformation/brands/ustm/filters.py

@@ -176,16 +176,31 @@ def get_applicants(owners, status):
                 if(owner.get('add%s' % i)):
                     adrlines.append(owner['add%s' % i].replace(';', ''))
 
+            address_str = ', '.join(adrlines)
+            address_str = address_str.replace(",,", ",")
+            if address_str.endswith(","):
+                address_str = address_str[:-1]
+
+            if len(address_str.strip()) == 0:
+                address_str = None
+
             city = []
+            city_str = None
+            postCode_str = None
             if owner.postCode:
                 city.append(owner.postCode)
+                postCode_str = owner.postCode
             if owner.city:
                 city.append(owner.city)
+                city_str = owner.city
 
             if len(city):
                 adrlines.append(' '.join(city))
+
+            state_str = None
             if owner.state:
                 adrlines.append(owner.state)
+                state_str = owner.state
 
             address = '; '.join(adrlines)
 
@@ -197,7 +212,11 @@ def get_applicants(owners, status):
                 'kind': 'Natural Person' if owner.entType == '01' else 'Legal Entity',
                 'name': owner.partyName,
                 'address': address,
-                'country': country
+                'country': country,
+                'city': city_str,
+                'postCode': postCode_str,
+                'addressLines': address_str,
+                'state': state_str
             })
 
     return applicants

gbdtransformation/brands/ustm/template.yml

@@ -137,15 +137,40 @@ publications:
 {% set applicants = file.owners.owner | get_applicants(status['gbd']) %}
 applicants:
   {% for applicant in applicants %}
-  - kind: {{ applicant.kind }}
+  - identifier:
+    kind: {{ applicant.kind }}
     fullName:
       - languageCode: en
         text: {{ applicant.name }}
+    firstName:
+      - languageCode:
+        text:
+    lastName:
+      - languageCode:
+        text:
+    middleName:
+      - languageCode:
+        text:
+    organizationName:
+      - languageCode:
+        text:
     fullAddress:
       - languageCode: en
         text: {{ applicant.address }}
+    detailedAddress:
+      - languageCode: en
+        text: {{ applicant.addressLines }}
+        cityName: {{ applicant.city }}
+        geographicRegionName: {{ applicant.state }}
+        postalCode: {{ applicant.postCode }}
+        countryCode: {{ applicant.country }}
+    contact:
+      phone: 
+      fax: 
+      email: 
+      url:
     countryCode: {{ applicant.country }}
-    {% endfor %}
+  {% endfor %}
 
 representatives:
   {% if file.head.attName %}

gbdtransformation/brands/xxxx/template.yml

@@ -310,6 +310,7 @@ events:
 appeals:
   - kind:
     date:
+    decisionDate: 
 
 # licence information, not frequent, but provided by Singapore, Norway and UK as of 2025-04-23
 licences:

gbdtransformation/designs/woid/filters.py

@@ -66,7 +66,7 @@ def getLastRenewalDate(histories, designIdentifier=None, countryCode=None):
 
     renewalDate = None
     for history in histories:
-        if "HagueRenewal" in history:
+        if "HagueRenewal" in history and isinstance(history, dict):
             if "ExpiryDate" in history.HagueRenewal:
                 if designIdentifier == None:
                     # no design restriction
@@ -90,7 +90,7 @@ def getRefusalDate(histories, designIdentifier=None, countryCode=None):
     refusalDate = None
     if histories != None:
         for history in histories:
-            if "HagueRefusal" in history:
+            if "HagueRefusal" in history and isinstance(history, dict):
                 if designIdentifier == None or isAffectedDesignIdentifier(designIdentifier, history.HagueRefusal.AffectedDesign):
                     if countryCode == None or isApplicableToCountry(countryCode, history.HagueRefusal):
                         if "DecisionEffectiveDate" in history.HagueRefusal:
@@ -176,7 +176,7 @@ def getOfficeStatusDate(registrationDate, expiryDate, histories, designIdentifie
     if countryCode != None and histories != None:
         # check possible renunciation including the particular country if specified
         for history in histories:
-            if "HagueRenunciation" in history:
+            if "HagueRenunciation" in history and isinstance(history, dict):
                 # is the design identifier in the list of affected designs?
                 if designIdentifier == None or isAffectedDesignIdentifier(designIdentifier, history.HagueRenunciation):
                     if "DesignatedCountryBag" in history.HagueRenunciation:
@@ -188,7 +188,7 @@ def getOfficeStatusDate(registrationDate, expiryDate, histories, designIdentifie
                                 return history.HagueRenunciation.InternationalRecordingDate
 
             # to be tested: same for HagueLimitation, which is very similar to HagueRenunciation
-            if "HagueLimitation" in history:
+            if "HagueLimitation" in history and isinstance(history, dict):
                 # is the design identifier in the list of affected designs?
                 if designIdentifier == None or isAffectedDesignIdentifier(designIdentifier, history.HagueLimitation):
                     if "DesignatedCountryBag" in history.HagueLimitation:
@@ -199,7 +199,7 @@ def getOfficeStatusDate(registrationDate, expiryDate, histories, designIdentifie
                             elif designatedCountry.DesignatedCountryCode == countryCode:
                                 return history.HagueLimitation.InternationalRecordingDate
 
-            if "HagueGrantProtection" in history:
+            if "HagueGrantProtection" in history and isinstance(history, dict):
                 # is the design identifier in the list of affected designs?
                 if designIdentifier == None or isAffectedDesignIdentifier(designIdentifier, history.HagueGrantProtection.AffectedDesign):
                     if "RecordNotifyingOfficeCode" in history.HagueGrantProtection:
@@ -242,7 +242,7 @@ def getGbdStatus(registrationDate, expiryDate, histories, designIdentifier, coun
     grantedDate = None
     if countryCode != None and histories != None:
         for history in histories:
-            if "HagueRenunciation" in history:
+            if "HagueRenunciation" in history and isinstance(history, dict):
                 # is the design identifier in the list of affected designs?
                 if designIdentifier == None or isAffectedDesignIdentifier(designIdentifier, history.HagueRenunciation):
                     if "DesignatedCountryBag" in history.HagueRenunciation:
@@ -254,7 +254,7 @@ def getGbdStatus(registrationDate, expiryDate, histories, designIdentifier, coun
                                     return "Ended"
 
             # to be tested: same for HagueLimitation, which is very similar to HagueRenunciation
-            if "HagueLimitation" in history:
+            if "HagueLimitation" in history and isinstance(history, dict):
                 # is the design identifier in the list of affected designs?
                 if designIdentifier == None or isAffectedDesignIdentifier(designIdentifier, history.HagueLimitation):
                     if "DesignatedCountryBag" in history.HagueLimitation:
@@ -265,7 +265,7 @@ def getGbdStatus(registrationDate, expiryDate, histories, designIdentifier, coun
                             elif designatedCountry.DesignatedCountryCode == countryCode:
                                     return "Ended"
         
-            if "HagueGrantProtection" in history:
+            if "HagueGrantProtection" in history and isinstance(history, dict):
                 # is the design identifier in the list of affected designs?
                 if designIdentifier == None or isAffectedDesignIdentifier(designIdentifier, history.HagueGrantProtection.AffectedDesign):
                     if "RecordNotifyingOfficeCode" in history.HagueGrantProtection:

{wipo_gbd_transformation-1.1.84.dist-info → wipo_gbd_transformation-1.1.86.dist-info}/METADATA

@@ -1,22 +1,25 @@
 Metadata-Version: 2.1
 Name: wipo-gbd-transformation
-Version: 1.1.84
+Version: 1.1.86
 Summary: GBD XML ETL package
 Home-page: https://github.com/GBD-Wipo/xmlE
 Author: WIPO GDB team
 Author-email: gbd@wipo.int
+License: UNKNOWN
 Keywords: gbdtransformation
+Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3.6
 License-File: LICENSE.md
+Requires-Dist: PyYAML
 Requires-Dist: boto3
-Requires-Dist: jinja2 ==2.11.2
-Requires-Dist: xmltodict
 Requires-Dist: dicttoxml
-Requires-Dist: PyYAML
-Requires-Dist: munch
-Requires-Dist: tabulate
-Requires-Dist: markupsafe ==2.0.1
+Requires-Dist: jinja2 (==2.11.2)
 Requires-Dist: lingua-language-detector
 Requires-Dist: lxml
+Requires-Dist: markupsafe (==2.0.1)
+Requires-Dist: munch
+Requires-Dist: tabulate
+Requires-Dist: xmltodict
 
 GBD XML ETL package
+

{wipo_gbd_transformation-1.1.84.dist-info → wipo_gbd_transformation-1.1.86.dist-info}/RECORD

@@ -89,7 +89,7 @@ gbdtransformation/brands/cutm/schema,sha256=TFrF4FR76cytcbtQkDWxtF74I0tCPRDIvWRF
 gbdtransformation/brands/cutm/template.yml,sha256=TiC6Nf2MF8l1srCpvChPcS99KBaXSy-BGIVRkqQZVtU,138
 gbdtransformation/brands/cutm/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gbdtransformation/brands/detm/__init__.py,sha256=eSKSOkwspXF3U7Sv7Z2KkOQSqzvghK5dD9vR-pmEPKQ,418
-gbdtransformation/brands/detm/filters.py,sha256=n-Y3dLxtgIRMCSoFqDXuKluf_uBwa-CXory8wCwmcXQ,3167
+gbdtransformation/brands/detm/filters.py,sha256=kR_OKuRWEXymKKz-brh6CoO4kIsrvK-W2hGfgLsH0Yk,2611
 gbdtransformation/brands/detm/schema,sha256=SxOjgWehtwDP01TPFmMGsjWs1Sz6ijUlHB8WUMSBOeU,9451
 gbdtransformation/brands/detm/template.yml,sha256=Co2eFATPhDHDN0dz4tNNJsL8Mpl7qm2W6ejhZxEjHBg,3880
 gbdtransformation/brands/dktm/__init__.py,sha256=lQh4-cQE0kvjM75miSkI2As4xEgb9Em_4lJfnbgAbS8,180
@@ -111,9 +111,9 @@ gbdtransformation/brands/egtm/schema,sha256=AP0MxQyD0hY4APRh8nxitlxMqJYJB4AaaTJ8
 gbdtransformation/brands/egtm/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
 gbdtransformation/brands/egtm/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gbdtransformation/brands/emtm/__init__.py,sha256=9J9MpkcIR-7PWVjbzvT-ey9F400wxdlRAQF5ZiX8FX8,91
-gbdtransformation/brands/emtm/filters.py,sha256=vUAFaOGOx2l7VhIf1DcyyNfoGpJLudBP4wYm8ukCMCM,3294
+gbdtransformation/brands/emtm/filters.py,sha256=KAPhAAtYyY_ODHALSZ5akgivDCpjPxDmE-xVxhTT18k,2781
 gbdtransformation/brands/emtm/schema,sha256=CCZ2HtmgidPqBs9byleAC6ksQ6jFgclmVewH3Vnex8w,9643
-gbdtransformation/brands/emtm/template.yml,sha256=L0pDlLO_xwksy_Bb_BiNSgorFAAysaPcojmJJnu4UZw,5561
+gbdtransformation/brands/emtm/template.yml,sha256=rXAM3XkAx7Rf7OpH0w8WGWux0uPfy6cBqBT0O_shM4s,5118
 gbdtransformation/brands/estm/__init__.py,sha256=UHmbQDIPDdApISBKfO9tKOX6LgUQ_Ib-IVMR5kCVMTY,86
 gbdtransformation/brands/estm/filters.py,sha256=GzhXr2dnPmZ4l71q0a3ulNTJgdpLQI6qcQcNEK8E5Co,3553
 gbdtransformation/brands/estm/schema,sha256=y7ZeQPuHez-DbBs1wnQjkyPvQ3hQ2uX5eNdrimCnFh4,3334
@@ -314,6 +314,10 @@ gbdtransformation/brands/omtm/schema,sha256=TFrF4FR76cytcbtQkDWxtF74I0tCPRDIvWRF
 gbdtransformation/brands/omtm/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
 gbdtransformation/brands/omtm/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gbdtransformation/brands/omtm/tests/test.xml,sha256=H5uPHRXq1IQc8WCKIISaTK8etM65rNcAmqWVl8c2QtM,3912
+gbdtransformation/brands/petm/__init__.py,sha256=zAi2tO7hSmmkrYYq34_BW4J2QKQHG90WUVm4O0Tiwvw,85
+gbdtransformation/brands/petm/filters.py,sha256=QPrHBSdJT0pKLa-vIOjAsYEduem_H2hlSPBsaHA6yY4,2870
+gbdtransformation/brands/petm/schema,sha256=xLE6nWnE4XmNxwIUNzLKomvJ9UqIMRR8y7q96Dac-Bk,3878
+gbdtransformation/brands/petm/template.yml,sha256=Tb6W5MhPNbeHPTFnEX8VTdmnNJS8Z-3A8WHLzSBo2BQ,5871
 gbdtransformation/brands/pgtm/__init__.py,sha256=Dl-9OGINzHIufZ6JBIuAzLzNozQdyZttdWwWw7Pl-RI,83
 gbdtransformation/brands/pgtm/filters.py,sha256=_f1jlWyeUyvlwfbqoS5rHroSfD-OJqbEJv5jF5sG_tY,2173
 gbdtransformation/brands/pgtm/schema,sha256=TFrF4FR76cytcbtQkDWxtF74I0tCPRDIvWRFeqaJt6Q,3242
@@ -408,9 +412,9 @@ gbdtransformation/brands/uatm/filters.py,sha256=Er8L7T5If-2s_oDZIhgIpUKBTHR9gN1Z
 gbdtransformation/brands/uatm/schema,sha256=xyi3dhfyhzwFzeNA4vl5CZ_3FGNm6kcePHQt4Nd_qWM,4318
 gbdtransformation/brands/uatm/template.yml,sha256=7E7Q9HUg8aFdiwzpYYqB0LIWbkG_zkRh8mGVpk7fL6k,5974
 gbdtransformation/brands/ustm/__init__.py,sha256=nAKYGg8pFwhesOakhSSbHADYx422ODF73hEIjbswwOw,9731
-gbdtransformation/brands/ustm/filters.py,sha256=_-Fk0jN3es5yr8AtRjYUXZ9ZTqmKMaJZrTAwQsPiJGw,5978
+gbdtransformation/brands/ustm/filters.py,sha256=G6M2DHBnQUnBBK6gDYUXcTJ-dAe3AKILayaOXkFXfbA,6624
 gbdtransformation/brands/ustm/schema,sha256=7vcbDMFy76nAxZ5dRjssbOhHNFOqVIlVldrNssBB1Mc,133581
-gbdtransformation/brands/ustm/template.yml,sha256=btWlXhetvAFnng9IFMi264ZgXur2KRl_7er1GYGFt-8,5033
+gbdtransformation/brands/ustm/template.yml,sha256=0stb2cq5WpWeeRwFO7o3cd1yq1KlQQiNI__ORcYPmt8,5592
 gbdtransformation/brands/uytm/__init__.py,sha256=UHmbQDIPDdApISBKfO9tKOX6LgUQ_Ib-IVMR5kCVMTY,86
 gbdtransformation/brands/uytm/filters.py,sha256=i7SBMVTF70OERVdsS3Dfv19S3-9kyxE-y4aYA59YxA4,1976
 gbdtransformation/brands/uytm/schema,sha256=uMd1E_XRVQ_wHVrGq5fqFH6Fyg8cWx2DTQbVvH8tmmA,3730
@@ -457,7 +461,7 @@ gbdtransformation/brands/wstm/tests/test.xml,sha256=YH6ym16Jot43w37Q4zRMktjXhrpd
 gbdtransformation/brands/xxxx/__init__.py,sha256=fricc3VHm4BwGRFKIIqB0t-NtP3tTVRrEYee_gWpiFo,172
 gbdtransformation/brands/xxxx/filters.py,sha256=YCaQ6yH2LINwCQvbPHDhnORQyWglbswLlSOY6ur3KXQ,1874
 gbdtransformation/brands/xxxx/schema,sha256=g_oWkd7k2e5fAQR1BdNkPSsIgP3dkTyc7esWo_UOHQA,163
-gbdtransformation/brands/xxxx/template.yml,sha256=0aNF040tiUwhb-Ujm0OmHNq0do9s_W6RX2cgEtOAOWs,7807
+gbdtransformation/brands/xxxx/template.yml,sha256=edcVpB6OeNQ74AGZx9H-hhQFct1WMqtwmBG9iSc9mrY,7826
 gbdtransformation/brands/zmtm/__init__.py,sha256=Mtsi_-CaLQirHkhnletNhJ4li-pZlzEZMcKjv6mEk50,256
 gbdtransformation/brands/zmtm/filters.py,sha256=FkGfv3nPiYDUy97O7bDzPp824qoDsqX-oh2Ox01NTpA,2344
 gbdtransformation/brands/zmtm/schema,sha256=TFrF4FR76cytcbtQkDWxtF74I0tCPRDIvWRFeqaJt6Q,3242
@@ -566,7 +570,7 @@ gbdtransformation/designs/vnid/filters.py,sha256=HlZJp1Zb1zU37tZO-xBe0Kt-TlCT0nl
 gbdtransformation/designs/vnid/schema,sha256=HxkKmaih8mUTYZst9aIbEgv_uXhqS6PQp3C4S7utz18,3830
 gbdtransformation/designs/vnid/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
 gbdtransformation/designs/woid/__init__.py,sha256=Cdy9Ki01mAvufymKb9QSLwfFggaoerOenq6BxhPu500,66
-gbdtransformation/designs/woid/filters.py,sha256=RVqDYsGL-9BNEpe5VmAXdBwtM8B5HuHDI1ycP65ssmc,17352
+gbdtransformation/designs/woid/filters.py,sha256=YT2oC3KPkJM9TZ4eMToG0GNBhwRcnv7zxdp5OoAyWZo,17592
 gbdtransformation/designs/woid/schema,sha256=DoJKgqrbOIPrrSJ7WcJM6aQpDqG34yD0MT7bsxauNpM,19967
 gbdtransformation/designs/woid/template.yml,sha256=td3Y7vfssL569Anr4Sz1y11ejOZmbRbC_-xw2ON7Vk4,27778
 gbdtransformation/designs/xxid/__init__.py,sha256=Cdy9Ki01mAvufymKb9QSLwfFggaoerOenq6BxhPu500,66
@@ -585,9 +589,9 @@ gbdtransformation/utilities/st66.xsd,sha256=co8aFN3a5TpudllRttWmfLeiZu8ulNipfeXm
 schemas/ShazamConfig.py,sha256=D67os5B11C41h_WZ7kk54Ss0Kk7tHh8W0d_1c_aX-lY,1191
 schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 schemas/schema_extractor.py,sha256=3-ImtnI777f6b3VA0A_w-NoXdlGz5VZMzK6MnPdQQAY,10294
-wipo_gbd_transformation-1.1.84.dist-info/LICENSE.md,sha256=6r2dL13EwZqSt2ellLbJRFTA-6ECIDOer4YthCfkac0,35654
-wipo_gbd_transformation-1.1.84.dist-info/METADATA,sha256=v0jD6sQSUrdlPctbdJPhaAyCEMHj5yAAVkWY3CwYKjM,577
-wipo_gbd_transformation-1.1.84.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-wipo_gbd_transformation-1.1.84.dist-info/entry_points.txt,sha256=NFLtlP3mPHUi-hEoUcz4CXa7vcpP8bbwd18HS4arbEk,223
-wipo_gbd_transformation-1.1.84.dist-info/top_level.txt,sha256=oU1j-JNLga18Fd-EV6Xl9wM8zxYoNVEzb7P8MDhTPJg,26
-wipo_gbd_transformation-1.1.84.dist-info/RECORD,,
+wipo_gbd_transformation-1.1.86.dist-info/LICENSE.md,sha256=6r2dL13EwZqSt2ellLbJRFTA-6ECIDOer4YthCfkac0,35654
+wipo_gbd_transformation-1.1.86.dist-info/METADATA,sha256=wJBiR5XKw7qXXwgo_ynOOkQn8L6oDdhKaEVVXBAYKi8,617
+wipo_gbd_transformation-1.1.86.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+wipo_gbd_transformation-1.1.86.dist-info/entry_points.txt,sha256=KmwWxkYogxtcrgRU6miWDcikp4yJ3cqr68yMRJq4Pwo,224
+wipo_gbd_transformation-1.1.86.dist-info/top_level.txt,sha256=oU1j-JNLga18Fd-EV6Xl9wM8zxYoNVEzb7P8MDhTPJg,26
+wipo_gbd_transformation-1.1.86.dist-info/RECORD,,

{wipo_gbd_transformation-1.1.84.dist-info → wipo_gbd_transformation-1.1.86.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.37.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

{wipo_gbd_transformation-1.1.84.dist-info → wipo_gbd_transformation-1.1.86.dist-info}/entry_points.txt

@@ -3,3 +3,4 @@ gbd-transform = gbdtransformation.execs:run
 gbd-transform-organize = gbdtransformation.execs:organize
 gbd-transform-test = gbdtransformation.execs:test
 gbd-transform-xpath = gbdtransformation.execs:shazam
+